* vlc_es.h: Elementary stream formats descriptions
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
- * $Id: vlc_es.h,v 1.9 2004/02/07 00:16:34 gbazin Exp $
+ * $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
*/
struct video_palette_t
{
- int i_dummy; /**< to keep the compatibility with ffmpeg's palette */
-
- uint32_t palette[256]; /**< 4-byte ARGB palette entries, stored in native
- * byte order */
+ int i_dummy; /**< to keep the compatibility with ffmpeg's palette */
+ uint8_t palette[256][4]; /**< 4-byte RGBA/YUVA palette */
};
/**
unsigned int i_frame_rate; /**< frame rate numerator */
unsigned int i_frame_rate_base; /**< frame rate denominator */
+ int i_rmask, i_rgmask, i_bmask; /**< color masks for RGB chroma */
video_palette_t *p_palette; /**< video palette from demuxer */
};
video_format_t video;
subs_format_t subs;
- int i_bitrate;
+ int i_bitrate;
+ vlc_bool_t b_packetized; /* wether the data is packetized
+ (ie. not truncated) */
int i_extra;
void *p_extra;
memset( &fmt->video, 0, sizeof(video_format_t) );
memset( &fmt->subs, 0, sizeof(subs_format_t) );
+ fmt->b_packetized = VLC_TRUE;
fmt->i_bitrate = 0;
fmt->i_extra = 0;
fmt->p_extra = NULL;
dst->psz_description = strdup( src->psz_description );
if( src->i_extra > 0 )
{
+ dst->i_extra = src->i_extra;
dst->p_extra = malloc( src->i_extra );
- memcpy( dst->p_extra, src->p_extra,
- src->i_extra );
+ memcpy( dst->p_extra, src->p_extra, src->i_extra );
}
else
{
dst->i_extra = 0;
dst->p_extra = NULL;
}
+
+ if( src->subs.psz_encoding )
+ dst->subs.psz_encoding = strdup( src->subs.psz_encoding );
+
+ if( src->video.p_palette )
+ {
+ dst->video.p_palette = (video_palette_t*)malloc( sizeof( video_palette_t ) );
+ memcpy( dst->video.p_palette, src->video.p_palette, sizeof( video_palette_t ) );
+ }
}
-static inline void es_format_Free( es_format_t *fmt )
+static inline void es_format_Clean( es_format_t *fmt )
{
if( fmt->psz_language ) free( fmt->psz_language );
+ fmt->psz_language = NULL;
+
if( fmt->psz_description ) free( fmt->psz_description );
+ fmt->psz_description = NULL;
+
if( fmt->i_extra > 0 ) free( fmt->p_extra );
+ fmt->i_extra = 0; fmt->p_extra = NULL;
+
if( fmt->video.p_palette ) free( fmt->video.p_palette );
+ fmt->video.p_palette = NULL;
+
+ if( fmt->subs.psz_encoding ) free( fmt->subs.psz_encoding );
+ fmt->subs.psz_encoding = NULL;
}
#endif