X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmodules%2Fgtk2%2Fproducer_pixbuf.c;h=ab4aa66c0e9178ff1cec1a8522b7d3752fd989ae;hb=b698c58e57643e9df6941d91b07a40c997bd7e64;hp=c79b28d92ca0a6457a4df56095743cea054d4b1e;hpb=bf3264b9e340ba5c11cbf59835a8af3db94e0cc2;p=mlt

diff --git a/src/modules/gtk2/producer_pixbuf.c b/src/modules/gtk2/producer_pixbuf.c
index c79b28d9..ab4aa66c 100644
--- a/src/modules/gtk2/producer_pixbuf.c
+++ b/src/modules/gtk2/producer_pixbuf.c
@@ -18,10 +18,18 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "producer_pixbuf.h"
+#include <framework/mlt_producer.h>
 #include <framework/mlt_frame.h>
+#include <framework/mlt_cache.h>
+#include <framework/mlt_log.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
+#include "config.h"
+
+#ifdef USE_EXIF
+#include <libexif/exif-data.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -32,7 +40,7 @@
 #include <unistd.h>
 #include <dirent.h>
 
-static pthread_mutex_t fastmutex = PTHREAD_MUTEX_INITIALIZER;
+static pthread_mutex_t g_mutex = PTHREAD_MUTEX_INITIALIZER;
 
 typedef struct producer_pixbuf_s *producer_pixbuf;
 
@@ -44,13 +52,17 @@ struct producer_pixbuf_s
 	mlt_properties filenames;
 	int count;
 	int image_idx;
-
+	int pixbuf_idx;
 	int width;
 	int height;
+	int alpha;
 	uint8_t *image;
-	uint8_t *alpha;
+	mlt_cache_item image_cache;
+	pthread_mutex_t mutex;
 };
 
+static void load_filenames( producer_pixbuf this, mlt_properties producer_properties );
+static void refresh_image( producer_pixbuf this, mlt_frame frame, int width, int height );
 static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int index );
 static void producer_close( mlt_producer parent );
 
@@ -73,26 +85,123 @@ mlt_producer producer_pixbuf_init( char *filename )
 		mlt_properties_set_int( properties, "ttl", 25 );
 		mlt_properties_set_int( properties, "aspect_ratio", 1 );
 		mlt_properties_set_int( properties, "progressive", 1 );
-		
+
+		// Validate the resource
+		if ( filename )
+			load_filenames( this, properties );
+		if ( this->count )
+		{
+			mlt_frame frame = mlt_frame_init( MLT_PRODUCER_SERVICE( producer ) );
+			if ( frame )
+			{
+				mlt_properties frame_properties = MLT_FRAME_PROPERTIES( frame );
+				pthread_mutex_init( &this->mutex, NULL );
+				mlt_properties_set_data( frame_properties, "producer_pixbuf", this, 0, NULL, NULL );
+				mlt_frame_set_position( frame, mlt_producer_position( producer ) );
+				mlt_properties_set_position( frame_properties, "pixbuf_position", mlt_producer_position( producer ) );
+				refresh_image( this, frame, 0, 0 );
+				mlt_frame_close( frame );
+			}
+		}
+		if ( this->width == 0 )
+		{
+			producer_close( producer );
+			producer = NULL;
+		}
 		return producer;
 	}
 	free( this );
 	return NULL;
 }
 
