#include <framework/mlt_frame.h>
// ffmpeg Header files
-#include <ffmpeg/avformat.h>
+#include <avformat.h>
// System header files
#include <stdlib.h>
#include <pthread.h>
#include <math.h>
+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.
*/
// 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;
- // 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 )
{
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( );
}
}
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( );
}
}
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, ':' );
+
+ // 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 ) )
+ {
+ // '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;
+ }
+ else if ( !strcmp( name, "av" ) )
+ av = atoi( value );
+ }
+ 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 )
// 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 );
// 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 );
}
// Unlock the mutex now
- pthread_mutex_unlock( &avformat_mutex );
+ avformat_unlock( );
return error;
}
// 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
- 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 );
// 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 );
// 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;
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;
// Handle ignore
- if ( current_time < real_timecode )
+ if ( ( int )( current_time * 100 ) < ( int )( real_timecode * 100 ) - 7 )
{
ignore = 0;
got_picture = 0;
{
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
- pthread_mutex_unlock( &avformat_mutex );
-
return 0;
}
// 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
// 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 );
}
// No codec, no show...
if ( codec != NULL )
{
+ double source_fps = 0;
+
+ // 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 )
+ {
+ 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 );
+ }
+
+ //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 );
}
{
mlt_properties_set_int( frame_properties, "test_image", 1 );
}
-
- // Unlock the mutex now
- pthread_mutex_unlock( &avformat_mutex );
}
/** 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
- 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 );
// 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 )
// 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;
}
}
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
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 )
// 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
- 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;
}
// 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 )
{
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.
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 );