Noise and mirrors

[mlt] / src / modules / avformat / producer_avformat.c

diff --git a/src/modules/avformat/producer_avformat.c b/src/modules/avformat/producer_avformat.c
index 8400f41e320334f356f085df86044a8842cfc5d2..b5f7f62e816d4ff1c83e07af009c94bc546859d6 100644 (file)
--- a/src/modules/avformat/producer_avformat.c
+++ b/src/modules/avformat/producer_avformat.c
@@ -41,6 +41,7 @@ static int producer_get_frame( mlt_producer this, mlt_frame_ptr frame, int index
 static int avformat_initialised = 0;
 static pthread_mutex_t avformat_mutex;
 
+#if 0
 void *av_malloc( unsigned int size )
 {
        return mlt_pool_alloc( size );
@@ -55,6 +56,7 @@ void av_free( void *ptr )
 {
        return mlt_pool_release( ptr );
 }
+#endif
 
 /** Constructor for libavformat.
 */
@@ -190,10 +192,84 @@ static int producer_open( mlt_producer this, char *file )
 
        // Lock the mutex now
        pthread_mutex_lock( &avformat_mutex );
+       
+       // If "MRL", then create AVInputFormat
+       AVInputFormat *format = NULL;
+       AVFormatParameters *params = NULL;
+       char *standard = NULL;
+       char *mrl = strchr( file, ':' );
+       
+       // Only if there is not a protocol specification that avformat can handle
+       if ( mrl && !url_exist( file ) )
+       {
+               // 'file' becomes format abbreviation
+               mrl[0] = 0;
+       
+               // Lookup the format
+               format = av_find_input_format( file );
+               
+               // Eat the format designator
+               file = ++mrl;
+               
+               if ( format )
+               {
+                       // Allocate params
+                       params = calloc( sizeof( AVFormatParameters ), 1 );
+                       
+                       // These are required by video4linux (defaults)
+                       params->width = 640;
+                       params->height = 480;
+                       params->frame_rate = 25;
+                       params->frame_rate_base = 1;
+                       params->device = file;
+                       params->channels = 2;
+                       params->sample_rate = 48000;
+               }
+               
+               // Parse out params
+               mrl = strchr( file, '?' );
+               while ( mrl )
+               {
+                       mrl[0] = 0;
+                       char *name = strdup( ++mrl );
+                       char *value = strchr( name, ':' );
+                       if ( value )
+                       {
+                               value[0] = 0;
+                               value++;
+                               char *t = strchr( value, '&' );
+                               if ( t )
+                                       t[0] = 0;
+                               if ( !strcmp( name, "frame_rate" ) )
+                                       params->frame_rate = atoi( value );
+                               else if ( !strcmp( name, "frame_rate_base" ) )
+                                       params->frame_rate_base = atoi( value );
+                               else if ( !strcmp( name, "sample_rate" ) )
+                                       params->sample_rate = atoi( value );
+                               else if ( !strcmp( name, "channels" ) )
+                                       params->channels = atoi( value );
+                               else if ( !strcmp( name, "width" ) )
+                                       params->width = atoi( value );
+                               else if ( !strcmp( name, "height" ) )
+                                       params->height = atoi( value );
+                               else if ( !strcmp( name, "standard" ) )
+                               {
+                                       standard = strdup( value );
+                                       params->standard = standard;
+                               }
+                       }
+                       free( name );
+                       mrl = strchr( mrl, '&' );
+               }
+       }
 
        // Now attempt to open the file
-       error = av_open_input_file( &context, file, NULL, 0, NULL );
+       error = av_open_input_file( &context, file, format, 0, params );
        error = error < 0;
+       
+       // Cleanup AVFormatParameters
+       free( standard );
+       free( params );
 
        // If successful, then try to get additional info
        if ( error == 0 )
@@ -223,7 +299,7 @@ static int producer_open( mlt_producer this, char *file )
                        // Store selected audio and video indexes on properties
                        mlt_properties_set_int( properties, "audio_index", audio_index );
                        mlt_properties_set_int( properties, "video_index", video_index );
-
+                       
                        // We're going to cheat here - for a/v files, we will have two contexts (reasoning will be clear later)
                        if ( audio_index != -1 && video_index != -1 )
                        {
@@ -586,32 +662,29 @@ static void producer_set_up_video( mlt_producer this, mlt_frame frame )
                // No codec, no show...
                if ( codec != NULL )
                {
-                       double aspect_ratio = 0;
+                       double aspect_ratio = 1;
                        double source_fps = 0;
 
                        // Set aspect ratio
-                       if ( codec_context->sample_aspect_ratio.num == 0 )
-                               aspect_ratio = 0;
-                       else
-                               aspect_ratio = av_q2d( codec_context->sample_aspect_ratio ) * codec_context->width / codec_context->height;
+                       if ( codec_context->sample_aspect_ratio.num > 0 )
+                               aspect_ratio = av_q2d( codec_context->sample_aspect_ratio );
 
-                       // XXX: This assumes square pixels!
-                       if (aspect_ratio <= 0.0)
-                               aspect_ratio = ( double )codec_context->width / ( double )codec_context->height;
-                               
                        mlt_properties_set_double( properties, "aspect_ratio", aspect_ratio );
-                       //fprintf( stderr, "AVFORMAT: sample aspect %f computed display aspect %f\n", av_q2d( codec_context->sample_aspect_ratio ), aspect_ratio );
+                       //fprintf( stderr, "AVFORMAT: sample aspect %f %dx%d\n", av_q2d( codec_context->sample_aspect_ratio ), codec_context->width, codec_context->height );
 
                        // Determine the fps
-                       source_fps = ( double )codec_context->frame_rate / codec_context->frame_rate_base;
+                       source_fps = ( double )codec_context->frame_rate / ( codec_context->frame_rate_base == 0 ? 1 : codec_context->frame_rate_base );
 
                        // We'll use fps if it's available
                        if ( source_fps > 0 && source_fps < 30 )
                                mlt_properties_set_double( properties, "source_fps", source_fps );
+                       
+                       // Set the width and height
+                       mlt_properties_set_int( frame_properties, "width", codec_context->width );
+                       mlt_properties_set_int( frame_properties, "height", codec_context->height );
 
                        mlt_frame_push_get_image( frame, producer_get_image );
                        mlt_properties_set_data( frame_properties, "avformat_producer", this, 0, NULL, NULL );
-
                }
                else
                {