#include <framework/mlt_frame.h>
// ffmpeg Header files
-#include <ffmpeg/avformat.h>
+#include <avformat.h>
// System header files
#include <stdlib.h>
// 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;
// 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 :-/)
+ 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 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;
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 )
{
// 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 ( 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 );
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;
{
got_picture = 0;
}
+ mlt_properties_set_int( properties, "top_field_first", frame.top_field_first );
}
}
}
}
}
+
+ // 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
- avformat_unlock( );
-
return 0;
}
// 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
// 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
{
mlt_properties_set_int( frame_properties, "test_image", 1 );
}
-
- // Unlock the mutex now
- avformat_unlock( );
}
/** Get the audio from a frame.
// 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" );
// Flag for paused (silence)
int paused = 0;
- int locked = 0;
-
- // Lock the mutex now
- avformat_lock( );
// Check for resample and create if necessary
if ( resample == NULL && codec_context->channels <= 2 )
// 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
- av_seek_frame( context, -1, real_timecode * 1000000.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
audio_used = 0;
-
- locked = 1;
}
}
// 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 ( !ignore && discrepancy * current_pts <= ( real_timecode - 0.02 ) )
+ if ( seekable && ( !ignore && current_pts <= ( real_timecode - 0.02 ) ) )
ignore = 1;
}
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
- avformat_unlock( );
+ // 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;
}
// 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 )
{
mlt_properties_set_data( frame_properties, "avformat_producer", this, 0, NULL, NULL );
}
}
-
- // Unlock the mutex now
- avformat_unlock( );
}
/** Our get frame implementation.
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 );
projects / melted / blobdiff