X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_es.h;h=622726d1e725aa8581e9a4334b47f8ef1c798bf6;hb=28ed0fc96153391a47fa4b480f716f0de1fbacae;hp=f836db887fbb0324e235bc8ab8ca1db051fb45c8;hpb=7369bb2a8ed6ac52352fa1912c8ef65dc3164703;p=vlc diff --git a/include/vlc_es.h b/include/vlc_es.h index f836db887f..622726d1e7 100644 --- a/include/vlc_es.h +++ b/include/vlc_es.h @@ -1,8 +1,8 @@ /***************************************************************************** - * vlc_es.h + * vlc_es.h: Elementary stream formats descriptions ***************************************************************************** * Copyright (C) 1999-2001 VideoLAN - * $Id: vlc_es.h,v 1.3 2003/11/22 18:04:10 gbazin Exp $ + * $Id$ * * Authors: Laurent Aimar * @@ -25,25 +25,40 @@ #define _VLC_ES_H 1 /** - * Description of a audio frame + * \file + * This file defines the elementary streams format types */ -struct audio_format_t + +/** + * video palette data + * \see video_format_t + * \see subs_format_t + */ +struct video_palette_t { - vlc_fourcc_t i_format; + int i_entries; /**< to keep the compatibility with ffmpeg's palette */ + uint8_t palette[256][4]; /**< 4-byte RGBA/YUVA palette */ +}; - unsigned int i_rate; +/** + * audio format description + */ +struct audio_format_t +{ + vlc_fourcc_t i_format; /**< audio format fourcc */ + unsigned int i_rate; /**< audio sample-rate */ /* Describes the channels configuration of the samples (ie. number of * channels which are available in the buffer, and positions). */ - uint32_t i_physical_channels; + uint32_t i_physical_channels; /* Describes from which original channels, before downmixing, the * buffer is derived. */ - uint32_t i_original_channels; + uint32_t i_original_channels; /* Optional - for A/52, SPDIF and DTS types : */ /* Bytes used by one compressed frame, depends on bitrate. */ - unsigned int i_bytes_per_frame; + unsigned int i_bytes_per_frame; /* Number of sampleframes contained in one compressed frame. */ unsigned int i_frame_length; @@ -59,8 +74,16 @@ struct audio_format_t int i_bitspersample; }; +#ifdef WORDS_BIGENDIAN +# define AUDIO_FMT_S16_NE VLC_FOURCC('s','1','6','b') +# define AUDIO_FMT_U16_NE VLC_FOURCC('u','1','6','b') +#else +# define AUDIO_FMT_S16_NE VLC_FOURCC('s','1','6','l') +# define AUDIO_FMT_U16_NE VLC_FOURCC('u','1','6','l') +#endif + /** - * Description of a video frame + * video format description */ struct video_format_t { @@ -78,15 +101,28 @@ struct video_format_t unsigned int i_frame_rate; /**< frame rate numerator */ unsigned int i_frame_rate_base; /**< frame rate denominator */ + + int i_rmask, i_gmask, i_bmask; /**< color masks for RGB chroma */ + video_palette_t *p_palette; /**< video palette from demuxer */ }; /** - * Description of subs + * subtitles format description */ struct subs_format_t { char *psz_encoding; + struct + { + /* FIXME */ + uint32_t palette[16+1]; + } spu; + + struct + { + int i_id; + } dvb; }; /** @@ -97,6 +133,8 @@ struct es_format_t int i_cat; vlc_fourcc_t i_codec; + int i_id; /* -1: let the core mark the right id + >=0: valid id */ int i_group; /* -1 : standalone >= 0 then a "group" (program) is created for each value */ @@ -111,8 +149,10 @@ struct es_format_t 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; @@ -130,6 +170,7 @@ static inline void es_format_Init( es_format_t *fmt, { fmt->i_cat = i_cat; fmt->i_codec = i_codec; + fmt->i_id = -1; fmt->i_group = 0; fmt->i_priority = 0; fmt->psz_language = NULL; @@ -139,6 +180,7 @@ static inline void es_format_Init( es_format_t *fmt, 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; @@ -147,18 +189,50 @@ static inline void es_format_Init( es_format_t *fmt, static inline void es_format_Copy( es_format_t *dst, es_format_t *src ) { memcpy( dst, src, sizeof( es_format_t ) ); + if( src->psz_language ) + dst->psz_language = strdup( src->psz_language ); + if( src->psz_description ) + 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 ) ); + } } -#endif +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