Fixes threaded pixbuf usage and removes flash when swicthing between sdl preview...

[melted] / src / modules / gtk2 / producer_pixbuf.c

diff --git a/src/modules/gtk2/producer_pixbuf.c b/src/modules/gtk2/producer_pixbuf.c
index 2345145..be66990 100644 (file)
--- a/src/modules/gtk2/producer_pixbuf.c
+++ b/src/modules/gtk2/producer_pixbuf.c
@@ -25,12 +25,15 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <pthread.h>
 #include <math.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <dirent.h>
 
+pthread_mutex_t fastmutex = PTHREAD_MUTEX_INITIALIZER;
+
 typedef struct producer_pixbuf_s *producer_pixbuf;
 
 struct producer_pixbuf_s
@@ -71,15 +74,12 @@ mlt_producer producer_pixbuf_init( char *filename )
        
                // Callback registration
                producer->get_frame = producer_get_frame;
-               producer->close = producer_close;
+               producer->close = ( mlt_destructor )producer_close;
 
                // Set the default properties
                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 )
        {
@@ -164,7 +166,7 @@ static void refresh_image( mlt_frame frame, int width, int height )
 
                // Note - the original pixbuf is already safe and ready for destruction
                pixbuf = gdk_pixbuf_scale_simple( pixbuf, width, height, interp );
-               
+
                // Store width and height
                this->width = width;
                this->height = height;
@@ -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 )
@@ -303,8 +307,6 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i
                                this->filenames = realloc( this->filenames, sizeof( char * ) * ( this->count + 1 ) );
                                this->filenames[ this->count ++ ] = strdup( fullname );
 
-                               mlt_properties_set_position( properties, "out", 250 );
-
                                // Teehe - when the producer closes, delete the temp file and the space allo
                                mlt_properties_set_data( properties, "__temporary_file__", this->filenames[ this->count - 1 ], 0, ( mlt_destructor )unlink, NULL );
                        }
@@ -332,7 +334,6 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i
                                        gap ++;
                                }
                        }
-                       mlt_properties_set_position( properties, "out", this->count * 250 );
                }
                else if ( strstr( filename, "/.all." ) != NULL )
                {
@@ -366,7 +367,6 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i
                {
                        this->filenames = realloc( this->filenames, sizeof( char * ) * ( this->count + 1 ) );
                        this->filenames[ this->count ++ ] = strdup( filename );
-                       mlt_properties_set_position( properties, "out", 250 );
                }
        }
 
@@ -378,6 +378,9 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i
                // Obtain properties of frame and producer
                mlt_properties properties = mlt_frame_properties( *frame );
 
+               // Determine if we're rendering for PAL or NTSC
+               int is_pal = mlt_properties_get_int( properties, "normalised_height" ) == 576;
+
                // Set the producer on the frame properties
                mlt_properties_set_data( properties, "producer_pixbuf", this, 0, NULL, NULL );
 
@@ -392,7 +395,7 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i
 
                // Set producer-specific frame properties
                mlt_properties_set_int( properties, "progressive", 1 );
-               mlt_properties_set_double( properties, "aspect_ratio", 1 );
+               mlt_properties_set_double( properties, "aspect_ratio", is_pal ? 59.0/54.0 : 10.0/11.0 );
 
                // Set alpha call back
                ( *frame )->get_alpha_mask = producer_get_alpha_mask;