]> git.sesse.net Git - mlt/blobdiff - src/modules/avformat/producer_avformat.c
avformat/configure: fix compiling against shared ffmpeg due to changes in ffmpeg...
[mlt] / src / modules / avformat / producer_avformat.c
index 4dd162fada3258535edb1a539749b847ca75da0e..d42a307ee0f088c87386936bb7dda699703cae79 100644 (file)
@@ -2,30 +2,32 @@
  * producer_avformat.c -- avformat producer
  * Copyright (C) 2003-2004 Ushodaya Enterprises Limited
  * Author: Charles Yates <charles.yates@pandora.be>
+ * Much code borrowed from ffmpeg.c: Copyright (c) 2000-2003 Fabrice Bellard
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-// Local header files
-#include "producer_avformat.h"
-
 // MLT Header files
+#include <framework/mlt_producer.h>
 #include <framework/mlt_frame.h>
 
 // ffmpeg Header files
 #include <avformat.h>
+#ifdef SWSCALE
+#include <swscale.h>
+#endif
 
 // System header files
 #include <stdlib.h>
@@ -37,13 +39,13 @@ void avformat_lock( );
 void avformat_unlock( );
 
 // Forward references.
-static int producer_open( mlt_producer this, char *file );
+static int producer_open( mlt_producer this, mlt_profile profile, char *file );
 static int producer_get_frame( mlt_producer this, mlt_frame_ptr frame, int index );
 
 /** Constructor for libavformat.
 */
 