-static void refresh_image( mlt_frame frame, int width, int height )
+static void load_filenames( producer_pixbuf this, mlt_properties producer_properties )
 {
-	// Pixbuf 
-	GdkPixbuf *pixbuf = mlt_properties_get_data( MLT_FRAME_PROPERTIES( frame ), "pixbuf", NULL );
-	GError *error = NULL;
+	char *filename = mlt_properties_get( producer_properties, "resource" );
+	this->filenames = mlt_properties_new( );
+
+	// Read xml string
+	if ( strstr( filename, "<svg" ) )
+	{
+		// Generate a temporary file for the svg
+		char fullname[ 1024 ] = "/tmp/mlt.XXXXXX";
+		int fd = g_mkstemp( fullname );
+
+		if ( fd > -1 )
+		{
+			// Write the svg into the temp file
+			ssize_t remaining_bytes;
+			char *xml = filename;
+			
+			// Strip leading crap
+			while ( xml[0] != '<' )
+				xml++;
+			
+			remaining_bytes = strlen( xml );
+			while ( remaining_bytes > 0 )
+				remaining_bytes -= write( fd, xml + strlen( xml ) - remaining_bytes, remaining_bytes );
+			close( fd );
+
+			mlt_properties_set( this->filenames, "0", fullname );
+
+			// Teehe - when the producer closes, delete the temp file and the space allo
+			mlt_properties_set_data( producer_properties, "__temporary_file__", fullname, 0, ( mlt_destructor )unlink, NULL );
+		}
+	}
+	// Obtain filenames
+	else if ( strchr( filename, '%' ) != NULL )
+	{
+		// handle picture sequences
+		int i = mlt_properties_get_int( producer_properties, "begin" );
+		int gap = 0;
+		char full[1024];
+		int keyvalue = 0;
+		char key[ 50 ];
+
+		while ( gap < 100 )
+		{
+			struct stat buf;
+			snprintf( full, 1023, filename, i ++ );
+			if ( stat( full, &buf ) == 0 )
+			{
+				sprintf( key, "%d", keyvalue ++ );
+				mlt_properties_set( this->filenames, key, full );
+				gap = 0;
+			}
+			else
+			{
+				gap ++;
+			}
+		}
+		if ( mlt_properties_count( this->filenames ) > 0 )
+			mlt_properties_set_int( producer_properties, "ttl", 1 );
+	}
+	else if ( strstr( filename, "/.all." ) != NULL )
+	{
+		char wildcard[ 1024 ];
+		char *dir_name = strdup( filename );
+		char *extension = strrchr( dir_name, '.' );
+
+		*( strstr( dir_name, "/.all." ) + 1 ) = '\0';
+		sprintf( wildcard, "*%s", extension );
+
+		mlt_properties_dir_list( this->filenames, dir_name, wildcard, 1 );
+
+		free( dir_name );
+	}
+	else
+	{
+		mlt_properties_set( this->filenames, "0", filename );
+	}
+
+	this->count = mlt_properties_count( this->filenames );
+}
 
+static void refresh_image( producer_pixbuf this, mlt_frame frame, int width, int height )
+{
 	// Obtain properties of frame
 	mlt_properties properties = MLT_FRAME_PROPERTIES( frame );
 
-	// Obtain the producer for this frame
-	producer_pixbuf this = mlt_properties_get_data( properties, "producer_pixbuf", NULL );
-
-	// Obtain the producer 
+	// Obtain the producer
 	mlt_producer producer = &this->parent;
 
 	// Obtain properties of producer
@@ -103,11 +212,30 @@ static void refresh_image( mlt_frame frame, int width, int height )
 	mlt_properties cache = mlt_properties_get_data( producer_props, "_cache", NULL );
 	int update_cache = 0;
 
+	// restore GdkPixbuf
+	pthread_mutex_lock( &this->mutex );
+	mlt_cache_item pixbuf_cache = mlt_service_cache_get( MLT_PRODUCER_SERVICE( producer ), "pixbuf.pixbuf" );
+	GdkPixbuf *pixbuf = mlt_cache_item_data( pixbuf_cache, NULL );
+	GError *error = NULL;
+
+	// restore scaled image
+	this->image_cache = mlt_service_cache_get( MLT_PRODUCER_SERVICE( producer ), "pixbuf.image" );
+	this->image = mlt_cache_item_data( this->image_cache, NULL );
+
+	// Check if user wants us to reload the image
+	if ( mlt_properties_get_int( producer_props, "force_reload" ) )
+	{
+		pixbuf = NULL;
+		this->image = NULL;
+		mlt_properties_set_int( producer_props, "force_reload", 0 );
+	}
+
 	// Get the time to live for each frame
 	double ttl = mlt_properties_get_int( producer_props, "ttl" );
 
 	// Get the original position of this frame
 	mlt_position position = mlt_properties_get_position( properties, "pixbuf_position" );
+	position += mlt_producer_get_in( producer );
 
 	// Image index
 	int image_idx = ( int )floor( ( double )position / ttl ) % this->count;
@@ -116,7 +244,7 @@ static void refresh_image( mlt_frame frame, int width, int height )
 	char image_key[ 10 ];
 	sprintf( image_key, "%d", image_idx );
 
-	pthread_mutex_lock( &fastmutex );
+	pthread_mutex_lock( &g_mutex );
 
 	// Check if the frame is already loaded
 	if ( use_cache )
@@ -138,51 +266,94 @@ static void refresh_image( mlt_frame frame, int width, int height )
 			mlt_properties_set_int( producer_props, "_real_width", mlt_properties_get_int( cached_props, "real_width" ) );
 			mlt_properties_set_int( producer_props, "_real_height", mlt_properties_get_int( cached_props, "real_height" ) );
 			this->image = mlt_properties_get_data( cached_props, "image", NULL );
-			this->alpha = mlt_properties_get_data( cached_props, "alpha", NULL );
+			this->alpha = mlt_properties_get_int( cached_props, "alpha" );
 
 			if ( width != 0 && ( width != this->width || height != this->height ) )
 				this->image = NULL;
 		}
 	}
