* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
+#if !defined( __LIBVLC__ )
+ #error You are not libvlc or one of its plugins. You cannot include this file
+#endif
+
#ifndef _VLC_ES_H
#define _VLC_ES_H 1
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 */
+ vlc_bool_t 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 */
+ vlc_bool_t 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
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;
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) );
}
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);
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;
- if( fmt->i_extra_languages && fmt->p_extra_languages ) {
- int i = 0;
- while( i < fmt->i_extra_languages ) {
+ if( fmt->i_extra_languages > 0 && fmt->p_extra_languages )
+ {
+ int i;
+ for( i = 0; i < fmt->i_extra_languages; i++ )
+ {
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->p_extra_languages);
}
+
+ /* es_format_Clean can be called multiple times */
+ memset( fmt, 0, sizeof(*fmt) );
}
#endif