* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#ifndef _VLC_ES_H
-#define _VLC_ES_H 1
+#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
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
*/
*/
/* 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
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 */
};
+/**
+ * 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, video_format_t *p_src )
+{
+ memcpy( p_dst, p_src, sizeof( video_format_t ) );
+ 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( video_palette_t ) );
+ }
+ 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;
+}
+
/**
* subtitles format description
*/
{
int i_id;
} dvb;
+ struct
+ {
+ int i_magazine;
+ int i_page;
+ } teletext;
};
/**
- * ES definition
+ * ES language definition
*/
-struct es_format_t
+typedef struct extra_languages_t
{
- int i_cat;
- vlc_fourcc_t i_codec;
+ char *psz_language;
+ char *psz_description;
+} extra_languages_t;
- 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
+/**
+ * ES format definition
+ */
+struct es_format_t
+{
+ int i_cat; /**< ES category @see es_format_category_e */
+ vlc_fourcc_t i_codec; /**< FOURCC value as used in vlc */
+
+ 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;
-
- audio_format_t audio;
- video_format_t video;
- subs_format_t subs;
-
- unsigned int i_bitrate;
-
- vlc_bool_t b_packetized; /* wether the data is packetized
- (ie. not truncated) */
- int i_extra;
- void *p_extra;
-
-};
-/* ES Categories */
-#define UNKNOWN_ES 0x00
-#define VIDEO_ES 0x01
-#define AUDIO_ES 0x02
-#define SPU_ES 0x03
-#define NAV_ES 0x04
+ 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 */
-static inline void es_format_Init( es_format_t *fmt,
- int i_cat, vlc_fourcc_t i_codec )
-{
- 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;
- fmt->psz_description = NULL;
-
- memset( &fmt->audio, 0, sizeof(audio_format_t) );
- 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;
-}
+ 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 */
-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 );
- }
- else
- {
- dst->i_extra = 0;
- dst->p_extra = NULL;
- }
+ unsigned int i_bitrate; /**< bitrate of this ES */
- if( src->subs.psz_encoding )
- dst->subs.psz_encoding = strdup( src->subs.psz_encoding );
+ 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 */
- 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_Clean( es_format_t *fmt )
+/** ES Categories */
+enum es_format_category_e
{
- if( fmt->psz_language ) free( fmt->psz_language );
- fmt->psz_language = NULL;
+ UNKNOWN_ES = 0x00,
+ VIDEO_ES = 0x01,
+ AUDIO_ES = 0x02,
+ SPU_ES = 0x03,
+ NAV_ES = 0x04,
+};
- if( fmt->psz_description ) free( fmt->psz_description );
- fmt->psz_description = NULL;
+/**
+ * This function will fill all RGB shift from RGB masks.
+ */
+VLC_EXPORT( void, video_format_FixRgb, ( video_format_t * ) );
- if( fmt->i_extra > 0 ) free( fmt->p_extra );
- fmt->i_extra = 0; fmt->p_extra = NULL;
+/**
+ * This funtion will initialize a es_format_t structure.
+ */
+VLC_EXPORT( void, es_format_Init, ( es_format_t *, int i_cat, vlc_fourcc_t i_codec ) );
- if( fmt->video.p_palette ) free( fmt->video.p_palette );
- fmt->video.p_palette = NULL;
+/**
+ * This functions will copy a es_format_t.
+ */
+VLC_EXPORT( int, es_format_Copy, ( es_format_t *p_dst, const es_format_t *p_src ) );
- if( fmt->subs.psz_encoding ) free( fmt->subs.psz_encoding );
- fmt->subs.psz_encoding = NULL;
-}
+/**
+ * This function will clean up a es_format_t and relasing all associated
+ * resources.
+ * You can call it multiple times on the same structure.
+ */
+VLC_EXPORT( void, es_format_Clean, ( es_format_t *fmt ) );
#endif