* include/vlc_common.h: define PATH_MAX on WinCE.

[vlc] / include / vlc_es.h

diff --git a/include/vlc_es.h b/include/vlc_es.h
index 00a9e5651312ece6d40a816552e2cbd58d55f9b9..0685fabff25fec7d50218fcf123e44083e5e8348 100644 (file)
--- a/include/vlc_es.h
+++ b/include/vlc_es.h
@@ -31,12 +31,12 @@
 
 /**
  * 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 */
+    int i_entries;      /**< to keep the compatibility with ffmpeg's palette */
     uint8_t palette[256][4];                   /**< 4-byte RGBA/YUVA palette */
 };
 
@@ -74,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
  */
@@ -94,7 +102,7 @@ struct video_format_t
     unsigned int i_frame_rate;                     /**< frame rate numerator */
     unsigned int i_frame_rate_base;              /**< frame rate denominator */
 
-    int i_rmask, i_rgmask, i_bmask;          /**< color masks for RGB chroma */
+    int i_rmask, i_gmask, i_bmask;          /**< color masks for RGB chroma */
     video_palette_t *p_palette;              /**< video palette from demuxer */
 };
 
@@ -103,12 +111,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
@@ -202,8 +221,10 @@ static inline void es_format_Copy( es_format_t *dst, es_format_t *src )
 
     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 ) );
+        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 ) );
     }
 }