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 de43864f5a31562924f1b8beabf1ecd258c38f12..d020d134ac7442f0568b5a67edc70b2220190c6e 100644 (file)
--- a/include/vlc_es.h
+++ b/include/vlc_es.h
@@ -21,13 +21,13 @@
  * 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
 
+/* 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
@@ -53,12 +53,12 @@ struct video_palette_t
 typedef struct
 {
     /* true if we have the peak value */
-    vlc_bool_t pb_peak[AUDIO_REPLAY_GAIN_MAX];
+    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 */
-    vlc_bool_t pb_gain[AUDIO_REPLAY_GAIN_MAX];
+    bool pb_gain[AUDIO_REPLAY_GAIN_MAX];
     /* gain value in dB */
     float      pf_gain[AUDIO_REPLAY_GAIN_MAX];
 } audio_replay_gain_t;
@@ -95,6 +95,7 @@ struct audio_format_t
     unsigned     i_bitspersample;
     unsigned     i_blockalign;
     uint8_t      i_channels; /* must be <=32 */
+    uint8_t      i_flavor;
 };
 
 #ifdef WORDS_BIGENDIAN
@@ -129,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 */
 };
 
@@ -199,7 +203,7 @@ struct es_format_t
 
     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;
@@ -232,13 +236,13 @@ static inline void es_format_Init( es_format_t *fmt,
     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 ) );
@@ -275,40 +279,36 @@ static inline void es_format_Copy( es_format_t *dst, es_format_t *src )
             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 );
-
-    if( fmt->psz_description ) free( fmt->psz_description );
+    free( fmt->psz_language );
+    free( fmt->psz_description );
 
     if( fmt->i_extra > 0 ) free( fmt->p_extra );
 
-    if( fmt->video.p_palette )
-        free( fmt->video.p_palette );
-
-    if( fmt->subs.psz_encoding ) free( fmt->subs.psz_encoding );
+    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++ )
         {
-            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 );
+            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 */