Changeset 2f29e4ff655f3ad02ad22bbad4c3eca196ede762

Timestamp:

19/07/07 00:14:57 (1 year ago)

Author:

Antoine Cellerier <dionoea@videolan.org>

git-committer:

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

git-parent:

[9b007c13bd82a29ae60e4aae9da26487ecaa89f7]

git-author:

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

Message:

Also demux YUV4MPEG2 files with the raw video demux. Bump the demux score so that it's tested before ffmpeg. ( http://wiki.multimedia.cx/index.php?title=YUV4MPEG2 )

Files:

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

modules/demux/rawvid.c

@@ -60 +60 @@
-    set_shortname( "Raw Video" );
-    set_description( _("Raw video demuxer") );
-2
+3
-    set_category( CAT_INPUT );
-    set_subcategory( SUBCAT_INPUT_DEMUX );
@@ -86 +86 @@
-
-    mtime_t i_pcr;
+
+    vlc_bool_t b_y4m;
-};
-
@@ -127 +129 @@
-    uint32_t i_chroma;
-    char *psz_aspect_ratio;
-
+ = 0
-    struct preset_t *p_preset = NULL;
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    psz_ext = strrchr( p_demux->psz_path, '.' );
-
-    if( psz_ext )
-    {
@@ -138 +151 @@
-        for( p_preset = p_presets; *p_preset->psz_ext; p_preset++ )
-            if( !strcasecmp( psz_ext, p_preset->psz_ext ) )
+            {
+                b_valid = VLC_TRUE;
-                break;
-
-if( ( !p_preset || !*p_preset->psz_ext ) &&
-   
+        
+}
+if( ( !b_valid ) &&
-    {
-        return VLC_EGENERIC;
@@ -152 +167 @@
-    p_sys->i_pcr = 1;
-
+    p_sys->b_y4m = b_y4m;
-    p_sys->f_fps = var_CreateGetFloat( p_demux, "rawvid-fps" );
-    i_width = var_CreateGetInteger( p_demux, "rawvid-width" );
@@ -158 +174 @@
-    psz_aspect_ratio = var_CreateGetString( p_demux, "rawvid-aspect-ratio" );
-
+    if( b_y4m )
+    {
+        char *psz;
+        char *buf;
+        int a, b;
+        psz = stream_ReadLine( p_demux->s );
+
+        /* TODO: handle interlacing */
+
+#define READ_FRAC( key, num, den ) \
+        buf = strchr( psz+9, key );\
+        if( buf )\
+        {\
+            char *end = strchr( buf, ' ' );\
+            char *sep;\
+            if( end ) *end = '\0';\
+            sep = strchr( buf, ':' );\
+            if( sep )\
+            {\
+                *sep = '\0';\
+                den = atoi( sep+1 );\
+            }\
+            else\
+            {\
+                den = 1;\
+            }\
+            num = atoi( buf+1 );\
+            if( sep ) *sep = ':';\
+            if( end ) *end = ' ';\
+        }
+        READ_FRAC( 'W', i_width, a )
+        READ_FRAC( 'H', i_height, a )
+        READ_FRAC( 'F', a, b )
+        p_sys->f_fps = (double)a/(double)b;
+        READ_FRAC( 'A', a, b )
+        if( b != 0 ) i_aspect = a * VOUT_ASPECT_FACTOR / b;
+
+        buf = strchr( psz+9, 'C' );
+        if( buf )
+        {
+            char *end = strchr( buf, ' ' );
+            if( end ) *end = '\0';
+            buf++;
+            if( !strncmp( buf, "C420jpeg", 8 ) )
+            {
+                psz_chroma = strdup( "I420" );
+            }
+            else if( !strncmp( buf, "C420paldv", 9 ) )
+            {
+                psz_chroma = strdup( "I420" );
+            }
+            else if( !strncmp( buf, "C420", 4 ) )
+            {
+                psz_chroma = strdup( "I420" );
+            }
+            else if( !strncmp( buf, "C422", 4 ) )
+            {
+                psz_chroma = strdup( "I422" );
+            }
+            else if( !strncmp( buf, "C444", 4 ) )
+            {
+                psz_chroma = strdup( "I444" );
+            }
+            else
+            {
+                msg_Warn( p_demux, "Unknown YUV4MPEG2 chroma type \"%s\"",
+                          buf );
+            }
+            if( end ) *end = ' ';
+        }
+
+        free( psz );
+    }
+
-    if( p_preset && *p_preset->psz_ext )
-    {
@@ -184 +274 @@
-    }
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-        else
-        {
-
-
-
-
-
-
+
+
-    }
-    free( psz_aspect_ratio );
@@ -257 +350 @@
-    /* Call the pace control */
-    es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_sys->i_pcr );
+
+    if( p_sys->b_y4m )
+    {
+        /* Skip the frame header */
+        unsigned char psz_buf[10];
+        psz_buf[9] = '\0';
+        stream_Read( p_demux->s, psz_buf, strlen( "FRAME" ) );
+        while( psz_buf[0] != 0x0a )
+        {
+            if( stream_Read( p_demux->s, psz_buf, 1 ) < 1 )
+                return 0;
+        }
+    }
-
-    if( ( p_block = stream_Block( p_demux->s, p_sys->frame_size ) ) == NULL )