X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_es.h;h=556b4143f10582ce6caa5b359c71da07f04af316;hb=c60652e38ac6afd74bd8225e9dae5406f13aaa4f;hp=ad45797bfa591d6a4f77f7d33900f7dabdde1bc1;hpb=4645717fb801db8957ff93832d3a927edb451edb;p=vlc diff --git a/include/vlc_es.h b/include/vlc_es.h index ad45797bfa..556b4143f1 100644 --- a/include/vlc_es.h +++ b/include/vlc_es.h @@ -24,9 +24,7 @@ #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" +#include /** * \file @@ -95,24 +93,14 @@ struct audio_format_t 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 */ struct video_format_t { vlc_fourcc_t i_chroma; /**< picture chroma */ - unsigned int i_aspect; /**< aspect ratio */ unsigned int i_width; /**< picture width */ unsigned int i_height; /**< picture height */ @@ -129,13 +117,72 @@ 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 */ + uint32_t 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 */ }; +/** + * Initialize a video_format_t structure with chroma 'i_chroma' + * \param p_src pointer to video_format_t structure + * \param i_chroma chroma value to use + */ +static inline void video_format_Init( video_format_t *p_src, vlc_fourcc_t i_chroma ) +{ + memset( p_src, 0, sizeof( video_format_t ) ); + p_src->i_chroma = i_chroma; + p_src->i_sar_num = p_src->i_sar_den = 1; + p_src->p_palette = NULL; +} + +/** + * Copy video_format_t including the palette + * \param p_dst video_format_t to copy to + * \param p_src video_format_t to copy from + */ +static inline int video_format_Copy( video_format_t *p_dst, const video_format_t *p_src ) +{ + memcpy( p_dst, p_src, sizeof( *p_dst ) ); + if( p_src->p_palette ) + { + p_dst->p_palette = (video_palette_t *) malloc( sizeof( video_palette_t ) ); + if( !p_dst->p_palette ) + return VLC_ENOMEM; + memcpy( p_dst->p_palette, p_src->p_palette, sizeof( *p_dst->p_palette ) ); + } + return VLC_SUCCESS; +} + +/** + * Cleanup and free palette of this video_format_t + * \param p_src video_format_t structure to clean + */ +static inline void video_format_Clean( video_format_t *p_src ) +{ + free( p_src->p_palette ); + memset( p_src, 0, sizeof( video_format_t ) ); + p_src->p_palette = NULL; +} + +/** + * It will fill up a video_format_tvideo_format_t using the given arguments. + * Becarefull that the video_format_t must already be initialized. + */ +VLC_EXPORT( void, video_format_Setup, ( video_format_t *, vlc_fourcc_t i_chroma, int i_width, int i_height, int i_sar_num, int i_sar_den ) ); + +/** + * This function will check if the first video format is similar + * to the second one. + */ +VLC_EXPORT( bool, video_format_IsSimilar, ( const video_format_t *, const video_format_t * ) ); + +/** + * It prints details about the given video_format_t + */ +VLC_EXPORT( void, video_format_Print, ( vlc_object_t *, const char *, const video_format_t * ) ); + /** * subtitles format description */ @@ -164,10 +211,15 @@ struct subs_format_t { int i_id; } dvb; + struct + { + int i_magazine; + int i_page; + } teletext; }; /** - * ES definition + * ES language definition */ typedef struct extra_languages_t { @@ -175,42 +227,49 @@ typedef struct extra_languages_t char *psz_description; } extra_languages_t; - +/** + * ES format definition + */ 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 + int i_cat; /**< ES category @see es_format_category_e */ + vlc_fourcc_t i_codec; /**< FOURCC value as used in vlc */ + vlc_fourcc_t i_original_fourcc; /**< original FOURCC from the container */ + + int i_id; /**< es identifier, where means + -1: let the core mark the right id + >=0: valid id */ + int i_group; /**< group identifier, where means: + -1 : standalone + >= 0 then a "group" (program) is created for each value */ - int i_priority; /* -2 : mean not selectable by the users + int i_priority; /**< priority, where means: + -2 : mean not selectable by the users -1 : mean not selected by default even - when no other stream + when no other stream >=0: priority */ - char *psz_language; - char *psz_description; - int i_extra_languages; - extra_languages_t *p_extra_languages; + char *psz_language; /**< human readible language name */ + char *psz_description; /**< human readible description of language */ + int i_extra_languages; /**< length in bytes of extra language data pointer */ + extra_languages_t *p_extra_languages; /**< extra language data needed by some decoders */ - audio_format_t audio; - audio_replay_gain_t audio_replay_gain; - video_format_t video; - subs_format_t subs; + audio_format_t audio; /**< description of audio format */ + audio_replay_gain_t audio_replay_gain; /*< audio replay gain information */ + video_format_t video; /**< description of video format */ + subs_format_t subs; /**< description of subtitle format */ - unsigned int i_bitrate; + unsigned int i_bitrate; /**< bitrate of this ES */ + int i_profile; /**< codec specific information (like real audio flavor, mpeg audio layer, h264 profile ...) */ + int i_level; /**< codec specific information: indicates maximum restrictions on the stream (resolution, bitrate, codec features ...) */ - bool b_packetized; /* wether the data is packetized - (ie. not truncated) */ - int i_extra; - void *p_extra; + bool b_packetized; /**< wether the data is packetized (ie. not truncated) */ + int i_extra; /**< length in bytes of extra data pointer */ + void *p_extra; /**< extra data needed by some decoders or muxers */ }; -/* ES Categories */ +/** ES Categories */ enum es_format_category_e { UNKNOWN_ES = 0x00, @@ -226,10 +285,15 @@ enum es_format_category_e VLC_EXPORT( void, video_format_FixRgb, ( video_format_t * ) ); /** - * This funtion will initialize a es_format_t structure. + * This function will initialize a es_format_t structure. */ VLC_EXPORT( void, es_format_Init, ( es_format_t *, int i_cat, vlc_fourcc_t i_codec ) ); +/** + * This function will initialize a es_format_t structure from a video_format_t. + */ +VLC_EXPORT( void, es_format_InitFromVideo, ( es_format_t *, const video_format_t * ) ); + /** * This functions will copy a es_format_t. */ @@ -242,5 +306,12 @@ VLC_EXPORT( int, es_format_Copy, ( es_format_t *p_dst, const es_format_t *p_src */ VLC_EXPORT( void, es_format_Clean, ( es_format_t *fmt ) ); -#endif +/** + * This function will check if the first ES format is similar + * to the second one. + * + * All descriptive fields are ignored. + */ +VLC_EXPORT( bool, es_format_IsSimilar, ( const es_format_t *, const es_format_t * ) ); +#endif