Changeset 6c9013a9d8c430c0c91e38ff204e7db72183bf70

Timestamp:

07/17/07 23:59:22 (1 year ago)

Author:

Antoine Cellerier <dionoea@videolan.org>

git-committer:

Antoine Cellerier <dionoea@videolan.org> 1184709562 +0000

git-parent:

[2fd187de931769cef2128cd7f0ede41f71732fda]

git-author:

Antoine Cellerier <dionoea@videolan.org> 1184709562 +0000

Message:

Automatically load files with the following extension using the rawvid module (and set height, width, aspect ratio, chroma and fps correctly): sqcif, qcif, cif, 4cif, 16cif, yuv.

Files:

• modules/demux/rawvid.c (modified) (4 diffs)

modules/demux/rawvid.c

@@ -65 +65 @@
-    set_callbacks( Open, Close );
-    add_shortcut( "rawvideo" );
-25
-176
-144
+0
+0
+0
-    add_string( "rawvid-chroma", NULL, NULL, CHROMA_TEXT, CHROMA_LONGTEXT,
-                VLC_TRUE );
@@ -93 +93 @@
-static int Demux( demux_t * );
-static int Control( demux_t *, int i_query, va_list args );
+
+struct preset_t
+{
+    const char *psz_ext;
+    int i_width;
+    int i_height;
+    double f_fps;
+    const char *psz_aspect_ratio;
+    const char *psz_chroma;
+};
+
+static struct preset_t p_presets[] =
+{
+    { "sqcif", 128, 96, 29.97, "4:3", "YV12" },
+    { "qcif", 176, 144, 29.97, "4:3", "YV12" },
+    { "cif", 352, 288, 29.97, "4:3", "YV12" },
+    { "4cif", 704, 576, 29.97, "4:3", "YV12" },
+    { "16cif", 1408, 1152, 29.97, "4:3", "YV12" },
+    { "yuv", 176, 144, 25, "4:3", "YV12" },
+    { "", 0, 0, 0., "", "" }
+};
-
-/*****************************************************************************
@@ -107 +128 @@
-    char *psz_aspect_ratio;
-    unsigned int i_aspect;
+    struct preset_t *p_preset = NULL;
-
-    /* Check for YUV file extension */
-    psz_ext = strrchr( p_demux->psz_path, '.' );
-
+
+
+
+
+
+
+
+
+
-        strcmp(p_demux->psz_demux, "rawvid") )
-    {
@@ -123 +153 @@
-
-    p_sys->f_fps = var_CreateGetFloat( p_demux, "rawvid-fps" );
-
-    i_width = var_CreateGetInteger( p_demux, "rawvid-width" );
-    i_height = var_CreateGetInteger( p_demux, "rawvid-height" );
+    psz_chroma = var_CreateGetString( p_demux, "rawvid-chroma" );
+    psz_aspect_ratio = var_CreateGetString( p_demux, "rawvid-aspect-ratio" );
+
+    if( p_preset && *p_preset->psz_ext )
+    {
+        if( !i_width ) i_width = p_preset->i_width;
+        if( !i_height ) i_height = p_preset->i_height;
+        if( !p_sys->f_fps ) p_sys->f_fps = p_preset->f_fps;
+        if( !*psz_aspect_ratio )
+        {
+            free( psz_aspect_ratio );
+            psz_aspect_ratio = strdup( psz_aspect_ratio );
+        }
+        if( !*psz_chroma )
+        {
+            free( psz_chroma );
+            psz_chroma = strdup( psz_chroma );
+        }
+    }
+
-    if( i_width <= 0 || i_height <= 0 )
-    {
-        msg_Err( p_demux, "width and height must be strictly positive." );
+        free( psz_aspect_ratio );
+        free( psz_chroma );
-        free( p_sys );
-        return VLC_EGENERIC;
-    }
-
-    psz_chroma = var_CreateGetString( p_demux, "rawvid-chroma" );
-    psz_aspect_ratio = var_CreateGetString( p_demux, "rawvid-aspect-ratio" );
-
-    if( psz_aspect_ratio && *psz_aspect_ratio )