-
+	int disable_exif = mlt_properties_get_int( producer_props, "disable_exif" );
+	
     // optimization for subsequent iterations on single picture
-	if ( width != 0 && this->image != NULL && image_idx == this->image_idx )
-	{
-		if ( width != this->width || height != this->height )
-		{
-			pixbuf = mlt_properties_get_data( producer_props, "_pixbuf", NULL );
-			if ( !use_cache )
-			{
-				mlt_pool_release( this->image );
-				mlt_pool_release( this->alpha );
-			}
-			this->image = NULL;
-			this->alpha = NULL;
-		}
-	}
-	else if ( pixbuf == NULL && ( this->image == NULL || image_idx != this->image_idx ) )
+	if ( width != 0 && ( image_idx != this->image_idx || width != this->width || height != this->height ) )
+		this->image = NULL;
+	if ( image_idx != this->pixbuf_idx )
+		pixbuf = NULL;
+	mlt_log_debug( MLT_PRODUCER_SERVICE( producer ), "image %p pixbuf %p idx %d image_idx %d pixbuf_idx %d width %d\n",
+		this->image, pixbuf, image_idx, this->image_idx, this->pixbuf_idx, width );
+	if ( !pixbuf || mlt_properties_get_int( producer_props, "_disable_exif" ) != disable_exif )
 	{
-		if ( !use_cache )
-		{
-			mlt_pool_release( this->image );
-			mlt_pool_release( this->alpha );
-		}
 		this->image = NULL;
-		this->alpha = NULL;
-
-		this->image_idx = image_idx;
 		pixbuf = gdk_pixbuf_new_from_file( mlt_properties_get_value( this->filenames, image_idx ), &error );
 
-		if ( pixbuf != NULL )
+		if ( pixbuf )
 		{
+#ifdef USE_EXIF
+			// Read the exif value for this file
+			if ( disable_exif == 0) {
+				ExifData *d = exif_data_new_from_file( mlt_properties_get_value( this->filenames, image_idx ) );
+				ExifEntry *entry;
+				int exif_orientation = 0;
+
+				/* get orientation and rotate image accordingly if necessary */
+				if (d) {
+					if ( ( entry = exif_content_get_entry ( d->ifd[EXIF_IFD_0], EXIF_TAG_ORIENTATION ) ) )
+						exif_orientation = exif_get_short (entry->data, exif_data_get_byte_order (d));
+
+					/* Free the EXIF data */
+					exif_data_unref(d);
+				}
+
+				if ( exif_orientation > 1 )
+				{
+					GdkPixbuf *processed = NULL;
+					GdkPixbufRotation matrix = GDK_PIXBUF_ROTATE_NONE;
+
+					// Rotate image according to exif data
+					switch ( exif_orientation ) {
+					  case 2:
+					      processed = gdk_pixbuf_flip ( pixbuf, TRUE );
+					      break;
+					  case 3:
+					      matrix = GDK_PIXBUF_ROTATE_UPSIDEDOWN;
+					      processed = pixbuf;
+					      break;
+					  case 4:
+					      processed = gdk_pixbuf_flip ( pixbuf, FALSE );
+					      break;
+					  case 5:
+					      matrix = GDK_PIXBUF_ROTATE_COUNTERCLOCKWISE;
+					      processed = gdk_pixbuf_flip ( pixbuf, TRUE );
+					      break;
+					  case 6:
+					      matrix = GDK_PIXBUF_ROTATE_CLOCKWISE;
+					      processed = pixbuf;
+					      break;
+					  case 7:
+					      matrix = GDK_PIXBUF_ROTATE_CLOCKWISE;
+					      processed = gdk_pixbuf_flip ( pixbuf, TRUE );
+					      break;
+					  case 8:
+					      matrix = GDK_PIXBUF_ROTATE_COUNTERCLOCKWISE;
+					      processed = pixbuf;
+					      break;
+					}
+					if ( processed )
+						pixbuf = gdk_pixbuf_rotate_simple( processed, matrix );
+				}
+			}
+#endif
+
 			// Register this pixbuf for destruction and reuse
-			mlt_events_block( producer_props, NULL );
-			mlt_properties_set_data( producer_props, "_pixbuf", pixbuf, 0, ( mlt_destructor )g_object_unref, NULL );
-			g_object_ref( pixbuf );
-			mlt_properties_set_data( MLT_FRAME_PROPERTIES( frame ), "pixbuf", pixbuf, 0, ( mlt_destructor )g_object_unref, NULL );
+			mlt_cache_item_close( pixbuf_cache );
+			mlt_service_cache_put( MLT_PRODUCER_SERVICE( producer ), "pixbuf.pixbuf", pixbuf, 0, ( mlt_destructor )g_object_unref );
+			pixbuf_cache = mlt_service_cache_get( MLT_PRODUCER_SERVICE( producer ), "pixbuf.pixbuf" );
+			this->pixbuf_idx = image_idx;
 
+			mlt_events_block( producer_props, NULL );
 			mlt_properties_set_int( producer_props, "_real_width", gdk_pixbuf_get_width( pixbuf ) );
 			mlt_properties_set_int( producer_props, "_real_height", gdk_pixbuf_get_height( pixbuf ) );
+			mlt_properties_set_int( producer_props, "_disable_exif", disable_exif );
 			mlt_events_unblock( producer_props, NULL );
 
 			// Store the width/height of the pixbuf temporarily
@@ -191,8 +362,8 @@ static void refresh_image( mlt_frame frame, int width, int height )
 		}
 	}
 
