// 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;
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 ) )
standard = strdup( value );
params->standard = standard;
}
+ else if ( !strcmp( name, "av" ) )
+ av = atoi( value );
}
free( name );
mrl = strchr( mrl, '&' );
// 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 ( 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 );
+ 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 );
// 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 );
// 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;
// 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, context->start_time + 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 );
// 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;
// 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
// 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, context->start_time + 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
// 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;
}
projects / melted / blobdiff