X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Favformat%2Fproducer_avformat.c;h=4f83e41108ac66c6cc6bfa1d19a948df70f82fb6;hb=893c1fd02a382ac0b865aeb5f651c046e95a77a6;hp=773632ab94523b9bff351d702c463b8fa5cd2d6a;hpb=b49b8059af440b18c427842272f57808fc465c4f;p=melted diff --git a/src/modules/avformat/producer_avformat.c b/src/modules/avformat/producer_avformat.c index 773632a..4f83e41 100644 --- a/src/modules/avformat/producer_avformat.c +++ b/src/modules/avformat/producer_avformat.c @@ -25,7 +25,7 @@ #include // ffmpeg Header files -#include +#include // System header files #include @@ -33,29 +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; - -void *av_malloc( unsigned int size ) -{ - return mlt_pool_alloc( size ); -} - -void *av_realloc( void *ptr, unsigned int size ) -{ - return mlt_pool_realloc( ptr, size ); -} - -void av_free( void *ptr ) -{ - return mlt_pool_release( ptr ); -} - /** Constructor for libavformat. */ @@ -84,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 ) - { - avformat_initialised = 1; - pthread_mutex_init( &avformat_mutex, NULL ); - av_register_all( ); - } - // Open the file if ( producer_open( this, file ) != 0 ) { @@ -143,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( ); } } @@ -161,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( ); } } @@ -189,7 +165,7 @@ 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; @@ -230,7 +206,7 @@ static int producer_open( mlt_producer this, char *file ) { mrl[0] = 0; char *name = strdup( ++mrl ); - char *value = strchr( name, '=' ); + char *value = strchr( name, ':' ); if ( value ) { value[0] = 0; @@ -294,10 +270,16 @@ static int producer_open( mlt_producer this, char *file ) // Find default audio and video streams find_default_streams( context, &audio_index, &video_index ); + // Check if we're seekable (something funny about mpeg here :-/) + if ( strstr( file, ".mpg" ) == NULL && strstr( file, ".mpeg" ) == NULL ) + mlt_properties_set_int( properties, "seekable", av_seek_frame( context, -1, context->start_time ) >= 0 ); + else + mlt_properties_set_int( properties, "seekable", 1 ); + // 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 ) { @@ -330,7 +312,7 @@ static int producer_open( mlt_producer this, char *file ) } // Unlock the mutex now - pthread_mutex_unlock( &avformat_mutex ); + avformat_unlock( ); return error; } @@ -377,7 +359,7 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form mlt_position expected = mlt_properties_get_position( properties, "video_expected" ); // Calculate the real time code - double real_timecode = producer_time_of_frame( this, position ) + mlt_properties_get_double( properties, "_v_pts_offset" ); + double real_timecode = producer_time_of_frame( this, position ); // Get the video stream AVStream *stream = context->streams[ index ]; @@ -412,17 +394,12 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form mlt_properties_set_int( frame_properties, "width", *width ); mlt_properties_set_int( frame_properties, "height", *height ); - // Lock the mutex now - pthread_mutex_lock( &avformat_mutex ); - // 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 ); @@ -444,7 +421,7 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form else { // Set to the real timecode - av_seek_frame( context, -1, real_timecode * 1000000.0 ); + av_seek_frame( context, -1, context->start_time + real_timecode * 1000000.0 ); // Remove the cached info relating to the previous position mlt_properties_set_double( properties, "current_time", real_timecode ); @@ -490,19 +467,12 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form if ( got_picture ) { if ( pkt.pts != AV_NOPTS_VALUE && pkt.pts != 0 ) - { - if ( current_time == 0 ) - { - mlt_properties_set_double( properties, "_v_pts_offset", ( double )( pkt.pts / 1000000 ) ); - real_timecode += pkt.pts / 1000000; - } 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; @@ -516,6 +486,7 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form { got_picture = 0; } + mlt_properties_set_int( properties, "top_field_first", frame.top_field_first ); } } @@ -604,13 +575,14 @@ 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 ); - return 0; } @@ -631,9 +603,6 @@ static void producer_set_up_video( mlt_producer this, mlt_frame frame ) // Get the frame properties mlt_properties frame_properties = mlt_frame_properties( frame ); - // Lock the mutex now - pthread_mutex_lock( &avformat_mutex ); - if ( context != NULL && index != -1 ) { // Get the video stream @@ -700,9 +669,6 @@ static void producer_set_up_video( mlt_producer this, mlt_frame frame ) { mlt_properties_set_int( frame_properties, "test_image", 1 ); } - - // Unlock the mutex now - pthread_mutex_unlock( &avformat_mutex ); } /** Get the audio from a frame. @@ -728,6 +694,9 @@ static int producer_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_form // Get the audio_index int index = mlt_properties_get_int( properties, "audio_index" ); + // Get the seekable status + int seekable = mlt_properties_get_int( properties, "seekable" ); + // Obtain the expected frame numer mlt_position expected = mlt_properties_get_position( properties, "audio_expected" ); @@ -757,13 +726,9 @@ static int producer_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_form // Flag for paused (silence) int paused = 0; - int locked = 0; - - // Lock the mutex now - pthread_mutex_lock( &avformat_mutex ); // 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 ); @@ -771,6 +736,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 ) @@ -798,12 +768,11 @@ static int producer_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_form else { // Set to the real timecode - av_seek_frame( context, -1, real_timecode * 1000000.0 ); + if ( !seekable || av_seek_frame( context, -1, context->start_time + real_timecode * 1000000.0 ) != 0 ) + paused = 1; // Clear the usage in the audio buffer audio_used = 0; - - locked = 1; } } @@ -832,7 +801,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 @@ -849,9 +818,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 ) @@ -882,7 +857,7 @@ static int producer_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_form mlt_properties_set_double( properties, "discrepancy", discrepancy ); } - if ( !ignore && discrepancy * current_pts <= ( real_timecode - 0.02 ) ) + if ( seekable && ( !ignore && discrepancy * current_pts <= ( real_timecode - 0.02 ) ) ) ignore = 1; } @@ -918,11 +893,9 @@ static int producer_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_form mlt_frame_get_audio( frame, buffer, format, frequency, channels, samples ); } - // Regardless of speed, we expect to get the next frame (cos we ain't too bright) - mlt_properties_set_position( properties, "audio_expected", position + 1 ); - - // Unlock the mutex now - pthread_mutex_unlock( &avformat_mutex ); + // Regardless of speed (other than paused), we expect to get the next frame + if ( !paused ) + mlt_properties_set_position( properties, "audio_expected", position + 1 ); return 0; } @@ -941,9 +914,6 @@ static void producer_set_up_audio( mlt_producer this, mlt_frame frame ) // Get the audio_index int index = mlt_properties_get_int( properties, "audio_index" ); - // Lock the mutex now - pthread_mutex_lock( &avformat_mutex ); - // Deal with audio context if ( context != NULL && index != -1 ) { @@ -986,9 +956,6 @@ static void producer_set_up_audio( mlt_producer this, mlt_frame frame ) mlt_properties_set_data( frame_properties, "avformat_producer", this, 0, NULL, NULL ); } } - - // Unlock the mutex now - pthread_mutex_unlock( &avformat_mutex ); } /** Our get frame implementation. @@ -1003,7 +970,7 @@ static int producer_get_frame( mlt_producer this, mlt_frame_ptr frame, int index mlt_frame_set_position( *frame, mlt_producer_position( this ) ); // Set the position of this producer - mlt_properties_set_position( mlt_frame_properties( *frame ), "avformat_position", mlt_producer_get_in( this ) + mlt_producer_position( this ) ); + mlt_properties_set_position( mlt_frame_properties( *frame ), "avformat_position", mlt_producer_position( this ) ); // Set up the video producer_set_up_video( this, *frame );