-	// If we have a pixbuf
-	if ( pixbuf && width > 0 )
+	// If we have a pixbuf and we need an image
+	if ( pixbuf && width > 0 && !this->image )
 	{
 		char *interps = mlt_properties_get( properties, "rescale.interp" );
 		int interp = GDK_INTERP_BILINEAR;
@@ -212,28 +383,33 @@ static void refresh_image( mlt_frame frame, int width, int height )
 		this->height = height;
 		
 		// Allocate/define image
-		this->image = mlt_pool_alloc( width * ( height + 1 ) * 2 );
+		this->alpha = gdk_pixbuf_get_has_alpha( pixbuf );
+		int src_stride = gdk_pixbuf_get_rowstride( pixbuf );
+		int dst_stride = this->width * ( this->alpha ? 4 : 3 );
+		int image_size = dst_stride * ( height + 1 );
+		this->image = mlt_pool_alloc( image_size );
 
-		// Extract YUV422 and alpha
-		if ( gdk_pixbuf_get_has_alpha( pixbuf ) )
+		if ( src_stride != dst_stride )
 		{
-			// Allocate the alpha mask
-			this->alpha = mlt_pool_alloc( this->width * this->height );
-
-			// Convert the image
-			mlt_convert_rgb24a_to_yuv422( gdk_pixbuf_get_pixels( pixbuf ),
-										  this->width, this->height,
-										  gdk_pixbuf_get_rowstride( pixbuf ),
-										  this->image, this->alpha );
+			int y = this->height;
+			uint8_t *src = gdk_pixbuf_get_pixels( pixbuf );
+			uint8_t *dst = this->image;
+			while ( y-- )
+			{
+				memcpy( dst, src, dst_stride );
+				dst += dst_stride;
+				src += src_stride;
+			}
 		}
 		else
-		{ 
-			// No alpha to extract
-			mlt_convert_rgb24_to_yuv422( gdk_pixbuf_get_pixels( pixbuf ),
-										 this->width, this->height,
-										 gdk_pixbuf_get_rowstride( pixbuf ),
-										 this->image );
+		{
+			memcpy( this->image, gdk_pixbuf_get_pixels( pixbuf ), src_stride * height );
 		}
+		if ( !use_cache )
+			mlt_cache_item_close( this->image_cache );
+		mlt_service_cache_put( MLT_PRODUCER_SERVICE( producer ), "pixbuf.image", this->image, image_size, mlt_pool_release );
+		this->image_cache = mlt_service_cache_get( MLT_PRODUCER_SERVICE( producer ), "pixbuf.image" );
+		this->image_idx = image_idx;
 
 		// Finished with pixbuf now
 		g_object_unref( pixbuf );
@@ -242,100 +418,85 @@ static void refresh_image( mlt_frame frame, int width, int height )
 		update_cache = use_cache;
 	}
 
+	// release references no longer needed
+	mlt_cache_item_close( pixbuf_cache );
+	if ( width == 0 )
+	{
+		pthread_mutex_unlock( &this->mutex );
+		mlt_cache_item_close( this->image_cache );
+	}
+
 	// Set width/height of frame
 	mlt_properties_set_int( properties, "width", this->width );
 	mlt_properties_set_int( properties, "height", this->height );
 	mlt_properties_set_int( properties, "real_width", mlt_properties_get_int( producer_props, "_real_width" ) );
 	mlt_properties_set_int( properties, "real_height", mlt_properties_get_int( producer_props, "_real_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 );
-
 	if ( update_cache )
 	{
-		mlt_frame cached = mlt_frame_init( );
+		mlt_frame cached = mlt_frame_init( MLT_PRODUCER_SERVICE( producer ) );
 		mlt_properties cached_props = MLT_FRAME_PROPERTIES( cached );
 		mlt_properties_set_int( cached_props, "width", this->width );
 		mlt_properties_set_int( cached_props, "height", this->height );
 		mlt_properties_set_int( cached_props, "real_width", mlt_properties_get_int( producer_props, "_real_width" ) );
 		mlt_properties_set_int( cached_props, "real_height", mlt_properties_get_int( producer_props, "_real_height" ) );
-		mlt_properties_set_data( cached_props, "image", this->image, this->width * ( this->height + 1 ) * 2, mlt_pool_release, NULL );
-		mlt_properties_set_data( cached_props, "alpha", this->alpha, this->width * this->height, mlt_pool_release, NULL );
+		mlt_properties_set_data( cached_props, "image", this->image, this->width * ( this->alpha ? 4 : 3 ) * this->height, mlt_pool_release, NULL );
+		mlt_properties_set_int( cached_props, "alpha", this->alpha );
 		mlt_properties_set_data( cache, image_key, cached, 0, ( mlt_destructor )mlt_frame_close, NULL );
 	}
 
-	pthread_mutex_unlock( &fastmutex );
+	pthread_mutex_unlock( &g_mutex );
 }
 
 static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_format *format, int *width, int *height, int writable )
 {
+	int error = 0;
+	
 	// Obtain properties of frame
 	mlt_properties properties = MLT_FRAME_PROPERTIES( frame );
 
-	// We need to know the size of the image to clone it
-	int image_size = 0;
-	int alpha_size = 0;
-
-	// Alpha channel
-	uint8_t *alpha = NULL;
+	// Obtain the producer for this frame
+	producer_pixbuf this = mlt_properties_get_data( properties, "producer_pixbuf", NULL );
 
 	*width = mlt_properties_get_int( properties, "rescale_width" );
 	*height = mlt_properties_get_int( properties, "rescale_height" );
 
-	// Refresh the image
-	refresh_image( frame, *width, *height );
+	mlt_service_lock( MLT_PRODUCER_SERVICE( &this->parent ) );
 
-	// Get the image
-	*buffer = mlt_properties_get_data( properties, "image", &image_size );
-	alpha = mlt_properties_get_data( properties, "alpha", &alpha_size );
+	// Refresh the image
+	refresh_image( this, frame, *width, *height );
 
 	// Get width and height (may have changed during the refresh)
-	*width = mlt_properties_get_int( properties, "width" );
-	*height = mlt_properties_get_int( properties, "height" );
+	*width = this->width;
+	*height = this->height;
 
 	// 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 the pixbuf producer...
-	if ( *buffer != NULL )
+	if ( this->image )
 	{
-		// Clone the image and the alpha
+		// Clone the image
+		int image_size = this->width * this->height * ( this->alpha ? 4 :3 );
 		uint8_t *image_copy = mlt_pool_alloc( image_size );
-		uint8_t *alpha_copy = mlt_pool_alloc( alpha_size );
-
-		memcpy( image_copy, *buffer, image_size );
-
-		// Copy or default the alpha
-		if ( alpha != NULL )
-			memcpy( alpha_copy, alpha, alpha_size );
-		else
-			memset( alpha_copy, 255, alpha_size );
-
+		memcpy( image_copy, this->image, image_size );
 		// Now update properties so we free the copy after
 		mlt_properties_set_data( properties, "image", image_copy, image_size, mlt_pool_release, NULL );
-		mlt_properties_set_data( properties, "alpha", alpha_copy, alpha_size, mlt_pool_release, NULL );
-
 		// We're going to pass the copy on
 		*buffer = image_copy;
+		*format = this->alpha ? mlt_image_rgb24a : mlt_image_rgb24;
+		mlt_log_debug( MLT_PRODUCER_SERVICE( &this->parent ), "%dx%d (%s)\n",
+			this->width, this->height, mlt_image_format_name( *format ) );
 	}
 	else
 	{
-		// TODO: Review all cases of invalid images
-		*buffer = mlt_pool_alloc( 50 * 50 * 2 );
-		mlt_properties_set_data( properties, "image", *buffer, image_size, mlt_pool_release, NULL );
-		*width = 50;
-		*height = 50;
+		error = 1;
 	}
 
-	return 0;
-}
-
-static uint8_t *producer_get_alpha_mask( mlt_frame this )
-{
-	// Obtain properties of frame
-	mlt_properties properties = MLT_FRAME_PROPERTIES( this );
+	// Release references and locks
+	pthread_mutex_unlock( &this->mutex );
+	mlt_cache_item_close( this->image_cache );
+	mlt_service_unlock( MLT_PRODUCER_SERVICE( &this->parent ) );
 
-	// Return the alpha mask
-	return mlt_properties_get_data( properties, "alpha", NULL );
+	return error;
 }
 
 static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int index )
