Preferences: fix some memleaks and fix horrible video-filter bug. :D

[vlc] / include / vlc_es.h

diff --git a/include/vlc_es.h b/include/vlc_es.h
index b59b9084b90becf247a109e736b9c9c2f44f2c70..d020d134ac7442f0568b5a67edc70b2220190c6e 100644 (file)
--- a/include/vlc_es.h
+++ b/include/vlc_es.h
@@ -24,6 +24,10 @@
 #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
@@ -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 */
+    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
  */
@@ -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
@@ -106,6 +130,9 @@ struct video_format_t
     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 */
 };
 
@@ -142,6 +169,13 @@ struct subs_format_t
 /**
  * ES definition
  */
+typedef struct extra_languages_t
+{
+        char *psz_language;
+        char *psz_description;
+} extra_languages_t;
+
+
 struct es_format_t
 {
     int             i_cat;
@@ -160,18 +194,16 @@ struct es_format_t
     char            *psz_language;
     char            *psz_description;
     int             i_extra_languages;
-    struct {
-        char *psz_language;
-        char *psz_description;
-    } *p_extra_languages;
-    
-    audio_format_t audio;
+    extra_languages_t *p_extra_languages;
+
+    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;
@@ -197,19 +229,20 @@ 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) );
 
-    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 ) );
@@ -241,47 +274,44 @@ 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 = 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