mutex protection of avformat, miracle avformat usage, and destrector reversal

git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@95 d19143bc-622f-0410-bfdd-b5b2a6649095

diff --git a/src/framework/mlt_properties.c b/src/framework/mlt_properties.c
index a0f39f224ced812e278e6c72cc9cdd5d5abe1d82..be4d66fc811f705bfb6c092ae39cfe2768ef58ec 100644 (file)
--- a/src/framework/mlt_properties.c
+++ b/src/framework/mlt_properties.c
@@ -343,7 +343,7 @@ void mlt_properties_close( mlt_properties this )
        int index = 0;
 
        // Clean up names and values
-       for ( index = 0; index < list->count; index ++ )
+       for ( index = list->count - 1; index >= 0; index -- )
        {
                free( list->name[ index ] );
                mlt_property_close( list->value[ index ] );

diff --git a/src/miracle/miracle_unit.c b/src/miracle/miracle_unit.c
index f7023d058e45e0f9ee1dd0186a784854f89919da..2f7391792013f6cc945bbea990eab43cf8c91ccf 100644 (file)
--- a/src/miracle/miracle_unit.c
+++ b/src/miracle/miracle_unit.c
@@ -175,7 +175,7 @@ static mlt_producer create_producer( miracle_unit unit, char *file )
        
                // 3rd line fallbacks 
                if ( result == NULL )
-                       result = mlt_factory_producer( "ffmpeg", file );
+                       result = mlt_factory_producer( "avformat", file );
 
                // Now store the result
                mlt_properties_set_data( properties, file, result, 0, ( mlt_destructor )mlt_producer_close, NULL );

diff --git a/src/modules/avformat/producer_avformat.c b/src/modules/avformat/producer_avformat.c
index 572409ca6027da6ff145f86548e9784d54c7f40c..943b8476d12f8722c04ad40d6c0c3159d34f1107 100644 (file)
--- a/src/modules/avformat/producer_avformat.c
+++ b/src/modules/avformat/producer_avformat.c
@@ -30,6 +30,7 @@
 // System header files
 #include <stdlib.h>
 #include <string.h>
+#include <pthread.h>
 
 // Forward references.
 static int producer_open( mlt_producer this, char *file );
@@ -37,6 +38,7 @@ 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.
 */
@@ -69,6 +71,7 @@ mlt_producer producer_avformat_init( char *file )
                        // Initialise avformat if necessary
                        if ( avformat_initialised == 0 )
                        {
+                               pthread_mutex_init( &avformat_mutex, NULL );
                                avformat_initialised = 1;
                                av_register_all( );
                        }
@@ -116,6 +119,42 @@ void find_default_streams( AVFormatContext *context, int *audio_index, int *vide
        }
 }
 
