X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Favformat%2Fproducer_avformat.c;h=8400f41e320334f356f085df86044a8842cfc5d2;hb=a01e64529a0e9d097bce26715a45fd4bb3de3538;hp=1f637d42ff485ae14746a0c6131c331703cd0e30;hpb=8a3795b090723264c973d274eedc28da480e76fd;p=melted diff --git a/src/modules/avformat/producer_avformat.c b/src/modules/avformat/producer_avformat.c index 1f637d4..8400f41 100644 --- a/src/modules/avformat/producer_avformat.c +++ b/src/modules/avformat/producer_avformat.c @@ -41,6 +41,21 @@ static int producer_get_frame( mlt_producer this, mlt_frame_ptr frame, int index static int avformat_initialised = 0; static pthread_mutex_t avformat_mutex; +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 ); +} + /** Constructor for libavformat. */ @@ -72,8 +87,8 @@ mlt_producer producer_avformat_init( char *file ) // Initialise avformat if necessary if ( avformat_initialised == 0 ) { - pthread_mutex_init( &avformat_mutex, NULL ); avformat_initialised = 1; + pthread_mutex_init( &avformat_mutex, NULL ); av_register_all( ); } @@ -157,14 +172,6 @@ static void producer_codec_close( void *codec ) } /** 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 ) @@ -186,7 +193,6 @@ static int producer_open( mlt_producer this, char *file ) // Now attempt to open the file error = av_open_input_file( &context, file, NULL, 0, NULL ); -// fprintf( stderr, "AVFORMAT: open %d %s\n", error, file ); error = error < 0; // If successful, then try to get additional info @@ -318,7 +324,7 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form 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" ); @@ -339,13 +345,13 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form if ( output == NULL ) { int size = avpicture_get_size( PIX_FMT_YUV422, *width, *height ); - // IRRIGATE ME size += *width * 2; - uint8_t *buf = malloc( size ); - output = malloc( sizeof( AVPicture ) ); + 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 @@ -367,7 +373,7 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form 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 ); } } @@ -381,12 +387,11 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form uint8_t *image = mlt_properties_get_data( properties, "current_image", &size ); // Duplicate it - // IRRIGATE ME - *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 { @@ -405,15 +410,16 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form // We only deal with video from the selected video_index if ( ret >= 0 && pkt.stream_index == index && pkt.size > 0 ) { - current_time = ( double )pkt.pts / 1000000.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 ); if ( got_picture ) { + if ( pkt.pts != AV_NOPTS_VALUE && pkt.pts != 0 ) + current_time = ( double )pkt.pts / 1000000.0; + else + current_time = real_timecode; + // Handle ignore if ( current_time < real_timecode ) { @@ -422,9 +428,10 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form } else if ( current_time >= real_timecode ) { + //current_time = real_timecode; ignore = 0; } - else if ( got_picture && ignore -- ) + else if ( ignore -- ) { got_picture = 0; } @@ -445,17 +452,64 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form if ( image == NULL || size != *width * *height * 2 ) { size = *width * ( *height + 1 ) * 2; - // IRRIGATE ME - image = malloc( size ); - mlt_properties_set_data( properties, "current_image", image, size, free, NULL ); + image = mlt_pool_alloc( size ); + mlt_properties_set_data( properties, "current_image", image, size, ( mlt_destructor )mlt_pool_release, NULL ); } - // IRRIGATE ME - *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 ); + *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 ); + } + + 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 ) { @@ -519,33 +573,8 @@ static void producer_set_up_video( mlt_producer this, mlt_frame frame ) // 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; - - 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\n", 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 { @@ -557,8 +586,32 @@ static void producer_set_up_video( mlt_producer this, mlt_frame frame ) // No codec, no show... if ( codec != NULL ) { + 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 ); + mlt_frame_push_get_image( frame, producer_get_image ); mlt_properties_set_data( frame_properties, "avformat_producer", this, 0, NULL, NULL ); + } else { @@ -645,10 +698,10 @@ static int producer_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_form 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 @@ -681,7 +734,7 @@ static int producer_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_form { 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 ) ); @@ -751,7 +804,7 @@ static int producer_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_form mlt_properties_set_double( properties, "discrepancy", discrepancy ); } - if ( discrepancy * current_pts <= ( real_timecode - 0.02 ) ) + if ( !ignore && discrepancy * current_pts <= ( real_timecode - 0.02 ) ) ignore = 1; } @@ -759,24 +812,26 @@ static int producer_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_form av_free_packet( &pkt ); } + *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 {