X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Favformat%2Fproducer_avformat.c;h=ed7694d5b0a8c5e5fc06a214ed422f4b026e4eee;hb=bd208d01a2a792e698a9b4884b43602b2f245a8f;hp=f1ca0a7851bf2dd27efe2450abca4deca8e34355;hpb=6ff5549dc913d3976ef611d4c056b0fcb5d520e5;p=melted diff --git a/src/modules/avformat/producer_avformat.c b/src/modules/avformat/producer_avformat.c index f1ca0a7..ed7694d 100644 --- a/src/modules/avformat/producer_avformat.c +++ b/src/modules/avformat/producer_avformat.c @@ -33,14 +33,13 @@ #include #include +void avformat_lock( ); +void avformat_unlock( ); + // Forward references. static int producer_open( mlt_producer this, char *file ); static int producer_get_frame( mlt_producer this, mlt_frame_ptr frame, int index ); -// A static flag used to determine if avformat has been initialised -static int avformat_initialised = 0; -static pthread_mutex_t avformat_mutex; - /** Constructor for libavformat. */ @@ -69,14 +68,6 @@ mlt_producer producer_avformat_init( char *file ) // Register our get_frame implementation this->get_frame = producer_get_frame; - // Initialise avformat if necessary - if ( avformat_initialised == 0 ) - { - pthread_mutex_init( &avformat_mutex, NULL ); - avformat_initialised = 1; - av_register_all( ); - } - // Open the file if ( producer_open( this, file ) != 0 ) { @@ -128,13 +119,13 @@ static void producer_file_close( void *context ) if ( context != NULL ) { // Lock the mutex now - pthread_mutex_lock( &avformat_mutex ); + avformat_lock( ); // Close the file av_close_input_file( context ); // Unlock the mutex now - pthread_mutex_unlock( &avformat_mutex ); + avformat_unlock( ); } } @@ -146,13 +137,13 @@ static void producer_codec_close( void *codec ) if ( codec != NULL ) { // Lock the mutex now - pthread_mutex_lock( &avformat_mutex ); + avformat_lock( ); // Close the file avcodec_close( codec ); // Unlock the mutex now - pthread_mutex_unlock( &avformat_mutex ); + avformat_unlock( ); } } @@ -174,11 +165,85 @@ static int producer_open( mlt_producer this, char *file ) double fps = mlt_properties_get_double( properties, "fps" ); // Lock the mutex now - pthread_mutex_lock( &avformat_mutex ); + avformat_lock( ); + + // 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 ) @@ -208,7 +273,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 ) { @@ -241,7 +306,7 @@ static int producer_open( mlt_producer this, char *file ) } // Unlock the mutex now - pthread_mutex_unlock( &avformat_mutex ); + avformat_unlock( ); return error; } @@ -309,7 +374,7 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form int ignore = 0; // Current time calcs - double current_time = 0; + double current_time = mlt_properties_get_double( properties, "current_time" ); // We may want to use the source fps if available double source_fps = mlt_properties_get_double( properties, "source_fps" ); @@ -324,16 +389,14 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form mlt_properties_set_int( frame_properties, "height", *height ); // Lock the mutex now - pthread_mutex_lock( &avformat_mutex ); + avformat_lock( ); // Construct an AVFrame for YUV422 conversion if ( output == NULL ) { - int size = avpicture_get_size( PIX_FMT_YUV422, *width, *height ); - size += *width * 2; + int size = avpicture_get_size( PIX_FMT_YUV422, *width, *height + 1 ); uint8_t *buf = mlt_pool_alloc( size ); output = mlt_pool_alloc( sizeof( AVPicture ) ); - //memset( output, 0, sizeof( AVPicture ) ); avpicture_fill( output, buf, PIX_FMT_YUV422, *width, *height ); mlt_properties_set_data( properties, "video_output_frame", output, 0, ( mlt_destructor )mlt_pool_release, NULL ); mlt_properties_set_data( properties, "video_output_buffer", buf, 0, ( mlt_destructor )mlt_pool_release, NULL ); @@ -358,7 +421,7 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form av_seek_frame( context, -1, real_timecode * 1000000.0 ); // Remove the cached info relating to the previous position - mlt_properties_set_double( properties, "current_time", 0 ); + mlt_properties_set_double( properties, "current_time", real_timecode ); mlt_properties_set_data( properties, "current_image", NULL, 0, NULL, NULL ); } } @@ -395,27 +458,32 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form // We only deal with video from the selected video_index if ( ret >= 0 && pkt.stream_index == index && pkt.size > 0 ) { - current_time = ( double )pkt.pts / 1000000.0; - // Decode the image ret = avcodec_decode_video( codec_context, &frame, &got_picture, pkt.data, pkt.size ); if ( got_picture ) { + if ( pkt.pts != AV_NOPTS_VALUE && pkt.pts != 0 ) + current_time = ( double )pkt.pts / 1000000.0; + else + current_time = real_timecode; + // Handle ignore - if ( current_time < real_timecode ) + if ( ( int )( current_time * 100 ) < ( int )( real_timecode * 100 ) - 7 ) { ignore = 0; got_picture = 0; } else if ( current_time >= real_timecode ) { + //current_time = real_timecode; ignore = 0; } - else if ( got_picture && ignore -- ) + else if ( ignore -- ) { got_picture = 0; } + mlt_properties_set_int( properties, "top_field_first", frame.top_field_first ); } } @@ -444,9 +512,9 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form { register int i, j; register int half = *width >> 1; - uint8_t *Y = ( ( AVPicture * )&frame )->data[ 0 ]; - uint8_t *U = ( ( AVPicture * )&frame )->data[ 1 ]; - uint8_t *V = ( ( AVPicture * )&frame )->data[ 2 ]; + register uint8_t *Y = ( ( AVPicture * )&frame )->data[ 0 ]; + register uint8_t *U = ( ( AVPicture * )&frame )->data[ 1 ]; + register uint8_t *V = ( ( AVPicture * )&frame )->data[ 2 ]; register uint8_t *d = *buffer; register uint8_t *y, *u, *v; @@ -504,12 +572,16 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form } } } + + // Set the field order property for this frame + mlt_properties_set_int( frame_properties, "top_field_first", + mlt_properties_get_int( properties, "top_field_first" ) ); // Regardless of speed, we expect to get the next frame (cos we ain't too bright) mlt_properties_set_position( properties, "video_expected", position + 1 ); // Unlock the mutex now - pthread_mutex_unlock( &avformat_mutex ); + avformat_unlock( ); return 0; } @@ -532,7 +604,7 @@ static void producer_set_up_video( mlt_producer this, mlt_frame frame ) mlt_properties frame_properties = mlt_frame_properties( frame ); // Lock the mutex now - pthread_mutex_lock( &avformat_mutex ); + avformat_lock( ); if ( context != NULL && index != -1 ) { @@ -554,34 +626,8 @@ static void producer_set_up_video( mlt_producer this, mlt_frame frame ) // If we don't have a codec and we can't initialise it, we can't do much more... if ( codec != NULL && avcodec_open( codec_context, codec ) >= 0 ) { - double aspect_ratio = 0; - 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; - - // 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 ); - - // Determine the fps - source_fps = ( double )codec_context->frame_rate / 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 ); - // Now store the codec with its destructor mlt_properties_set_data( properties, "video_codec", codec_context, 0, producer_codec_close, NULL ); - - // Set to the real timecode - av_seek_frame( context, -1, 0 ); } else { @@ -593,6 +639,27 @@ static void producer_set_up_video( mlt_producer this, mlt_frame frame ) // No codec, no show... if ( codec != NULL ) { + double aspect_ratio = 1; + double source_fps = 0; + + // Set aspect ratio + if ( codec_context->sample_aspect_ratio.num > 0 ) + aspect_ratio = av_q2d( codec_context->sample_aspect_ratio ); + + mlt_properties_set_double( properties, "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 == 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 ); } @@ -607,7 +674,7 @@ static void producer_set_up_video( mlt_producer this, mlt_frame frame ) } // Unlock the mutex now - pthread_mutex_unlock( &avformat_mutex ); + avformat_unlock( ); } /** Get the audio from a frame. @@ -665,10 +732,10 @@ static int producer_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_form int locked = 0; // Lock the mutex now - pthread_mutex_lock( &avformat_mutex ); + avformat_lock( ); // Check for resample and create if necessary - if ( resample == NULL ) + if ( resample == NULL && codec_context->channels <= 2 ) { // Create the resampler resample = audio_resample_init( *channels, codec_context->channels, *frequency, codec_context->sample_rate ); @@ -676,6 +743,11 @@ static int producer_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_form // And store it on properties mlt_properties_set_data( properties, "audio_resample", resample, 0, ( mlt_destructor )audio_resample_close, NULL ); } + else if ( resample == NULL ) + { + *channels = codec_context->channels; + *frequency = codec_context->sample_rate; + } // Check for audio buffer and create if necessary if ( audio_buffer == NULL ) @@ -737,7 +809,7 @@ static int producer_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_form uint8_t *ptr = pkt.data; int data_size; - // We only deal with video from the selected video_index + // We only deal with audio from the selected audio_index while ( ptr != NULL && ret >= 0 && pkt.stream_index == index && len > 0 ) { // Decode the audio @@ -754,9 +826,15 @@ static int producer_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_form if ( data_size > 0 ) { - int size_out = audio_resample( resample, &audio_buffer[ audio_used * *channels ], temp, data_size / ( codec_context->channels * sizeof( int16_t ) ) ); - - audio_used += size_out; + if ( resample != NULL ) + { + audio_used += audio_resample( resample, &audio_buffer[ audio_used * *channels ], temp, data_size / ( codec_context->channels * sizeof( int16_t ) ) ); + } + else + { + memcpy( &audio_buffer[ audio_used * *channels ], temp, data_size ); + audio_used += data_size / ( codec_context->channels * sizeof( int16_t ) ); + } // Handle ignore while ( ignore && audio_used > *samples ) @@ -787,7 +865,7 @@ static int producer_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_form mlt_properties_set_double( properties, "discrepancy", discrepancy ); } - if ( discrepancy * current_pts <= ( real_timecode - 0.02 ) ) + if ( !ignore && discrepancy * current_pts <= ( real_timecode - 0.02 ) ) ignore = 1; } @@ -827,7 +905,7 @@ static int producer_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_form mlt_properties_set_position( properties, "audio_expected", position + 1 ); // Unlock the mutex now - pthread_mutex_unlock( &avformat_mutex ); + avformat_unlock( ); return 0; } @@ -847,7 +925,7 @@ static void producer_set_up_audio( mlt_producer this, mlt_frame frame ) int index = mlt_properties_get_int( properties, "audio_index" ); // Lock the mutex now - pthread_mutex_lock( &avformat_mutex ); + avformat_lock( ); // Deal with audio context if ( context != NULL && index != -1 ) @@ -893,7 +971,7 @@ static void producer_set_up_audio( mlt_producer this, mlt_frame frame ) } // Unlock the mutex now - pthread_mutex_unlock( &avformat_mutex ); + avformat_unlock( ); } /** Our get frame implementation.