X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fgtk2%2Fproducer_pixbuf.c;h=be66990ce00b33f2ce48c4bdaabd185fc06de7be;hb=e727806e894128be3004502eee4d41537fb31c7d;hp=4cd7a4cde7723a3fdd81289ce2c62d61631c80d0;hpb=c12c6c380fa37b6a0d28ce98fdcda487a8aca76d;p=melted diff --git a/src/modules/gtk2/producer_pixbuf.c b/src/modules/gtk2/producer_pixbuf.c index 4cd7a4c..be66990 100644 --- a/src/modules/gtk2/producer_pixbuf.c +++ b/src/modules/gtk2/producer_pixbuf.c @@ -25,12 +25,15 @@ #include #include #include +#include #include #include #include #include #include +pthread_mutex_t fastmutex = PTHREAD_MUTEX_INITIALIZER; + typedef struct producer_pixbuf_s *producer_pixbuf; struct producer_pixbuf_s @@ -77,9 +80,6 @@ mlt_producer producer_pixbuf_init( char *filename ) mlt_properties_set( properties, "resource", filename ); mlt_properties_set_int( properties, "ttl", 25 ); - // Initialise gobject types - g_type_init(); - return producer; } free( this ); @@ -113,6 +113,8 @@ static void refresh_image( mlt_frame frame, int width, int height ) // Image index int image_idx = ( int )floor( ( double )position / ttl ) % this->count; + pthread_mutex_lock( &fastmutex ); + // optimization for subsequent iterations on single picture if ( width != 0 && this->image != NULL && image_idx == this->image_idx ) { @@ -206,6 +208,8 @@ static void refresh_image( mlt_frame frame, int width, int height ) // pass the image data without destructor mlt_properties_set_data( properties, "image", this->image, this->width * ( this->height + 1 ) * 2, NULL, NULL ); mlt_properties_set_data( properties, "alpha", this->alpha, this->width * this->height, NULL, NULL ); + + pthread_mutex_unlock( &fastmutex ); } static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_format *format, int *width, int *height, int writable )