Fix comment

[vlc] / include / vlc_es.h

diff --git a/include/vlc_es.h b/include/vlc_es.h
index 5cf15bc15700ec69a237cb7e0e308ffdc86568fb..ea81ac0e2dc31cbd359993877da5495a39795660 100644 (file)
--- 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
 
@@ -69,9 +73,9 @@ 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 */
 };
 
 #ifdef WORDS_BIGENDIAN
@@ -142,6 +146,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;
@@ -156,8 +167,11 @@ struct es_format_t
                                     -1 : mean not selected by default even
                                         when no other stream
                                     >=0: priority */
+
     char            *psz_language;
     char            *psz_description;
+    int             i_extra_languages;
+    extra_languages_t *p_extra_languages;
 
     audio_format_t audio;
     video_format_t video;
@@ -190,6 +204,9 @@ static inline void es_format_Init( es_format_t *fmt,
     fmt->psz_language           = NULL;
     fmt->psz_description        = NULL;
 
+    fmt->i_extra_languages      = 0;
+    fmt->p_extra_languages      = NULL;
+
     memset( &fmt->audio, 0, sizeof(audio_format_t) );
     memset( &fmt->video, 0, sizeof(video_format_t) );
     memset( &fmt->subs, 0, sizeof(subs_format_t) );
@@ -202,6 +219,7 @@ static inline void es_format_Init( es_format_t *fmt,
 
 static inline void es_format_Copy( es_format_t *dst, es_format_t *src )
 {
+    int i;
     memcpy( dst, src, sizeof( es_format_t ) );
     if( src->psz_language )
          dst->psz_language = strdup( src->psz_language );
@@ -229,6 +247,21 @@ static inline void es_format_Copy( es_format_t *dst, es_format_t *src )
         memcpy( dst->video.p_palette, src->video.p_palette,
                 sizeof( video_palette_t ) );
     }
+
+    dst->i_extra_languages = src->i_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);
+        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);
+        else
+            dst->p_extra_languages[i].psz_description = NULL;
+    }
 }
 
 static inline void es_format_Clean( es_format_t *fmt )
@@ -240,13 +273,28 @@ static inline void es_format_Clean( es_format_t *fmt )
     fmt->psz_description = NULL;
 
     if( fmt->i_extra > 0 ) free( fmt->p_extra );
-    fmt->i_extra = 0; fmt->p_extra = NULL;
+    fmt->i_extra = 0;
+    fmt->p_extra = NULL;
 
-    if( fmt->video.p_palette ) free( fmt->video.p_palette );
+    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->p_extra_languages);
+    }
+    fmt->i_extra_languages = 0;
+    fmt->p_extra_languages = NULL;
+}
 #endif