#include <stdlib.h>
#include <string.h>
#include <pthread.h>
+#include <math.h>
// Forward references.
static int producer_open( mlt_producer this, char *file );
}
/** Open the file.
-
- NOTE: We need to have a valid [PAL or NTSC] frame rate before we can determine the
- number of frames in the file. However, this is at odds with the way things work - the
- constructor needs to provide in/out points before the user of the producer is able
- to specify properties :-/. However, the PAL/NTSC distinction applies to all producers
- and while we currently accept whatever the producer provides, this will not work in
- the more general case. Plans are afoot... and this one will work without modification
- (in theory anyway ;-)).
*/
static int producer_open( mlt_producer this, char *file )
pthread_mutex_lock( &avformat_mutex );
// Now attempt to open the file
- error = av_open_input_file( &context, file, NULL, 0, NULL ) < 0;
+ error = av_open_input_file( &context, file, NULL, 0, NULL );
+ error = error < 0;
// If successful, then try to get additional info
if ( error == 0 )
int ignore = 0;
// Current time calcs
- double current_time = 0;
+ double current_time = mlt_properties_get_double( properties, "current_time" );
+
+ // We may want to use the source fps if available
+ double source_fps = mlt_properties_get_double( properties, "source_fps" );
// Set the result arguments that we know here (only *buffer is now required)
*format = mlt_image_yuv422;
if ( output == NULL )
{
int size = avpicture_get_size( PIX_FMT_YUV422, *width, *height );
- uint8_t *buf = malloc( size );
- output = malloc( sizeof( AVPicture ) );
+ size += *width * 2;
+ 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, av_free, NULL );
- mlt_properties_set_data( properties, "video_output_buffer", buf, 0, free, NULL );
+ 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 );
}
// Seek if necessary
av_seek_frame( context, -1, real_timecode * 1000000.0 );
// Remove the cached info relating to the previous position
- mlt_properties_set_double( properties, "current_time", 0 );
+ mlt_properties_set_double( properties, "current_time", real_timecode );
mlt_properties_set_data( properties, "current_image", NULL, 0, NULL, NULL );
}
}
// 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 ) )
{
// Get current image and size
int size = 0;
uint8_t *image = mlt_properties_get_data( properties, "current_image", &size );
// Duplicate it
- *buffer = malloc( size );
+ *buffer = mlt_pool_alloc( size );
memcpy( *buffer, image, size );
// Set this on the frame properties
- mlt_properties_set_data( frame_properties, "image", *buffer, size, free, NULL );
+ mlt_properties_set_data( frame_properties, "image", *buffer, size, ( mlt_destructor )mlt_pool_release, NULL );
}
else
{
if ( ret >= 0 && pkt.stream_index == index && pkt.size > 0 )
{
// Decode the image
- // Wouldn't it be great if I could use this...
- //if ( (float)pkt.pts / 1000000.0 >= real_timecode )
ret = avcodec_decode_video( codec_context, &frame, &got_picture, pkt.data, pkt.size );
- // Handle ignore
- if ( (float)pkt.pts / 1000000.0 < real_timecode )
- {
- ignore = 0;
- got_picture = 0;
- }
- else if ( (float)pkt.pts / 1000000.0 >= real_timecode )
+ if ( got_picture )
{
- ignore = 0;
- }
- else if ( got_picture && ignore -- )
- {
- got_picture = 0;
- }
+ if ( pkt.pts != AV_NOPTS_VALUE && pkt.pts != 0 )
+ current_time = ( double )pkt.pts / 1000000.0;
+ else
+ current_time = real_timecode;
- current_time = ( double )pkt.pts / 1000000.0;
+ // Handle ignore
+ if ( current_time < real_timecode )
+ {
+ ignore = 0;
+ got_picture = 0;
+ }
+ else if ( current_time >= real_timecode )
+ {
+ //current_time = real_timecode;
+ ignore = 0;
+ }
+ else if ( ignore -- )
+ {
+ got_picture = 0;
+ }
+ }
}
// We're finished with this packet regardless
if ( image == NULL || size != *width * *height * 2 )
{
- size = *width * *height * 2;
- image = malloc( size );
- mlt_properties_set_data( properties, "current_image", image, size, free, NULL );
+ size = *width * ( *height + 1 ) * 2;
+ image = mlt_pool_alloc( size );
+ mlt_properties_set_data( properties, "current_image", image, size, ( mlt_destructor )mlt_pool_release, NULL );
+ }
+
+ *buffer = mlt_pool_alloc( size );
+
+ // EXPERIMENTAL IMAGE NORMALISATIONS
+ if ( codec_context->pix_fmt == PIX_FMT_YUV420P )
+ {
+ register int i, j;
+ register int half = *width >> 1;
+ register uint8_t *Y = ( ( AVPicture * )&frame )->data[ 0 ];
+ register uint8_t *U = ( ( AVPicture * )&frame )->data[ 1 ];
+ register uint8_t *V = ( ( AVPicture * )&frame )->data[ 2 ];
+ register uint8_t *d = *buffer;
+ register uint8_t *y, *u, *v;
+
+ i = *height >> 1;
+ while ( i -- )
+ {
+ y = Y;
+ u = U;
+ v = V;
+ j = half;
+ while ( j -- )
+ {
+ *d ++ = *y ++;
+ *d ++ = *u ++;
+ *d ++ = *y ++;
+ *d ++ = *v ++;
+ }
+
+ Y += ( ( AVPicture * )&frame )->linesize[ 0 ];
+ y = Y;
+ u = U;
+ v = V;
+ j = half;
+ while ( j -- )
+ {
+ *d ++ = *y ++;
+ *d ++ = *u ++;
+ *d ++ = *y ++;
+ *d ++ = *v ++;
+ }
+
+ Y += ( ( AVPicture * )&frame )->linesize[ 0 ];
+ U += ( ( AVPicture * )&frame )->linesize[ 1 ];
+ V += ( ( AVPicture * )&frame )->linesize[ 2 ];
+ }
+ }
+ else
+ {
+ img_convert( output, PIX_FMT_YUV422, (AVPicture *)&frame, codec_context->pix_fmt, *width, *height );
+ memcpy( *buffer, output->data[ 0 ], size );
}
- *buffer = malloc( size );
- img_convert( output, PIX_FMT_YUV422, (AVPicture *)&frame, codec_context->pix_fmt, *width, *height );
- memcpy( image, output->data[ 0 ], size );
- memcpy( *buffer, output->data[ 0 ], size );
- mlt_properties_set_data( frame_properties, "image", *buffer, size, free, NULL );
- mlt_properties_set_double( properties, "current_time", current_time );
+ memcpy( image, *buffer, size );
+ mlt_properties_set_data( frame_properties, "image", *buffer, size, ( mlt_destructor )mlt_pool_release, NULL );
+
+ if ( current_time == 0 && source_fps != 0 )
+ {
+ double fps = mlt_properties_get_double( properties, "fps" );
+ current_time = ceil( source_fps * ( double )position / fps ) * ( 1 / source_fps );
+ mlt_properties_set_double( properties, "current_time", current_time );
+ }
+ else
+ {
+ mlt_properties_set_double( properties, "current_time", current_time );
+ }
}
}
// Get the video_index
int index = mlt_properties_get_int( properties, "video_index" );
+ // 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 frame properties
- mlt_properties frame_properties = mlt_frame_properties( frame );
-
// Get the video stream
AVStream *stream = context->streams[ index ];
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)
+ 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 );
-
- // Set to the real timecode
- av_seek_frame( context, -1, 0 );
}
else
{
mlt_frame_push_get_image( frame, producer_get_image );
mlt_properties_set_data( frame_properties, "avformat_producer", this, 0, NULL, NULL );
}
+ else
+ {
+ mlt_properties_set_int( frame_properties, "test_image", 1 );
+ }
+ }
+ else
+ {
+ mlt_properties_set_int( frame_properties, "test_image", 1 );
}
// Unlock the mutex now
// Flag for paused (silence)
int paused = 0;
+ int locked = 0;
// Lock the mutex now
pthread_mutex_lock( &avformat_mutex );
if ( audio_buffer == NULL )
{
// Allocate the audio buffer
- audio_buffer = malloc( AVCODEC_MAX_AUDIO_FRAME_SIZE * sizeof( int16_t ) );
+ audio_buffer = mlt_pool_alloc( AVCODEC_MAX_AUDIO_FRAME_SIZE * sizeof( int16_t ) );
// And store it on properties for reuse
- mlt_properties_set_data( properties, "audio_buffer", audio_buffer, 0, free, NULL );
+ mlt_properties_set_data( properties, "audio_buffer", audio_buffer, 0, ( mlt_destructor )mlt_pool_release, NULL );
}
// Seek if necessary
// Clear the usage in the audio buffer
audio_used = 0;
+
+ locked = 1;
}
}
{
int ret = 0;
int got_audio = 0;
- int16_t temp[ AVCODEC_MAX_AUDIO_FRAME_SIZE / 2 ];
+ int16_t *temp = mlt_pool_alloc( sizeof( int16_t ) * AVCODEC_MAX_AUDIO_FRAME_SIZE );
memset( &pkt, 0, sizeof( pkt ) );
uint8_t *ptr = pkt.data;
int data_size;
- if ( ptr == NULL || len == 0 )
- break;
-
// We only deal with video from the selected video_index
- while ( ret >= 0 && pkt.stream_index == index && len > 0 )
+ while ( ptr != NULL && ret >= 0 && pkt.stream_index == index && len > 0 )
{
// Decode the audio
ret = avcodec_decode_audio( codec_context, temp, &data_size, ptr, len );
if ( ret < 0 )
+ {
+ ret = 0;
break;
+ }
len -= ret;
ptr += ret;
// If we're behind, ignore this packet
float current_pts = (float)pkt.pts / 1000000.0;
double discrepancy = mlt_properties_get_double( properties, "discrepancy" );
- if ( discrepancy * current_pts < real_timecode )
+ 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 ) )
ignore = 1;
}
av_free_packet( &pkt );
}
- // Now handle the audio if we have enough
+ *buffer = mlt_pool_alloc( *samples * *channels * sizeof( int16_t ) );
+ mlt_properties_set_data( frame_properties, "audio", *buffer, 0, ( mlt_destructor )mlt_pool_release, NULL );
+ // Now handle the audio if we have enough
if ( audio_used >= *samples )
{
- *buffer = malloc( *samples * *channels * sizeof( int16_t ) );
memcpy( *buffer, audio_buffer, *samples * *channels * sizeof( int16_t ) );
audio_used -= *samples;
memmove( audio_buffer, &audio_buffer[ *samples * *channels ], audio_used * *channels * sizeof( int16_t ) );
- mlt_properties_set_data( frame_properties, "audio", *buffer, 0, free, NULL );
}
else
{
- frame->get_audio = NULL;
- mlt_frame_get_audio( frame, buffer, format, frequency, channels, samples );
- audio_used = 0;
+ memset( *buffer, 0, *samples * *channels * sizeof( int16_t ) );
}
// Store the number of audio samples still available
mlt_properties_set_int( properties, "audio_used", audio_used );
+
+ // Release the temporary audio
+ mlt_pool_release( temp );
}
else
{
{
// Now store the codec with its destructor
mlt_properties_set_data( properties, "audio_codec", codec_context, 0, producer_codec_close, NULL );
+
}
else
{
projects / melted / blobdiff