-mlt_producer producer_avformat_init( char *file )
+mlt_producer producer_avformat_init( mlt_profile profile, char *file )
 {
        mlt_producer this = NULL;
 
@@ -66,7 +68,7 @@ mlt_producer producer_avformat_init( char *file )
                        this->get_frame = producer_get_frame;
 
                        // Open the file
-                       if ( producer_open( this, file ) != 0 )
+                       if ( producer_open( this, profile, file ) != 0 )
                        {
                                // Clean up
                                mlt_producer_close( this );
@@ -89,10 +91,13 @@ static void find_default_streams( AVFormatContext *context, int *audio_index, in
        for( i = 0; i < context->nb_streams; i++ ) 
        {
                // Get the codec context
-               AVCodecContext *codec_context = context->streams[ i ]->codec;
+               AVCodecContext *codec_context = context->streams[ i ]->codec;
+
+               if ( avcodec_find_decoder( codec_context->codec_id ) == NULL )
+                       continue;
 
                // Determine the type and obtain the first index of each type
-               switch( codec_context->codec_type ) 
+               switch( codec_context->codec_type ) 
                {
                        case CODEC_TYPE_VIDEO:
                                if ( *video_index < 0 )
@@ -101,9 +106,9 @@ static void find_default_streams( AVFormatContext *context, int *audio_index, in
                        case CODEC_TYPE_AUDIO:
                                if ( *audio_index < 0 )
                                        *audio_index = i;
-                               break;
+                               break;
                        default:
-                               break;
+                               break;
                }
        }
 }
@@ -147,7 +152,7 @@ static void producer_codec_close( void *codec )
 /** Open the file.
 */
 
-static int producer_open( mlt_producer this, char *file )
+static int producer_open( mlt_producer this, mlt_profile profile, char *file )
 {
        // Return an error code (0 == no error)
        int error = 0;
@@ -159,7 +164,7 @@ static int producer_open( mlt_producer this, char *file )
        mlt_properties properties = MLT_PRODUCER_PROPERTIES( this );
 
        // We will treat everything with the producer fps
-       double fps = mlt_properties_get_double( properties, "fps" );
+       double fps = mlt_profile_fps( profile );
 
        // Lock the mutex now
        avformat_lock( );
@@ -197,11 +202,13 @@ static int producer_open( mlt_producer this, char *file )
                        params->width = 640;
                        params->height = 480;
                        params->time_base= (AVRational){1,25};
-                       params->device = file;
+                       // params->device = file;
                        params->channels = 2;
                        params->sample_rate = 48000;
                }
                
+               // XXX: this does not work anymore since avdevice
+               // TODO: make producer_avddevice?
                // Parse out params
                mrl = strchr( file, '?' );
                while ( mrl )
@@ -242,8 +249,7 @@ static int producer_open( mlt_producer this, char *file )
        }
 
        // Now attempt to open the file
-       error = av_open_input_file( &context, file, format, 0, params );
-       error = error < 0;
+       error = av_open_input_file( &context, file, format, 0, params ) < 0;
        
        // Cleanup AVFormatParameters
        free( standard );
@@ -267,26 +273,32 @@ static int producer_open( mlt_producer this, char *file )
                        if ( context->duration != AV_NOPTS_VALUE ) 
                        {
                                // This isn't going to be accurate for all formats
-                               mlt_position frames = ( mlt_position )( ( ( double )context->duration / ( double )AV_TIME_BASE ) * fps );
-                               mlt_properties_set_position( properties, "out", frames - 2 );
-                               mlt_properties_set_position( properties, "length", frames - 1 );
+                               mlt_position frames = ( mlt_position )( ( ( double )context->duration / ( double )AV_TIME_BASE ) * fps + 0.5 );
+                               mlt_properties_set_position( properties, "out", frames - 1 );
+                               mlt_properties_set_position( properties, "length", frames );
                        }
 
                        // 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 );
+                       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:" ) && strncmp( file, "http://", 6 ) )
+                       {
                                mlt_properties_set_int( properties, "seekable", av_seek_frame( context, -1, mlt_properties_get_double( properties, "_start_time" ), AVSEEK_FLAG_BACKWARD ) >= 0 );
+                               mlt_properties_set_data( properties, "dummy_context", context, 0, producer_file_close, NULL );
+                               av_open_input_file( &context, file, NULL, 0, NULL );
+                               av_find_stream_info( context );
+                       }
                        else
                                av_bypass = 1;
 
                        // 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 );
+                       mlt_properties_set_int( properties, "_last_position", -1 );
 
                        // Fetch the width, height and aspect ratio
                        if ( video_index != -1 )
@@ -296,6 +308,22 @@ static int producer_open( mlt_producer this, char *file )
                                mlt_properties_set_int( properties, "height", codec_context->height );
                                mlt_properties_set_double( properties, "aspect_ratio", av_q2d( codec_context->sample_aspect_ratio ) );
                        }
+
+                       // Read Metadata
+                       if (context->title != NULL) 
+                               mlt_properties_set(properties, "meta.attr.title.markup", context->title );
+                       if (context->author != NULL) 
+                               mlt_properties_set(properties, "meta.attr.author.markup", context->author );
+                       if (context->copyright != NULL) 
+                               mlt_properties_set(properties, "meta.attr.copyright.markup", context->copyright );
+                       if (context->comment != NULL) 
+                               mlt_properties_set(properties, "meta.attr.comment.markup", context->comment );
+                       if (context->album != NULL) 
+                               mlt_properties_set(properties, "meta.attr.album.markup", context->album );
+                       if (context->year != 0) 
+                               mlt_properties_set_int(properties, "meta.attr.year.markup", context->year );
+                       if (context->track != 0) 
+                               mlt_properties_set_int(properties, "meta.attr.track.markup", context->track );
                        
                        // We're going to cheat here - for a/v files, we will have two contexts (reasoning will be clear later)
                        if ( av == 0 && !av_bypass && audio_index != -1 && video_index != -1 )
@@ -341,18 +369,48 @@ static int producer_open( mlt_producer this, char *file )
 
 static double producer_time_of_frame( mlt_producer this, mlt_position position )
 {
-       // Get the properties
-       mlt_properties properties = MLT_PRODUCER_PROPERTIES( this );
-
-       // Obtain the fps
-       double fps = mlt_properties_get_double( properties, "fps" );
-
-       // Do the calc
-       return ( double )position / fps;
+       return ( double )position / mlt_producer_get_fps( this );
 }
 
 static inline void convert_image( AVFrame *frame, uint8_t *buffer, int pix_fmt, mlt_image_format format, int width, int height )
 {
+#ifdef SWSCALE
+       if ( format == mlt_image_yuv420p )
+       {
+               struct SwsContext *context = sws_getContext( width, height, pix_fmt,
+                       width, height, PIX_FMT_YUV420P, SWS_FAST_BILINEAR, NULL, NULL, NULL);
+               AVPicture output;
+               output.data[0] = buffer;
+               output.data[1] = buffer + width * height;
+               output.data[2] = buffer + ( 3 * width * height ) / 2;
+               output.linesize[0] = width;
+               output.linesize[1] = width >> 1;
+               output.linesize[2] = width >> 1;
+               sws_scale( context, frame->data, frame->linesize, 0, height,
+                       output.data, output.linesize);
+               sws_freeContext( context );
+       }
+       else if ( format == mlt_image_rgb24 )
+       {
+               struct SwsContext *context = sws_getContext( width, height, pix_fmt,
+                       width, height, PIX_FMT_RGB24, SWS_FAST_BILINEAR, NULL, NULL, NULL);
+               AVPicture output;
+               avpicture_fill( &output, buffer, PIX_FMT_RGB24, width, height );
+               sws_scale( context, frame->data, frame->linesize, 0, height,
+                       output.data, output.linesize);
+               sws_freeContext( context );
+       }
+       else
+       {
+               struct SwsContext *context = sws_getContext( width, height, pix_fmt,
+                       width, height, PIX_FMT_YUYV422, SWS_FAST_BILINEAR, NULL, NULL, NULL);
+               AVPicture output;
+               avpicture_fill( &output, buffer, PIX_FMT_YUYV422, width, height );
+               sws_scale( context, frame->data, frame->linesize, 0, height,
+                       output.data, output.linesize);
+               sws_freeContext( context );
+       }
+#else
        if ( format == mlt_image_yuv420p )
        {
                AVPicture pict;
@@ -376,6 +434,7 @@ static inline void convert_image( AVFrame *frame, uint8_t *buffer, int pix_fmt,
                avpicture_fill( &output, buffer, PIX_FMT_YUV422, width, height );
                img_convert( &output, PIX_FMT_YUV422, (AVPicture *)frame, pix_fmt, width, height );
        }
+#endif
 }
 
 /** Get an image from a frame.
@@ -404,9 +463,6 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
        // Obtain the expected frame numer
        mlt_position expected = mlt_properties_get_position( properties, "_video_expected" );
 
-       // Calculate the real time code
-       double real_timecode = producer_time_of_frame( this, position );
-
        // Get the video stream
        AVStream *stream = context->streams[ index ];
 
@@ -425,11 +481,12 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
        // Special case ffwd handling
        int ignore = 0;
 
-       // Current time calcs
-       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" );
+       double fps = mlt_producer_get_fps( this );
+
+       // This is the physical frame position in the source
+       int req_position = ( int )( position / fps * source_fps + 0.5 );
 
        // Get the seekable status
        int seekable = mlt_properties_get_int( properties, "seekable" );
@@ -440,6 +497,9 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
        // Hopefully provide better support for streams...
        int av_bypass = mlt_properties_get_int( properties, "av_bypass" );
 
+       // Determines if we have to decode all frames in a sequence
+       int must_decode = 1;
+
        // Set the result arguments that we know here (only *buffer is now required)
        *width = codec_context->width;
        *height = codec_context->height;
@@ -465,10 +525,15 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
        // Construct the output image
        *buffer = mlt_pool_alloc( size );
 
+       // Temporary hack to improve intra frame only
+       must_decode = strcmp( codec_context->codec->name, "mjpeg" ) &&
+                                 strcmp( codec_context->codec->name, "rawvideo" ) &&
+                                 strcmp( codec_context->codec->name, "dvvideo" );
+
        // Seek if necessary
        if ( position != expected )
        {
-               if ( position + 1 == expected )
+               if ( av_frame != NULL && position + 1 == expected )
                {
                        // We're paused - use last image
                        paused = 1;
@@ -476,24 +541,34 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
                else if ( !seekable && position > expected && ( position - expected ) < 250 )
                {
                        // Fast forward - seeking is inefficient for small distances - just ignore following frames
-                       ignore = position - expected;
+                       ignore = ( int )( ( position - expected ) / fps * source_fps );
                }
                else if ( seekable && ( position < expected || position - expected >= 12 ) )
                {
-                       // Set to the real timecode
-                       av_seek_frame( context, -1, mlt_properties_get_double( properties, "_start_time" ) + real_timecode * 1000000.0, AVSEEK_FLAG_BACKWARD );
+                       // Calculate the timestamp for the requested frame
+                       int64_t timestamp = ( int64_t )( ( double )req_position / source_fps * AV_TIME_BASE + 0.5 );
+                       if ( ( uint64_t )context->start_time != AV_NOPTS_VALUE )
+                               timestamp += context->start_time;
+                       if ( must_decode )
+                               timestamp -= AV_TIME_BASE;
+                       if ( timestamp < 0 )
+                               timestamp = 0;
+
+                       // Set to the timestamp
+                       av_seek_frame( context, -1, timestamp, AVSEEK_FLAG_BACKWARD );
        
                        // Remove the cached info relating to the previous position
-                       mlt_properties_set_double( properties, "_current_time", real_timecode );
-
+                       mlt_properties_set_int( properties, "_current_position", -1 );
+                       mlt_properties_set_int( properties, "_last_position", -1 );
                        mlt_properties_set_data( properties, "av_frame", NULL, 0, NULL, NULL );
                        av_frame = NULL;
                }
        }
-       
-       // Duplicate the last image if necessary
-       if ( av_frame != NULL && ( paused || mlt_properties_get_double( properties, "_current_time" ) >= real_timecode ) &&
-                av_bypass == 0 )
+
+       // Duplicate the last image if necessary (see comment on rawvideo below)
+       int current_position = mlt_properties_get_int( properties, "_current_position" );
+       int got_picture = mlt_properties_get_int( properties, "_got_picture" );
+       if ( av_frame != NULL && got_picture && ( paused || current_position >= req_position ) && av_bypass == 0 )
        {
                // Duplicate it
                convert_image( av_frame, *buffer, codec_context->pix_fmt, *format, *width, *height );
@@ -504,20 +579,16 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
        else
        {
                int ret = 0;
-               int got_picture = 0;
-               int must_decode = 1;
-
-               // Temporary hack to improve intra frame only
-               if ( !strcmp( codec_context->codec->name, "mjpeg" ) )
-                       must_decode = 0;
+               int int_position = 0;
+               got_picture = 0;
 
-               memset( &pkt, 0, sizeof( pkt ) );
+               av_init_packet( &pkt );
 
                // Construct an AVFrame for YUV422 conversion
                if ( av_frame == NULL )
                {
-                       av_frame = calloc( 1, sizeof( AVFrame ) );
-                       mlt_properties_set_data( properties, "av_frame", av_frame, 0, free, NULL );
+                       av_frame = avcodec_alloc_frame( );
+                       mlt_properties_set_data( properties, "av_frame", av_frame, 0, av_free, NULL );
                }
 
                while( ret >= 0 && !got_picture )
@@ -529,24 +600,27 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
                        if ( ret >= 0 && pkt.stream_index == index && pkt.size > 0 )
                        {
                                // Determine time code of the packet
-                               if ( pkt.dts != AV_NOPTS_VALUE )
-                                       current_time = av_q2d( stream->time_base ) * pkt.dts;
-                               else
-                                       current_time = real_timecode;
+                               int_position = ( int )( av_q2d( stream->time_base ) * pkt.dts * source_fps + 0.5 );
+                               if ( context->start_time != AV_NOPTS_VALUE )
+                                       int_position -= ( int )( context->start_time * source_fps / AV_TIME_BASE + 0.5 );
+                               int last_position = mlt_properties_get_int( properties, "_last_position" );
+                               if ( int_position == last_position )
+                                       int_position = last_position + 1;
+                               mlt_properties_set_int( properties, "_last_position", int_position );
 
                                // Decode the image
-                               if ( must_decode || current_time >= real_timecode )
+                               if ( must_decode || int_position >= req_position )
                                        ret = avcodec_decode_video( codec_context, av_frame, &got_picture, pkt.data, pkt.size );
 
                                if ( got_picture )
                                {
                                        // Handle ignore
-                                       if ( ( int )( current_time * 100 ) < ( int )( real_timecode * 100 ) - 7 )
+                                       if ( int_position < req_position )
                                        {
                                                ignore = 0;
                                                got_picture = 0;
                                        }
-                                       else if ( current_time >= real_timecode )
+                                       else if ( int_position >= req_position )
                                        {
                                                ignore = 0;
                                        }
@@ -555,38 +629,34 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
                                                got_picture = 0;
                                        }
                                }
+                               av_free_packet( &pkt );
                        }
-
-                       // We're finished with this packet regardless
-                       av_free_packet( &pkt );
-               }
-
-               // Now handle the picture if we have one
-               if ( got_picture )
-               {
-                       mlt_properties_set_int( frame_properties, "progressive", !av_frame->interlaced_frame );
-                       mlt_properties_set_int( frame_properties, "top_field_first", av_frame->top_field_first );
-
-                       convert_image( av_frame, *buffer, codec_context->pix_fmt, *format, *width, *height );
-
-                       mlt_properties_set_data( frame_properties, "image", *buffer, size, (mlt_destructor)mlt_pool_release, NULL );
-
-                       if ( current_time == 0 && source_fps != 0 )
+                       else if ( ret >= 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 );
+                               av_free_packet( &pkt );
                        }
-                       else
+
+                       // Now handle the picture if we have one
+                       if ( got_picture )
                        {
-                               mlt_properties_set_double( properties, "_current_time", current_time );
+                               mlt_properties_set_int( frame_properties, "progressive", !av_frame->interlaced_frame );
+                               mlt_properties_set_int( frame_properties, "top_field_first", av_frame->top_field_first );
+                               mlt_properties_set_int( properties, "top_field_first", av_frame->top_field_first );
+                               convert_image( av_frame, *buffer, codec_context->pix_fmt, *format, *width, *height );
+                               mlt_properties_set_data( frame_properties, "image", *buffer, size, (mlt_destructor)mlt_pool_release, NULL );
+                               mlt_properties_set_int( properties, "_current_position", int_position );
+                               mlt_properties_set_int( properties, "_got_picture", 1 );
                        }
                }
        }
-       
+
+       // Very untidy - for rawvideo, the packet contains the frame, hence the free packet
+       // above will break the pause behaviour - so we wipe the frame now
+       if ( !strcmp( codec_context->codec->name, "rawvideo" ) )
+               mlt_properties_set_data( properties, "av_frame", NULL, 0, NULL, NULL );
+
        // 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" ) );
+       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 );
@@ -625,6 +695,16 @@ static void producer_set_up_video( mlt_producer this, mlt_frame frame )
                // Initialise the codec if necessary
                if ( codec == NULL )
                {
+                       // Initialise multi-threading 
+                       int thread_count = mlt_properties_get_int( properties, "threads" );
+                       if ( thread_count == 0 && getenv( "MLT_AVFORMAT_THREADS" ) )
+                               thread_count = atoi( getenv( "MLT_AVFORMAT_THREADS" ) );
+                       if ( thread_count > 1 )
+                       {
+                               avcodec_thread_init( codec_context, thread_count );
+                               codec_context->thread_count = thread_count;
+                       }
+                       
                        // Find the codec
                        codec = avcodec_find_decoder( codec_context->codec_id );
 
@@ -662,7 +742,7 @@ static void producer_set_up_video( mlt_producer this, mlt_frame frame )
                        }
                        else
                        {
-                               int is_pal = mlt_properties_get_double( properties, "fps" ) == 25.0;
+                               int is_pal = mlt_producer_get_fps( this ) == 25.0;
                                aspect_ratio = is_pal ? 59.0/54.0 : 10.0/11.0;
                        }
 
@@ -670,8 +750,10 @@ static void producer_set_up_video( mlt_producer this, mlt_frame frame )
                        source_fps = ( double )codec_context->time_base.den / ( codec_context->time_base.num == 0 ? 1 : codec_context->time_base.num );
 
                        // We'll use fps if it's available
-                       if ( source_fps > 0 && source_fps < 30 )
+                       if ( source_fps > 0 )
                                mlt_properties_set_double( properties, "source_fps", source_fps );
+                       else
+                               mlt_properties_set_double( properties, "source_fps", mlt_producer_get_fps( this ) );
                        mlt_properties_set_double( properties, "aspect_ratio", aspect_ratio );
                        
                        // Set the width and height
@@ -803,9 +885,9 @@ static int producer_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_form
        {
                int ret = 0;
                int got_audio = 0;
-               int16_t *temp = mlt_pool_alloc( sizeof( int16_t ) * AVCODEC_MAX_AUDIO_FRAME_SIZE );
+               int16_t *temp = av_malloc( sizeof( int16_t ) * AVCODEC_MAX_AUDIO_FRAME_SIZE );
 
-               memset( &pkt, 0, sizeof( pkt ) );
+               av_init_packet( &pkt );
 
                while( ret >= 0 && !got_audio )
                {
@@ -819,16 +901,20 @@ static int producer_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_form
                        // Read a packet
                        ret = av_read_frame( context, &pkt );
 
-               int len = pkt.size;
-               uint8_t *ptr = pkt.data;
-                       int data_size;
+                       int len = pkt.size;
+                       uint8_t *ptr = pkt.data;
 
                        // We only deal with audio from the selected audio_index
                        while ( ptr != NULL && ret >= 0 && pkt.stream_index == index && len > 0 )
                        {
+                               int data_size = sizeof( int16_t ) * AVCODEC_MAX_AUDIO_FRAME_SIZE;
+
                                // Decode the audio
+#if (LIBAVCODEC_VERSION_INT >= ((51<<16)+(29<<8)+0))
+                               ret = avcodec_decode_audio2( codec_context, temp, &data_size, ptr, len );
+#else
                                ret = avcodec_decode_audio( codec_context, temp, &data_size, ptr, len );
-
+#endif
                                if ( ret < 0 )
                                {
                                        ret = 0;
@@ -888,7 +974,7 @@ static int producer_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_form
                mlt_properties_set_int( properties, "_audio_used", audio_used );
 
                // Release the temporary audio
-               mlt_pool_release( temp );
+               av_free( temp );
        }
        else
        {
@@ -935,6 +1021,16 @@ static void producer_set_up_audio( mlt_producer this, mlt_frame frame )
                // Initialise the codec if necessary
                if ( codec == NULL )
                {
+                       // Initialise multi-threading 
+                       int thread_count = mlt_properties_get_int( properties, "threads" );
+                       if ( thread_count == 0 && getenv( "MLT_AVFORMAT_THREADS" ) )
+                               thread_count = atoi( getenv( "MLT_AVFORMAT_THREADS" ) );
+                       if ( thread_count > 1 )
+                       {
+                               avcodec_thread_init( codec_context, thread_count );
+                               codec_context->thread_count = thread_count;
+                       }
+
                        // Find the codec
                        codec = avcodec_find_decoder( codec_context->codec_id );
 
@@ -969,7 +1065,7 @@ static void producer_set_up_audio( mlt_producer this, mlt_frame frame )
 static int producer_get_frame( mlt_producer this, mlt_frame_ptr frame, int index )
 {
        // Create an empty frame
-       *frame = mlt_frame_init( );
+       *frame = mlt_frame_init( MLT_PRODUCER_SERVICE( this ) );
 
        // Update timecode on the frame we're creating
        mlt_frame_set_position( *frame, mlt_producer_position( this ) );