@@ -347,87 +508,10 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i
 	mlt_properties producer_properties = MLT_PRODUCER_PROPERTIES( producer );
 
 	if ( this->filenames == NULL && mlt_properties_get( producer_properties, "resource" ) != NULL )
-	{
-		char *filename = mlt_properties_get( producer_properties, "resource" );
-		this->filenames = mlt_properties_new( );
-
-		// Read xml string
-		if ( strstr( filename, "<svg" ) )
-		{
-			// Generate a temporary file for the svg
-			char fullname[ 1024 ] = "/tmp/mlt.XXXXXX";
-			int fd = mkstemp( fullname );
-
-			if ( fd > -1 )
-			{
-				// Write the svg into the temp file
-				ssize_t remaining_bytes;
-				char *xml = filename;
-				
-				// Strip leading crap
-				while ( xml[0] != '<' )
-					xml++;
-				
-				remaining_bytes = strlen( xml );
-				while ( remaining_bytes > 0 )
-					remaining_bytes -= write( fd, xml + strlen( xml ) - remaining_bytes, remaining_bytes );
-				close( fd );
-
-				mlt_properties_set( this->filenames, "0", fullname );
-
-				// Teehe - when the producer closes, delete the temp file and the space allo
-				mlt_properties_set_data( producer_properties, "__temporary_file__", fullname, 0, ( mlt_destructor )unlink, NULL );
-			}
-		}
-		// Obtain filenames
-		else if ( strchr( filename, '%' ) != NULL )
-		{
-			// handle picture sequences
-			int i = mlt_properties_get_int( producer_properties, "begin" );
-			int gap = 0;
-			char full[1024];
-			int keyvalue = 0;
-			char key[ 50 ];
-
-			while ( gap < 100 )
-			{
-				struct stat buf;
-				snprintf( full, 1023, filename, i ++ );
-				if ( stat( full, &buf ) == 0 )
-				{
-					sprintf( key, "%d", keyvalue ++ );
-					mlt_properties_set( this->filenames, "0", full );
-					gap = 0;
-				}
-				else
-				{
-					gap ++;
-				}
-			}
-		}
-		else if ( strstr( filename, "/.all." ) != NULL )
-		{
-			char wildcard[ 1024 ];
-			char *dir_name = strdup( filename );
-			char *extension = strrchr( dir_name, '.' );
-
-			*( strstr( dir_name, "/.all." ) + 1 ) = '\0';
-			sprintf( wildcard, "*%s", extension );
-
-			mlt_properties_dir_list( this->filenames, dir_name, wildcard, 1 );
-
-			free( dir_name );
-		}
-		else
-		{
-			mlt_properties_set( this->filenames, "0", filename );
-		}
-
-		this->count = mlt_properties_count( this->filenames );
-	}
+		load_filenames( this, producer_properties );
 
 	// Generate a frame