+/** Producer file destructor.
+*/
+
+void producer_file_close( void *context )
+{
+       if ( context != NULL )
+       {
+               // Lock the mutex now
+               pthread_mutex_lock( &avformat_mutex );
+
+               // Close the file
+               av_close_input_file( context );
+
+               // Unlock the mutex now
+               pthread_mutex_unlock( &avformat_mutex );
+       }
+}
+
+/** Producer file destructor.
+*/
+
+void producer_codec_close( void *codec )
+{
+       if ( codec != NULL )
+       {
+               // Lock the mutex now
+               pthread_mutex_lock( &avformat_mutex );
+
+               // Close the file
+               avcodec_close( codec );
+
+               // Unlock the mutex now
+               pthread_mutex_unlock( &avformat_mutex );
+       }
+}
+
 /** Open the file.
 
        NOTE: We need to have a valid [PAL or NTSC] frame rate before we can determine the 
@@ -141,6 +180,9 @@ static int producer_open( mlt_producer this, char *file )
        // We will treat everything with the producer fps
        double fps = mlt_properties_get_double( properties, "fps" );
 
+       // Lock the mutex now
+       pthread_mutex_lock( &avformat_mutex );
+
        // Now attempt to open the file
        error = av_open_input_file( &context, file, NULL, 0, NULL ) < 0;
 
@@ -177,24 +219,24 @@ static int producer_open( mlt_producer this, char *file )
                        if ( 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, ( mlt_destructor )av_close_input_file, NULL );
+                               mlt_properties_set_data( properties, "video_context", context, 0, producer_file_close, NULL );
 
                                // And open again for our audio context
                                av_open_input_file( &context, file, NULL, 0, NULL );
                                av_find_stream_info( context );
 
                                // Audio context
-                               mlt_properties_set_data( properties, "audio_context", context, 0, ( mlt_destructor )av_close_input_file, NULL );
+                               mlt_properties_set_data( properties, "audio_context", context, 0, producer_file_close, NULL );
                        }
                        else if ( video_index != -1 )
                        {
                                // We only have a video context
-                               mlt_properties_set_data( properties, "video_context", context, 0, ( mlt_destructor )av_close_input_file, NULL );
+                               mlt_properties_set_data( properties, "video_context", context, 0, producer_file_close, NULL );
                        }
                        else if ( audio_index != -1 )
                        {
                                // We only have an audio context
-                               mlt_properties_set_data( properties, "audio_context", context, 0, ( mlt_destructor )av_close_input_file, NULL );
+                               mlt_properties_set_data( properties, "audio_context", context, 0, producer_file_close, NULL );
                        }
                        else
                        {
@@ -204,6 +246,9 @@ static int producer_open( mlt_producer this, char *file )
                }
        }
 
+       // Unlock the mutex now
+       pthread_mutex_unlock( &avformat_mutex );
+
        return error;
 }
 
@@ -281,6 +326,9 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
        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 )
        {
@@ -401,6 +449,9 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
        // 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;
 }
 
@@ -418,6 +469,9 @@ static void producer_set_up_video( mlt_producer this, mlt_frame frame )
        // Get the video_index
        int index = mlt_properties_get_int( properties, "video_index" );
 
+       // Lock the mutex now
+       pthread_mutex_lock( &avformat_mutex );
+
        if ( context != NULL && index != -1 )
        {
                // Get the frame properties
@@ -455,7 +509,7 @@ static void producer_set_up_video( mlt_producer this, mlt_frame frame )
                                mlt_properties_set_double( properties, "aspect_ratio", aspect_ratio );
 
                                // Now store the codec with its destructor
-                               mlt_properties_set_data( properties, "video_codec", codec, 0, ( mlt_destructor )avcodec_close, NULL );
+                               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 );
@@ -474,6 +528,9 @@ static void producer_set_up_video( mlt_producer this, mlt_frame frame )
                        mlt_properties_set_data( frame_properties, "avformat_producer", this, 0, NULL, NULL );
                }
        }
+
+       // Unlock the mutex now
+       pthread_mutex_unlock( &avformat_mutex );
 }
 
 /** Get the audio from a frame.
@@ -529,6 +586,9 @@ static int producer_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_form
        // Flag for paused (silence) 
        int paused = 0;
 
+       // Lock the mutex now
+       pthread_mutex_lock( &avformat_mutex );
+
        // Check for resample and create if necessary
        if ( resample == NULL )
        {
@@ -536,7 +596,7 @@ static int producer_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_form
                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 );
+               mlt_properties_set_data( properties, "audio_resample", resample, 0, ( mlt_destructor )audio_resample_close, NULL );
        }
 
        // Check for audio buffer and create if necessary
@@ -667,6 +727,9 @@ static int producer_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_form
        // 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 );
+
        return 0;
 }
 
@@ -684,6 +747,9 @@ static void producer_set_up_audio( mlt_producer this, mlt_frame frame )
        // 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 )
        {
@@ -709,7 +775,7 @@ static void producer_set_up_audio( mlt_producer this, mlt_frame frame )
                        if ( codec != NULL && avcodec_open( codec_context, codec ) >= 0 )
                        {
                                // Now store the codec with its destructor
-                               mlt_properties_set_data( properties, "audio_codec", codec, 0, ( mlt_destructor )avcodec_close, NULL );
+                               mlt_properties_set_data( properties, "audio_codec", codec_context, 0, producer_codec_close, NULL );
                        }
                        else
                        {
@@ -725,6 +791,9 @@ static void producer_set_up_audio( mlt_producer this, mlt_frame frame )
                        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.