* includes all common video types and constants.
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
- * $Id: video.h,v 1.47 2002/03/17 17:00:38 sam Exp $
+ * $Id: video.h,v 1.55 2002/07/20 18:01:41 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
*
/*****************************************************************************
* plane_t: description of a planar graphic field
*****************************************************************************/
-typedef struct plane_s
+typedef struct plane_t
{
u8 *p_pixels; /* Start of the plane's data */
int i_pixel_bytes;
/* Is there a margin ? defaults to no */
- boolean_t b_margin;
+ vlc_bool_t b_margin;
/* Variables used for pictures with margins */
int i_visible_bytes; /* How many real pixels are there ? */
- boolean_t b_hidden; /* Are we allowed to write to the margin ? */
+ vlc_bool_t b_hidden; /* Are we allowed to write to the margin ? */
} plane_t;
* Picture type and flags should only be modified by the output thread. Note
* that an empty picture MUST have its flags set to 0.
*****************************************************************************/
-typedef struct picture_s
+struct picture_t
{
/* Picture data - data can always be freely modified, but p_data may
* NEVER be modified. A direct buffer can be handled as the plugin
* wishes, it can even swap p_pixels buffers. */
u8 *p_data;
+ void *p_data_orig; /* pointer before memalign */
plane_t p[ VOUT_MAX_PLANES ]; /* description of the planes */
int i_planes; /* number of allocated planes */
* the video output thread API, but should never be written directly */
int i_refcount; /* link reference counter */
mtime_t date; /* display date */
+ vlc_bool_t b_force;
/* Picture dynamic properties - those properties can be changed by the
* decoder */
- boolean_t b_progressive; /* is it a progressive frame ? */
- boolean_t b_repeat_first_field; /* RFF bit */
- boolean_t b_top_field_first; /* which field is first */
+ vlc_bool_t b_progressive; /* is it a progressive frame ? */
+ vlc_bool_t b_repeat_first_field; /* RFF bit */
+ vlc_bool_t b_top_field_first; /* which field is first */
/* The picture heap we are attached to */
- struct picture_heap_s* p_heap;
+ picture_heap_t* p_heap;
/* Private data - the video output plugin might want to put stuff here to
* keep track of the picture */
- struct picture_sys_s *p_sys;
-
-} picture_t;
+ picture_sys_t * p_sys;
+};
/*****************************************************************************
* picture_heap_t: video picture heap, either render (to store pictures used
* by the decoder) or output (to store pictures displayed by the vout plugin)
*****************************************************************************/
-typedef struct picture_heap_s
+struct picture_heap_t
{
int i_pictures; /* current heap size */
int i_bmask, i_rbshift, i_lbshift;
/* Stuff used for palettized RGB planes */
- void (* pf_setpalette) ( struct vout_thread_s *, u16 *, u16 *, u16 * );
-
-} picture_heap_t;
+ void (* pf_setpalette) ( vout_thread_t *, u16 *, u16 *, u16 * );
+};
/* RGB2PIXEL: assemble RGB components to a pixel value, returns a u32 */
#define RGB2PIXEL( p_vout, i_r, i_g, i_b ) \
#define DESTROYED_PICTURE 6 /* allocated but no more used */
/*****************************************************************************
- * Flags used to describe picture format - see http://www.webartz.com/fourcc/
+ * Codes used to describe picture format - see http://www.webartz.com/fourcc/
*****************************************************************************/
-
-/* Packed RGB formats */
-#define FOURCC_BI_RGB 0x00000000 /* RGB for 8bpp */
-#define FOURCC_RGB2 0x32424752 /* alias for BI_RGB */
-#define FOURCC_BI_BITFIELDS 0x00000003 /* RGB, for 16, 24, 32bpp */
-#define FOURCC_RV15 0x35315652 /* RGB 15bpp, 0x1f, 0x7e0, 0xf800 */
-#define FOURCC_RV16 0x36315652 /* RGB 16bpp, 0x1f, 0x3e0, 0x7c00 */
-#define FOURCC_RV24 0x34325652 /* RGB 24bpp, 0xff, 0xff00, 0xff0000 */
-#define FOURCC_RV32 0x32335652 /* RGB 32bpp, 0xff, 0xff00, 0xff0000 */
-
-/* Planar YUV formats */
-#define FOURCC_I420 0x30323449 /* Planar 4:2:0, Y:U:V */
-#define FOURCC_IYUV 0x56555949 /* alias for I420 */
-#define FOURCC_YV12 0x32315659 /* Planar 4:2:0, Y:V:U */
-
-/* Packed YUV formats */
-#define FOURCC_IUYV 0x56595549 /* Packed 4:2:2, U:Y:V:Y, interlaced */
-#define FOURCC_UYVY 0x59565955 /* Packed 4:2:2, U:Y:V:Y */
-#define FOURCC_UYNV 0x564e5955 /* alias for UYVY */
-#define FOURCC_Y422 0x32323459 /* alias for UYVY */
-#define FOURCC_cyuv 0x76757963 /* Packed 4:2:2, U:Y:V:Y, reverted */
-#define FOURCC_YUY2 0x32595559 /* Packed 4:2:2, Y:U:Y:V */
-#define FOURCC_YUNV 0x564e5559 /* alias for YUY2 */
-#define FOURCC_YVYU 0x55585659 /* Packed 4:2:2, Y:V:Y:U */
-#define FOURCC_Y211 0x31313259 /* Packed 2:1:1, Y:U:Y:V */
+#define VLC_FOURCC( a, b, c, d ) \
+ ( ((u32)a) | ( ((u32)b) << 8 ) | ( ((u32)c) << 16 ) | ( ((u32)d) << 24 ) )
+
+#define VLC_TWOCC( a, b ) \
+ ( (u16)(a) | ( (u16)(b) << 8 ) )
+
+/* AVI stuff */
+#define FOURCC_RIFF VLC_FOURCC('R','I','F','F')
+#define FOURCC_LIST VLC_FOURCC('L','I','S','T')
+#define FOURCC_JUNK VLC_FOURCC('J','U','N','K')
+#define FOURCC_AVI VLC_FOURCC('A','V','I',' ')
+#define FOURCC_WAVE VLC_FOURCC('W','A','V','E')
+
+#define FOURCC_avih VLC_FOURCC('a','v','i','h')
+#define FOURCC_hdrl VLC_FOURCC('h','d','r','l')
+#define FOURCC_movi VLC_FOURCC('m','o','v','i')
+#define FOURCC_idx1 VLC_FOURCC('i','d','x','1')
+
+#define FOURCC_strl VLC_FOURCC('s','t','r','l')
+#define FOURCC_strh VLC_FOURCC('s','t','r','h')
+#define FOURCC_strf VLC_FOURCC('s','t','r','f')
+#define FOURCC_strd VLC_FOURCC('s','t','r','d')
+
+#define FOURCC_rec VLC_FOURCC('r','e','c',' ')
+#define FOURCC_auds VLC_FOURCC('a','u','d','s')
+#define FOURCC_vids VLC_FOURCC('v','i','d','s')
+
+#define TWOCC_wb VLC_TWOCC('w','b')
+#define TWOCC_db VLC_TWOCC('d','b')
+#define TWOCC_dc VLC_TWOCC('d','c')
+#define TWOCC_pc VLC_TWOCC('p','c')
+
+/* MPEG4 codec */
+#define FOURCC_DIVX VLC_FOURCC('D','I','V','X')
+#define FOURCC_divx VLC_FOURCC('d','i','v','x')
+#define FOURCC_DIV1 VLC_FOURCC('D','I','V','1')
+#define FOURCC_div1 VLC_FOURCC('d','i','v','1')
+#define FOURCC_MP4S VLC_FOURCC('M','P','4','S')
+#define FOURCC_mp4s VLC_FOURCC('m','p','4','s')
+#define FOURCC_M4S2 VLC_FOURCC('M','4','S','2')
+#define FOURCC_m4s2 VLC_FOURCC('m','4','s','2')
+#define FOURCC_xvid VLC_FOURCC('x','v','i','d')
+#define FOURCC_XVID VLC_FOURCC('X','V','I','D')
+#define FOURCC_XviD VLC_FOURCC('X','v','i','D')
+#define FOURCC_DX50 VLC_FOURCC('D','X','5','0')
+#define FOURCC_mp4v VLC_FOURCC('m','p','4','v')
+#define FOURCC_4 VLC_FOURCC( 4, 0, 0, 0 )
+
+/* MSMPEG4 v2 */
+#define FOURCC_MPG4 VLC_FOURCC('M','P','G','4')
+#define FOURCC_mpg4 VLC_FOURCC('m','p','g','4')
+#define FOURCC_DIV2 VLC_FOURCC('D','I','V','2')
+#define FOURCC_div2 VLC_FOURCC('d','i','v','2')
+#define FOURCC_MP42 VLC_FOURCC('M','P','4','2')
+#define FOURCC_mp42 VLC_FOURCC('m','p','4','2')
+
+/* MSMPEG4 v3 / M$ mpeg4 v3 */
+#define FOURCC_MPG3 VLC_FOURCC('M','P','G','3')
+#define FOURCC_mpg3 VLC_FOURCC('m','p','g','3')
+#define FOURCC_div3 VLC_FOURCC('d','i','v','3')
+#define FOURCC_MP43 VLC_FOURCC('M','P','4','3')
+#define FOURCC_mp43 VLC_FOURCC('m','p','4','3')
+
+/* DivX 3.20 */
+#define FOURCC_DIV3 VLC_FOURCC('D','I','V','3')
+#define FOURCC_DIV4 VLC_FOURCC('D','I','V','4')
+#define FOURCC_div4 VLC_FOURCC('d','i','v','4')
+#define FOURCC_DIV5 VLC_FOURCC('D','I','V','5')
+#define FOURCC_div5 VLC_FOURCC('d','i','v','5')
+#define FOURCC_DIV6 VLC_FOURCC('D','I','V','6')
+#define FOURCC_div6 VLC_FOURCC('d','i','v','6')
+
+/* AngelPotion stuff */
+#define FOURCC_AP41 VLC_FOURCC('A','P','4','1')
+
+/* ?? */
+#define FOURCC_3IV1 VLC_FOURCC('3','I','V','1')
+/* H263 and H263i */
+#define FOURCC_H263 VLC_FOURCC('H','2','6','3')
+#define FOURCC_h263 VLC_FOURCC('h','2','6','3')
+#define FOURCC_U263 VLC_FOURCC('U','2','6','3')
+#define FOURCC_I263 VLC_FOURCC('I','2','6','3')
+#define FOURCC_i263 VLC_FOURCC('i','2','6','3')
+
+
+/* Packed RGB for 8bpp */
+#define FOURCC_BI_RGB VLC_FOURCC( 0 , 0 , 0 , 0 )
+#define FOURCC_RGB2 VLC_FOURCC('R','G','B','2')
+
+/* Packed RGB for 16, 24, 32bpp */
+#define FOURCC_BI_BITFIELDS VLC_FOURCC( 0 , 0 , 0 , 3 )
+
+/* Packed RGB 15bpp, 0x1f, 0x7e0, 0xf800 */
+#define FOURCC_RV15 VLC_FOURCC('R','V','1','5')
+
+/* Packed RGB 16bpp, 0x1f, 0x3e0, 0x7c00 */
+#define FOURCC_RV16 VLC_FOURCC('R','V','1','6')
+
+/* Packed RGB 24bpp, 0xff, 0xff00, 0xff0000 */
+#define FOURCC_RV24 VLC_FOURCC('R','V','2','4')
+
+/* Packed RGB 32bpp, 0xff, 0xff00, 0xff0000 */
+#define FOURCC_RV32 VLC_FOURCC('R','V','3','2')
+
+/* Planar YUV 4:2:0, Y:U:V */
+#define FOURCC_I420 VLC_FOURCC('I','4','2','0')
+#define FOURCC_IYUV VLC_FOURCC('I','Y','U','V')
+
+/* Planar YUV 4:2:0, Y:V:U */
+#define FOURCC_YV12 VLC_FOURCC('Y','V','1','2')
+
+/* Packed YUV 4:2:2, U:Y:V:Y, interlaced */
+#define FOURCC_IUYV VLC_FOURCC('I','U','Y','V')
+
+/* Packed YUV 4:2:2, U:Y:V:Y */
+#define FOURCC_UYVY VLC_FOURCC('U','Y','V','Y')
+#define FOURCC_UYNV VLC_FOURCC('U','Y','N','V')
+#define FOURCC_Y422 VLC_FOURCC('Y','4','2','2')
+
+/* Packed YUV 4:2:2, U:Y:V:Y, reverted */
+#define FOURCC_cyuv VLC_FOURCC('c','y','u','v')
+
+/* Packed YUV 4:2:2, Y:U:Y:V */
+#define FOURCC_YUY2 VLC_FOURCC('Y','U','Y','2')
+#define FOURCC_YUNV VLC_FOURCC('Y','U','N','V')
+
+/* Packed YUV 4:2:2, Y:V:Y:U */
+#define FOURCC_YVYU VLC_FOURCC('Y','V','Y','U')
+
+/* Packed YUV 2:1:1, Y:U:Y:V */
+#define FOURCC_Y211 VLC_FOURCC('Y','2','1','1')
/* Custom formats which we use but which don't exist in the fourcc database */
-#define FOURCC_YMGA 0x41474d59 /* Planar Y, packed UV, from Matrox */
-#define FOURCC_I422 0x32323449 /* Planar 4:2:2, Y:U:V */
-#define FOURCC_I444 0x34343449 /* Planar 4:4:4, Y:U:V */
+
+/* Planar Y, packed UV, from Matrox */
+#define FOURCC_YMGA VLC_FOURCC('Y','M','G','A')
+
+/* Planar 4:2:2, Y:U:V */
+#define FOURCC_I422 VLC_FOURCC('I','4','2','2')
+
+/* Planar 4:4:4, Y:U:V */
+#define FOURCC_I444 VLC_FOURCC('I','4','4','4')
+
+/*****************************************************************************
+ * Shortcuts to access image components
+ *****************************************************************************/
/* Plane indices */
#define Y_PLANE 0
/* Shortcuts */
#define Y_PIXELS p[Y_PLANE].p_pixels
+#define Y_PITCH p[Y_PLANE].i_pitch
#define U_PIXELS p[U_PLANE].p_pixels
+#define U_PITCH p[U_PLANE].i_pitch
#define V_PIXELS p[V_PLANE].p_pixels
-
-static __inline__ int vout_ChromaCmp( u32 i_chroma, u32 i_amorhc )
-{
- /* If they are the same, they are the same ! */
- if( i_chroma == i_amorhc )
- {
- return 1;
- }
-
- /* Check for equivalence classes */
- switch( i_chroma )
- {
- case FOURCC_I420:
- case FOURCC_IYUV:
- case FOURCC_YV12:
- switch( i_amorhc )
- {
- case FOURCC_I420:
- case FOURCC_IYUV:
- case FOURCC_YV12:
- return 1;
-
- default:
- return 0;
- }
-
- case FOURCC_UYVY:
- case FOURCC_UYNV:
- case FOURCC_Y422:
- switch( i_amorhc )
- {
- case FOURCC_UYVY:
- case FOURCC_UYNV:
- case FOURCC_Y422:
- return 1;
-
- default:
- return 0;
- }
-
- case FOURCC_YUY2:
- case FOURCC_YUNV:
- switch( i_amorhc )
- {
- case FOURCC_YUY2:
- case FOURCC_YUNV:
- return 1;
-
- default:
- return 0;
- }
-
- default:
- return 0;
- }
-}
-
-/*****************************************************************************
- * vout_CopyPicture: copy a picture to another one
- *****************************************************************************
- * This function takes advantage of the image format, and reduces the
- * number of calls to memcpy() to the minimum. Source and destination
- * images must have same width, height, and chroma.
- *****************************************************************************/
-static __inline__ void vout_CopyPicture( picture_t *p_src, picture_t *p_dest )
-{
- int i;
-
- for( i = 0; i < p_src->i_planes ; i++ )
- {
- if( p_src->p[i].i_pitch == p_dest->p[i].i_pitch )
- {
- if( p_src->p[i].b_margin )
- {
- /* If p_src->b_margin is set, p_dest->b_margin must be set */
- if( p_dest->p[i].b_hidden )
- {
- /* There are margins, but they are hidden : perfect ! */
- FAST_MEMCPY( p_dest->p[i].p_pixels, p_src->p[i].p_pixels,
- p_src->p[i].i_pitch * p_src->p[i].i_lines );
- continue;
- }
- else
- {
- /* We can't directly copy the margin. Too bad. */
- }
- }
- else
- {
- /* Same pitch, no margins : perfect ! */
- FAST_MEMCPY( p_dest->p[i].p_pixels, p_src->p[i].p_pixels,
- p_src->p[i].i_pitch * p_src->p[i].i_lines );
- continue;
- }
- }
- else
- {
- /* Pitch values are different */
- }
-
- /* We need to proceed line by line */
- {
- u8 *p_in = p_src->p[i].p_pixels, *p_out = p_dest->p[i].p_pixels;
- int i_line;
-
- for( i_line = p_src->p[i].i_lines; i_line--; )
- {
- FAST_MEMCPY( p_out, p_in, p_src->p[i].i_visible_bytes );
- p_in += p_src->p[i].i_pitch;
- p_out += p_dest->p[i].i_pitch;
- }
- }
- }
-}
+#define V_PITCH p[V_PLANE].i_pitch
/*****************************************************************************
* subpicture_t: video subtitle
* Subtitle type and flags should only be modified by the output thread. Note
* that an empty subtitle MUST have its flags set to 0.
*****************************************************************************/
-typedef struct subpicture_s
+struct subpicture_t
{
/* Type and flags - should NOT be modified except by the vout thread */
int i_type; /* type */
int i_status; /* flags */
int i_size; /* data size */
- struct subpicture_s * p_next; /* next subtitle to be displayed */
+ subpicture_t * p_next; /* next subtitle to be displayed */
/* Date properties */
mtime_t i_start; /* beginning of display date */
mtime_t i_stop; /* end of display date */
- boolean_t b_ephemer; /* does the subtitle have a TTL ? */
+ vlc_bool_t b_ephemer; /* does the subtitle have a TTL ? */
/* Display properties - these properties are only indicative and may be
* changed by the video output thread, or simply ignored depending of the
* format */
struct
{
- p_vout_font_t p_font; /* font, NULL for default */
+ vout_font_t * p_font; /* font, NULL for default */
int i_style; /* text style */
u32 i_char_color; /* character color */
u32 i_border_color; /* border color */
#endif
/* The subpicture rendering routine */
- void ( *pf_render ) ( const struct vout_thread_s *, picture_t *,
- const struct subpicture_s * );
+ void ( *pf_render ) ( vout_thread_t *, picture_t *, const subpicture_t * );
/* Private data - the subtitle plugin might want to put stuff here to
* keep track of the subpicture */
- struct subpicture_sys_s *p_sys; /* subpicture data */
-
-} subpicture_t;
+ subpicture_sys_t *p_sys; /* subpicture data */
+ void *p_sys_orig; /* pointer before memalign */
+};
/* Subpicture type */
#define EMPTY_SUBPICTURE 0 /* subtitle slot is empty and available */