-	*frame = mlt_frame_init( );
+	*frame = mlt_frame_init( MLT_PRODUCER_SERVICE( producer ) );
 
 	if ( *frame != NULL && this->count > 0 )
 	{
@@ -444,14 +528,16 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i
 		mlt_properties_set_position( properties, "pixbuf_position", mlt_producer_position( producer ) );
 
 		// Refresh the image
-		refresh_image( *frame, 0, 0 );
+		refresh_image( this, *frame, 0, 0 );
 
 		// Set producer-specific frame properties
 		mlt_properties_set_int( properties, "progressive", mlt_properties_get_int( producer_properties, "progressive" ) );
-		mlt_properties_set_double( properties, "aspect_ratio", mlt_properties_get_double( producer_properties, "aspect_ratio" ) );
-
-		// Set alpha call back
-		( *frame )->get_alpha_mask = producer_get_alpha_mask;
+		
+		double force_ratio = mlt_properties_get_double( producer_properties, "force_aspect_ratio" );
+		if ( force_ratio > 0.0 )
+			mlt_properties_set_double( properties, "aspect_ratio", force_ratio );
+		else
+			mlt_properties_set_double( properties, "aspect_ratio", mlt_properties_get_double( producer_properties, "aspect_ratio" ) );
 
 		// Push the get_image method
 		mlt_frame_push_get_image( *frame, producer_get_image );
@@ -466,12 +552,9 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i
 static void producer_close( mlt_producer parent )
 {
 	producer_pixbuf this = parent->child;
-	if ( !mlt_properties_get_int( MLT_PRODUCER_PROPERTIES( parent ), "cache" ) )
-	{
-		mlt_pool_release( this->image );
-		mlt_pool_release( this->alpha );
-	}
+	pthread_mutex_destroy( &this->mutex );
 	parent->close = NULL;
+	mlt_service_cache_purge( MLT_PRODUCER_SERVICE(parent) );
 	mlt_producer_close( parent );
 	mlt_properties_close( this->filenames );
 	free( this );