X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fgtk2%2Fproducer_pixbuf.c;h=be66990ce00b33f2ce48c4bdaabd185fc06de7be;hb=e727806e894128be3004502eee4d41537fb31c7d;hp=5007ad7bdbe0a885c0dfab184cb61ac8bc1a75a9;hpb=34caefec7aa0334f38a649838cf3ab9db7388b27;p=melted diff --git a/src/modules/gtk2/producer_pixbuf.c b/src/modules/gtk2/producer_pixbuf.c index 5007ad7..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 @@ -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 ) @@ -229,6 +233,13 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form *width = mlt_properties_get_int( properties, "width" ); *height = mlt_properties_get_int( properties, "height" ); + if ( size == 0 ) + { + *width = mlt_properties_get_int( properties, "normalised_width" ); + *height = mlt_properties_get_int( properties, "normalised_height" ); + size = *width * ( *height + 1 ); + } + // Clone if necessary // NB: Cloning is necessary with this producer (due to processing of images ahead of use) // The fault is not in the design of mlt, but in the implementation of pixbuf... @@ -236,7 +247,8 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form { // Clone our image uint8_t *copy = mlt_pool_alloc( size ); - memcpy( copy, image, size ); + if ( image != NULL ) + memcpy( copy, image, size ); // We're going to pass the copy on image = copy; @@ -295,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 ); } @@ -324,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 ) { @@ -342,8 +351,8 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i { snprintf( fullname, 1023, "%s%s", dir_name, de[i]->d_name ); - if ( lstat( fullname, &info ) == 0 && - ( S_ISREG( info.st_mode ) || ( strstr( fullname, extension ) && info.st_mode | S_IXUSR ) ) ) + if ( strstr( fullname, extension ) && lstat( fullname, &info ) == 0 && + ( S_ISREG( info.st_mode ) || info.st_mode | S_IXUSR ) ) { this->filenames = realloc( this->filenames, sizeof( char * ) * ( this->count + 1 ) ); this->filenames[ this->count ++ ] = strdup( fullname ); @@ -358,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 ); } } @@ -370,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 ); @@ -384,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;