X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_es.h;h=0d8d568a1b761edf33e243616d1288e841e82b02;hb=6d9e92da983e3ae91b09ce983aae5b851a6d884c;hp=675dcb3f7a759ac24edbf40f8f8d901540c93d67;hpb=9b14f80f77a367ba1a87c3c8e45af76ee6127ffd;p=vlc

diff --git a/include/vlc_es.h b/include/vlc_es.h
index 675dcb3f7a..0d8d568a1b 100644
--- a/include/vlc_es.h
+++ b/include/vlc_es.h
@@ -21,6 +21,10 @@
  * 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
 
@@ -40,6 +44,25 @@ struct video_palette_t
     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
  */
@@ -69,9 +92,10 @@ 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
@@ -169,7 +193,8 @@ struct es_format_t
     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;
 
@@ -201,9 +226,10 @@ static inline void es_format_Init( es_format_t *fmt,
     fmt->psz_description        = NULL;
 
     fmt->i_extra_languages      = 0;
-    fmt->p_extra_languages      = NULL;    
+    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) );
 
@@ -245,14 +271,16 @@ static inline void es_format_Copy( es_format_t *dst, es_format_t *src )
     }
 
     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;
     }
@@ -260,32 +288,26 @@ static inline void es_format_Copy( es_format_t *dst, es_format_t *src )
 
 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