#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
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 */
};
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;
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;
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 ) );
}
dst->i_extra_languages = src->i_extra_languages;
- dst->p_extra_languages = (extra_languages_t*) malloc( dst->i_extra_languages * sizeof(*dst->p_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);
+ 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);
+ 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;
-
- if( fmt->subs.psz_encoding ) free( fmt->subs.psz_encoding );
- fmt->subs.psz_encoding = NULL;
-
- if( fmt->i_extra_languages && fmt->p_extra_languages ) {
- int i = 0;
- while( i < fmt->i_extra_languages ) {
- if( fmt->p_extra_languages[i].psz_language )
- free( fmt->p_extra_languages[i].psz_language );
- if( fmt->p_extra_languages[i].psz_description )
- free( fmt->p_extra_languages[i].psz_description );
- i++;
+
+ free( fmt->video.p_palette );
+ free( fmt->subs.psz_encoding );
+
+ 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);
+ free( fmt->p_extra_languages );
}
+
+ /* es_format_Clean can be called multiple times */
+ memset( fmt, 0, sizeof(*fmt) );
}
#endif