X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Favformat%2Ffactory.c;h=49d6b93dc3b0d45cd6f442600e9b6c322f517245;hb=cdf7162ebc07120e92166a0e43eaba21ecca25ba;hp=4d984ba1e963e2b1711fb75de9229cd5053fff5c;hpb=16c5c516008b9debec7765e34f4756f8063dee7e;p=melted

diff --git a/src/modules/avformat/factory.c b/src/modules/avformat/factory.c
index 4d984ba..49d6b93 100644
--- a/src/modules/avformat/factory.c
+++ b/src/modules/avformat/factory.c
@@ -19,11 +19,81 @@
  */
 
 #include <string.h>
+#include <pthread.h>
 
+#include <framework/mlt_factory.h>
 #include "producer_avformat.h"
+#include "consumer_avformat.h"
+#include "filter_avcolour_space.h"
+#include "filter_avdeinterlace.h"
+#include "filter_avresample.h"
+
+// ffmpeg Header files
+#include <avformat.h>
+
+// A static flag used to determine if avformat has been initialised
+static int avformat_initialised = 0;
+
+// A locking mutex
+static pthread_mutex_t avformat_mutex;
+
+#if 0
+// These 3 functions should override the alloc functions in libavformat
+// but some formats or codecs seem to crash when used (wmv in particular)
+
+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
+
+void avformat_destroy( void *ignore )
+{
+	// Clean up
+	av_free_static( );
+
+	// Destroy the mutex
+	pthread_mutex_destroy( &avformat_mutex );
+}
+
+void avformat_lock( )
+{
+	// Lock the mutex now
+	pthread_mutex_lock( &avformat_mutex );
+}
+
+void avformat_unlock( )
+{
+	// Unlock the mutex now
+	pthread_mutex_unlock( &avformat_mutex );
+}
+
+static void avformat_init( )
+{
+	// Initialise avformat if necessary
+	if ( avformat_initialised == 0 )
+	{
+		avformat_initialised = 1;
+		pthread_mutex_init( &avformat_mutex, NULL );
+		av_register_all( );
+		mlt_factory_register_for_clean_up( NULL, avformat_destroy );
+		av_log_set_level( -1 );
+	}
+}
 
 void *mlt_create_producer( char *id, void *arg )
 {
+	avformat_init( );
 	if ( !strcmp( id, "avformat" ) )
 		return producer_avformat_init( arg );
 	return NULL;
@@ -31,6 +101,15 @@ void *mlt_create_producer( char *id, void *arg )
 
 void *mlt_create_filter( char *id, void *arg )
 {
+	avformat_init( );
+	if ( !strcmp( id, "avcolour_space" ) )
+		return filter_avcolour_space_init( arg );
+#ifdef USE_MMX
+	if ( !strcmp( id, "avdeinterlace" ) )
+		return filter_avdeinterlace_init( arg );
+#endif
+	if ( !strcmp( id, "avresample" ) )
+		return filter_avresample_init( arg );
 	return NULL;
 }
 
@@ -41,6 +120,9 @@ void *mlt_create_transition( char *id, void *arg )
 
 void *mlt_create_consumer( char *id, void *arg )
 {
+	avformat_init( );
+	if ( !strcmp( id, "avformat" ) )
+		return consumer_avformat_init( arg );
 	return NULL;
 }