X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_es.h;h=e1fe3eef25708dcf98cd31be0abd983f0586774b;hb=c870537e955ea2784c73d727ea28666e8bcbdef6;hp=f4c85d62fa5711fbb6aae50c62d0ed4f9adc4bde;hpb=fa5f109874fe4b8bd8e405e674c8d73603f64eb1;p=vlc

diff --git a/include/vlc_es.h b/include/vlc_es.h
index f4c85d62fa..e1fe3eef25 100644
--- a/include/vlc_es.h
+++ b/include/vlc_es.h
@@ -2,7 +2,7 @@
  * vlc_es.h: Elementary stream formats descriptions
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: vlc_es.h,v 1.7 2004/01/25 21:39:37 gbazin Exp $
+ * $Id$
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -31,15 +31,13 @@
 
 /**
  * video palette data
- * \see viedo_format_t
+ * \see video_format_t
  * \see subs_format_t
  */
 struct video_palette_t
 {
-    int i_dummy; /**< to keep the compatibility with ffmpeg's palette */
-
-    uint32_t palette[256]; /**< 4-byte ARGB palette entries, stored in native
-                            * byte order */
+    int i_entries;      /**< to keep the compatibility with ffmpeg's palette */
+    uint8_t palette[256][4];                   /**< 4-byte RGBA/YUVA palette */
 };
 
 /**
@@ -76,6 +74,14 @@ struct audio_format_t
     int i_bitspersample;
 };
 
+#ifdef WORDS_BIGENDIAN
+#   define AUDIO_FMT_S16_NE VLC_FOURCC('s','1','6','b')
+#   define AUDIO_FMT_U16_NE VLC_FOURCC('u','1','6','b')
+#else
+#   define AUDIO_FMT_S16_NE VLC_FOURCC('s','1','6','l')
+#   define AUDIO_FMT_U16_NE VLC_FOURCC('u','1','6','l')
+#endif
+
 /**
  * video format description
  */
@@ -93,9 +99,13 @@ struct video_format_t
 
     unsigned int i_bits_per_pixel;             /**< number of bits per pixel */
 
+    unsigned int i_sar_num;                   /**< sample/pixel aspect ratio */
+    unsigned int i_sar_den;
+
     unsigned int i_frame_rate;                     /**< frame rate numerator */
     unsigned int i_frame_rate_base;              /**< frame rate denominator */
 
+    int i_rmask, i_gmask, i_bmask;          /**< color masks for RGB chroma */
     video_palette_t *p_palette;              /**< video palette from demuxer */
 };
 
@@ -104,12 +114,23 @@ struct video_format_t
  */
 struct subs_format_t
 {
+    /* the character encoding of the text of the subtitle.
+     * all gettext recognized shorts can be used */
     char *psz_encoding;
 
+
+    int  i_x_origin; /**< x coordinate of the subtitle. 0 = left */
+    int  i_y_origin; /**< y coordinate of the subtitle. 0 = top */
+
     struct
     {
-        /* FIXME */
+        /*  */
         uint32_t palette[16+1];
+
+        /* the width of the original movie the spu was extracted from */
+        int	i_original_frame_width;
+        /* the height of the original movie the spu was extracted from */
+        int	i_original_frame_height;
     } spu;
 
     struct
@@ -142,8 +163,10 @@ struct es_format_t
     video_format_t video;
     subs_format_t  subs;
 
-    int     i_bitrate;
+    int            i_bitrate;
 
+    vlc_bool_t     b_packetized; /* wether the data is packetized
+                                    (ie. not truncated) */
     int     i_extra;
     void    *p_extra;
 
@@ -171,6 +194,7 @@ 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->i_bitrate              = 0;
     fmt->i_extra                = 0;
     fmt->p_extra                = NULL;
@@ -179,17 +203,50 @@ static inline void es_format_Init( es_format_t *fmt,
 static inline void es_format_Copy( es_format_t *dst, es_format_t *src )
 {
     memcpy( dst, src, sizeof( es_format_t ) );
+    if( src->psz_language )
+         dst->psz_language = strdup( src->psz_language );
+    if( src->psz_description )
+        dst->psz_description = strdup( src->psz_description );
     if( src->i_extra > 0 )
     {
+        dst->i_extra = src->i_extra;
         dst->p_extra = malloc( src->i_extra );
-        memcpy( dst->p_extra, src->p_extra,
-                src->i_extra );
+        memcpy( dst->p_extra, src->p_extra, src->i_extra );
     }
     else
     {
         dst->i_extra = 0;
         dst->p_extra = NULL;
     }
+
+    if( src->subs.psz_encoding )
+        dst->subs.psz_encoding = strdup( src->subs.psz_encoding );
+
+    if( src->video.p_palette )
+    {
+        dst->video.p_palette =
+            (video_palette_t*)malloc( sizeof( video_palette_t ) );
+        memcpy( dst->video.p_palette, src->video.p_palette,
+                sizeof( video_palette_t ) );
+    }
+}
+
+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;
 }
 
 #endif