X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_es.h;h=d020d134ac7442f0568b5a67edc70b2220190c6e;hb=5eea1626ff7256bfa96de800770342880ad60e33;hp=fb3ead613ce735ef026b5d54ff95991894ab7024;hpb=4359eb91409623302329068852b88898a975943d;p=vlc diff --git a/include/vlc_es.h b/include/vlc_es.h index fb3ead613c..d020d134ac 100644 --- a/include/vlc_es.h +++ b/include/vlc_es.h @@ -1,7 +1,7 @@ /***************************************************************************** * vlc_es.h: Elementary stream formats descriptions ***************************************************************************** - * Copyright (C) 1999-2001 VideoLAN + * Copyright (C) 1999-2001 the VideoLAN team * $Id$ * * Authors: Laurent Aimar @@ -18,12 +18,16 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ #ifndef _VLC_ES_H #define _VLC_ES_H 1 +/* FIXME: i'm not too sure about this include but it fixes compilation of + * video chromas -- dionoea */ +#include "vlc_common.h" + /** * \file * This file defines the elementary streams format types @@ -31,17 +35,34 @@ /** * video palette data - * \see viedo_format_t + * \see video_format_t * \see subs_format_t */ 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_entries; /**< to keep the compatibility with ffmpeg's palette */ + uint8_t palette[256][4]; /**< 4-byte RGBA/YUVA palette */ }; +/** + * audio replay gain description + */ +#define AUDIO_REPLAY_GAIN_MAX (2) +#define AUDIO_REPLAY_GAIN_TRACK (0) +#define AUDIO_REPLAY_GAIN_ALBUM (1) +typedef struct +{ + /* true if we have the peak value */ + bool pb_peak[AUDIO_REPLAY_GAIN_MAX]; + /* peak value where 1.0 means full sample value */ + float pf_peak[AUDIO_REPLAY_GAIN_MAX]; + + /* true if we have the gain value */ + bool pb_gain[AUDIO_REPLAY_GAIN_MAX]; + /* gain value in dB */ + float pf_gain[AUDIO_REPLAY_GAIN_MAX]; +} audio_replay_gain_t; + /** * audio format description */ @@ -63,7 +84,7 @@ struct audio_format_t unsigned int i_bytes_per_frame; /* Number of sampleframes contained in one compressed frame. */ - unsigned int i_frame_length; + unsigned int i_frame_length; /* Please note that it may be completely arbitrary - buffers are not * obliged to contain a integral number of so-called "frames". It's * just here for the division : @@ -71,11 +92,20 @@ struct audio_format_t */ /* FIXME ? (used by the codecs) */ - int i_channels; - int i_blockalign; - int i_bitspersample; + unsigned i_bitspersample; + unsigned i_blockalign; + uint8_t i_channels; /* must be <=32 */ + uint8_t i_flavor; }; +#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 + /** * video format description */ @@ -93,9 +123,16 @@ struct video_format_t unsigned int i_bits_per_pixel; /**< number of bits per pixel */ + unsigned int i_sar_num; /**< sample/pixel aspect ratio */ + unsigned int i_sar_den; + 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 */ + int i_rrshift, i_lrshift; + int i_rgshift, i_lgshift; + int i_rbshift, i_lbshift; video_palette_t *p_palette; /**< video palette from demuxer */ }; @@ -104,12 +141,23 @@ struct video_format_t */ struct subs_format_t { + /* the character encoding of the text of the subtitle. + * all gettext recognized shorts can be used */ char *psz_encoding; + + int i_x_origin; /**< x coordinate of the subtitle. 0 = left */ + int i_y_origin; /**< y coordinate of the subtitle. 0 = top */ + struct { - /* FIXME */ + /* */ uint32_t palette[16+1]; + + /* the width of the original movie the spu was extracted from */ + int i_original_frame_width; + /* the height of the original movie the spu was extracted from */ + int i_original_frame_height; } spu; struct @@ -121,6 +169,13 @@ struct subs_format_t /** * ES definition */ +typedef struct extra_languages_t +{ + char *psz_language; + char *psz_description; +} extra_languages_t; + + struct es_format_t { int i_cat; @@ -135,16 +190,20 @@ struct es_format_t -1 : mean not selected by default even when no other stream >=0: priority */ + char *psz_language; char *psz_description; + int i_extra_languages; + extra_languages_t *p_extra_languages; - audio_format_t audio; + audio_format_t audio; + audio_replay_gain_t audio_replay_gain; video_format_t video; subs_format_t subs; - int i_bitrate; + unsigned int i_bitrate; - vlc_bool_t b_packetized; /* wether the data is packetized + bool b_packetized; /* wether the data is packetized (ie. not truncated) */ int i_extra; void *p_extra; @@ -169,18 +228,23 @@ static inline void es_format_Init( es_format_t *fmt, fmt->psz_language = NULL; fmt->psz_description = NULL; + fmt->i_extra_languages = 0; + fmt->p_extra_languages = NULL; + memset( &fmt->audio, 0, sizeof(audio_format_t) ); + memset( &fmt->audio_replay_gain, 0, sizeof(audio_replay_gain_t) ); memset( &fmt->video, 0, sizeof(video_format_t) ); memset( &fmt->subs, 0, sizeof(subs_format_t) ); - fmt->b_packetized = VLC_TRUE; + fmt->b_packetized = true; fmt->i_bitrate = 0; fmt->i_extra = 0; fmt->p_extra = NULL; } -static inline void es_format_Copy( es_format_t *dst, es_format_t *src ) +static inline int es_format_Copy( es_format_t *dst, const es_format_t *src ) { + int i; memcpy( dst, src, sizeof( es_format_t ) ); if( src->psz_language ) dst->psz_language = strdup( src->psz_language ); @@ -203,27 +267,51 @@ static inline void es_format_Copy( es_format_t *dst, es_format_t *src ) if( src->video.p_palette ) { - dst->video.p_palette = malloc( sizeof( video_palette_t ) ); - memcpy( dst->video.p_palette, src->video.p_palette, sizeof( video_palette_t ) ); + 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 ) ); + } + + dst->i_extra_languages = src->i_extra_languages; + if( dst->i_extra_languages ) + dst->p_extra_languages = (extra_languages_t*) + malloc(dst->i_extra_languages * sizeof(*dst->p_extra_languages )); + for( i = 0; i < dst->i_extra_languages; i++ ) { + if( src->p_extra_languages[i].psz_language ) + dst->p_extra_languages[i].psz_language = strdup( src->p_extra_languages[i].psz_language ); + else + dst->p_extra_languages[i].psz_language = NULL; + if( src->p_extra_languages[i].psz_description ) + dst->p_extra_languages[i].psz_description = strdup( src->p_extra_languages[i].psz_description ); + else + dst->p_extra_languages[i].psz_description = NULL; } + return VLC_SUCCESS; } 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; + free( fmt->psz_language ); + free( fmt->psz_description ); 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; + free( fmt->video.p_palette ); + free( fmt->subs.psz_encoding ); - if( fmt->subs.psz_encoding ) free( fmt->subs.psz_encoding ); - fmt->subs.psz_encoding = NULL; -} + if( fmt->i_extra_languages > 0 && fmt->p_extra_languages ) + { + int i; + for( i = 0; i < fmt->i_extra_languages; i++ ) + { + free( fmt->p_extra_languages[i].psz_language ); + free( fmt->p_extra_languages[i].psz_description ); + } + free( fmt->p_extra_languages ); + } + /* es_format_Clean can be called multiple times */ + memset( fmt, 0, sizeof(*fmt) ); +} #endif