#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;
-
-#if 0
-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 );
-}
-#endif
-
/** Constructor for libavformat.
*/
// 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 )
{
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;
{
mrl[0] = 0;
char *name = strdup( ++mrl );
- char *value = strchr( name, '=' );
+ char *value = strchr( name, ':' );
if ( value )
{
value[0] = 0;
}
// Unlock the mutex now
- pthread_mutex_unlock( &avformat_mutex );
+ avformat_unlock( );
return error;
}
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 ];
mlt_properties_set_int( frame_properties, "height", *height );
// Lock the mutex now
- pthread_mutex_lock( &avformat_mutex );
+ avformat_lock( );
// 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 );
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;
mlt_properties_set_position( properties, "video_expected", position + 1 );
// Unlock the mutex now
- pthread_mutex_unlock( &avformat_mutex );
+ avformat_unlock( );
return 0;
}
mlt_properties frame_properties = mlt_frame_properties( frame );
// Lock the mutex now
- pthread_mutex_lock( &avformat_mutex );
+ avformat_lock( );
if ( context != NULL && index != -1 )
{
}
// Unlock the mutex now
- pthread_mutex_unlock( &avformat_mutex );
+ avformat_unlock( );
}
/** Get the audio from a frame.
int locked = 0;
// Lock the mutex now
- pthread_mutex_lock( &avformat_mutex );
+ avformat_lock( );
// 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 )
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 )
mlt_properties_set_position( properties, "audio_expected", position + 1 );
// Unlock the mutex now
- pthread_mutex_unlock( &avformat_mutex );
+ avformat_unlock( );
return 0;
}
int index = mlt_properties_get_int( properties, "audio_index" );
// Lock the mutex now
- pthread_mutex_lock( &avformat_mutex );
+ avformat_lock( );
// Deal with audio context
if ( context != NULL && index != -1 )
}
// Unlock the mutex now
- pthread_mutex_unlock( &avformat_mutex );
+ avformat_unlock( );
}
/** Our get frame implementation.