X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Favformat%2Fproducer_avformat.c;h=ea262d8fbd60a9377ae26ca4ff5a60cde39f1b6e;hb=b4db352cab396eb5179e2deaf58bb05dcdfb0c69;hp=e0c246d7095c4f819163a41be14eb19195a5648d;hpb=a038d8a6f14b30dd52242d2f69601e6393e44475;p=melted diff --git a/src/modules/avformat/producer_avformat.c b/src/modules/avformat/producer_avformat.c index e0c246d..ea262d8 100644 --- a/src/modules/avformat/producer_avformat.c +++ b/src/modules/avformat/producer_avformat.c @@ -62,9 +62,6 @@ mlt_producer producer_avformat_init( char *file ) // Set the resource property (required for all producers) mlt_properties_set( properties, "resource", file ); - // TEST: audio sync tweaking - mlt_properties_set_double( properties, "discrepancy", 1 ); - // Register our get_frame implementation this->get_frame = producer_get_frame; @@ -172,6 +169,9 @@ static int producer_open( mlt_producer this, char *file ) AVFormatParameters *params = NULL; char *standard = NULL; char *mrl = strchr( file, ':' ); + + // AV option (0 = both, 1 = video, 2 = audio) + int av = 0; // Only if there is not a protocol specification that avformat can handle if ( mrl && !url_exist( file ) ) @@ -231,6 +231,8 @@ static int producer_open( mlt_producer this, char *file ) standard = strdup( value ); params->standard = standard; } + else if ( !strcmp( name, "av" ) ) + av = atoi( value ); } free( name ); mrl = strchr( mrl, '&' ); @@ -267,18 +269,22 @@ static int producer_open( mlt_producer this, char *file ) mlt_properties_set_position( properties, "length", frames - 1 ); } - // Check if we're seekable - mlt_properties_set_int( properties, "seekable", av_seek_frame( context, -1, 0 ) == 0 ); - // Find default audio and video streams find_default_streams( context, &audio_index, &video_index ); + if ( context->start_time != AV_NOPTS_VALUE ) + mlt_properties_set_double( properties, "start_time", context->start_time ); + + // Check if we're seekable (something funny about mpeg here :-/) + if ( strcmp( file, "pipe:" ) ) + mlt_properties_set_int( properties, "seekable", av_seek_frame( context, -1, mlt_properties_get_double( properties, "start_time" ) ) >= 0 ); + // 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 ) + if ( av == 0 && strcmp( file, "pipe:" ) && audio_index != -1 && video_index != -1 ) { // We'll use the open one as our video_context mlt_properties_set_data( properties, "video_context", context, 0, producer_file_close, NULL ); @@ -290,7 +296,7 @@ static int producer_open( mlt_producer this, char *file ) // Audio context mlt_properties_set_data( properties, "audio_context", context, 0, producer_file_close, NULL ); } - else if ( video_index != -1 ) + else if ( av != 2 && video_index != -1 ) { // We only have a video context mlt_properties_set_data( properties, "video_context", context, 0, producer_file_close, NULL ); @@ -382,6 +388,9 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form // We may want to use the source fps if available double source_fps = mlt_properties_get_double( properties, "source_fps" ); + // Get the seekable status + int seekable = mlt_properties_get_int( properties, "seekable" ); + // Set the result arguments that we know here (only *buffer is now required) *format = mlt_image_yuv422; *width = codec_context->width; @@ -391,9 +400,6 @@ 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 - avformat_lock( ); - // Construct an AVFrame for YUV422 conversion if ( output == NULL ) { @@ -413,15 +419,15 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form // We're paused - use last image paused = 1; } - else if ( position > expected && ( position - expected ) < 250 ) + else if ( !seekable && position > expected && ( position - expected ) < 250 ) { // Fast forward - seeking is inefficient for small distances - just ignore following frames ignore = position - expected; } - else + else if ( codec_context->gop_size == 0 || ( position < expected || position - expected >= 12 ) ) { // Set to the real timecode - av_seek_frame( context, -1, real_timecode * 1000000.0 ); + av_seek_frame( context, -1, mlt_properties_get_double( properties, "start_time" ) + real_timecode * 1000000.0 ); // Remove the cached info relating to the previous position mlt_properties_set_double( properties, "current_time", real_timecode ); @@ -431,7 +437,8 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form // Duplicate the last image if necessary if ( mlt_properties_get_data( properties, "current_image", NULL ) != NULL && - ( paused || mlt_properties_get_double( properties, "current_time" ) >= real_timecode ) ) + ( paused || mlt_properties_get_double( properties, "current_time" ) >= real_timecode ) && + strcmp( mlt_properties_get( properties, "resource" ), "pipe:" ) ) { // Get current image and size int size = 0; @@ -466,7 +473,7 @@ 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 ( pkt.pts != AV_NOPTS_VALUE ) current_time = ( double )pkt.pts / 1000000.0; else current_time = real_timecode; @@ -583,9 +590,6 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form // 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 - avformat_unlock( ); - return 0; } @@ -606,9 +610,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 - avformat_lock( ); - if ( context != NULL && index != -1 ) { // Get the video stream @@ -642,14 +643,21 @@ 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 + // XXX: We won't know the real aspect ratio until an image is decoded + // but we do need it now (to satisfy filter_resize) - take a guess based + // on pal/ntsc if ( codec_context->sample_aspect_ratio.num > 0 ) - aspect_ratio = av_q2d( codec_context->sample_aspect_ratio ); + { + mlt_properties_set_double( properties, "aspect_ratio", av_q2d( codec_context->sample_aspect_ratio ) ); + } + else + { + int is_pal = mlt_properties_get_double( properties, "fps" ) == 25.0; + mlt_properties_set_double( properties, "aspect_ratio", is_pal ? 128.0/117.0 : 72.0/79.0 ); + } - 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 @@ -675,9 +683,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 - avformat_unlock( ); } /** Get the audio from a frame. @@ -736,9 +741,6 @@ static int producer_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_form // Flag for paused (silence) int paused = 0; - // Lock the mutex now - avformat_lock( ); - // Check for resample and create if necessary if ( resample == NULL && codec_context->channels <= 2 ) { @@ -772,15 +774,15 @@ static int producer_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_form // We're paused - silence required paused = 1; } - else if ( position > expected && ( position - expected ) < 250 ) + else if ( !seekable && position > expected && ( position - expected ) < 250 ) { // Fast forward - seeking is inefficient for small distances - just ignore following frames ignore = position - expected; } - else + else if ( position < expected || position - expected >= 12 ) { // Set to the real timecode - if ( !seekable || av_seek_frame( context, -1, real_timecode * 1000000.0 ) != 0 ) + if ( av_seek_frame( context, -1, mlt_properties_get_double( properties, "start_time" ) + real_timecode * 1000000.0 ) != 0 ) paused = 1; // Clear the usage in the audio buffer @@ -851,25 +853,7 @@ static int producer_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_form // If we're behind, ignore this packet float current_pts = (float)pkt.pts / 1000000.0; - double discrepancy = mlt_properties_get_double( properties, "discrepancy" ); - if ( current_pts != 0 && real_timecode != 0 ) - { - if ( discrepancy != 1 ) - discrepancy = ( discrepancy + ( real_timecode / current_pts ) ) / 2; - else - discrepancy = real_timecode / current_pts; - if ( discrepancy > 0.9 && discrepancy < 1.1 ) - discrepancy = 1.0; - else - discrepancy = floor( discrepancy + 0.5 ); - - if ( discrepancy == 0 ) - discrepancy = 1.0; - - mlt_properties_set_double( properties, "discrepancy", discrepancy ); - } - - if ( seekable && ( !ignore && discrepancy * current_pts <= ( real_timecode - 0.02 ) ) ) + if ( seekable && ( !ignore && current_pts <= ( real_timecode - 0.02 ) ) ) ignore = 1; } @@ -909,9 +893,6 @@ static int producer_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_form if ( !paused ) mlt_properties_set_position( properties, "audio_expected", position + 1 ); - // Unlock the mutex now - avformat_unlock( ); - return 0; } @@ -929,9 +910,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 - avformat_lock( ); - // Deal with audio context if ( context != NULL && index != -1 ) { @@ -974,9 +952,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 - avformat_unlock( ); } /** Our get frame implementation. @@ -991,7 +966,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 );