X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fgtk2%2Fproducer_pixbuf.c;h=c02a7ead8cba35223cd9d061545d2b6c61ccaddf;hb=0e9101ed4529daaedf0388c91ff7b6b9462c3ee1;hp=c79b28d92ca0a6457a4df56095743cea054d4b1e;hpb=bf3264b9e340ba5c11cbf59835a8af3db94e0cc2;p=melted

diff --git a/src/modules/gtk2/producer_pixbuf.c b/src/modules/gtk2/producer_pixbuf.c
index c79b28d..c02a7ea 100644
--- a/src/modules/gtk2/producer_pixbuf.c
+++ b/src/modules/gtk2/producer_pixbuf.c
@@ -18,7 +18,7 @@
  * 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 <gdk-pixbuf/gdk-pixbuf.h>
 
@@ -254,7 +254,7 @@ static void refresh_image( mlt_frame frame, int width, int height )
 
 	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 );
@@ -298,24 +298,45 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
 	// The fault is not in the design of mlt, but in the implementation of the pixbuf producer...
 	if ( *buffer != NULL )
 	{
-		// Clone the image and the alpha
-		uint8_t *image_copy = mlt_pool_alloc( image_size );
-		uint8_t *alpha_copy = mlt_pool_alloc( alpha_size );
+		if ( *format == mlt_image_yuv422 || *format == mlt_image_yuv420p )
+		{
+			// Clone the image and the alpha
+			uint8_t *image_copy = mlt_pool_alloc( image_size );
+			uint8_t *alpha_copy = mlt_pool_alloc( alpha_size );
 
-		memcpy( image_copy, *buffer, image_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 );
+			// Copy or default the alpha
+			if ( alpha != NULL )
+				memcpy( alpha_copy, alpha, alpha_size );
+			else
+				memset( alpha_copy, 255, alpha_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 );
 
-		// 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;
+		}
+		else if ( *format == mlt_image_rgb24a )
+		{
+			// Clone the image and the alpha
+			image_size = *width * ( *height + 1 ) * 4;
+			alpha_size = *width * ( *height + 1 );
+			uint8_t *image_copy = mlt_pool_alloc( image_size );
+			uint8_t *alpha_copy = mlt_pool_alloc( alpha_size );
+
+			mlt_convert_yuv422_to_rgb24a(*buffer, image_copy, (*width)*(*height));
+
+			// 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;
+		}
 
-		// We're going to pass the copy on
-		*buffer = image_copy;
 	}
 	else
 	{
@@ -396,7 +417,7 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i
 				if ( stat( full, &buf ) == 0 )
 				{
 					sprintf( key, "%d", keyvalue ++ );
-					mlt_properties_set( this->filenames, "0", full );
+					mlt_properties_set( this->filenames, key, full );
 					gap = 0;
 				}
 				else
@@ -427,7 +448,7 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i
 	}
 
 	// Generate a frame
-	*frame = mlt_frame_init( );
+	*frame = mlt_frame_init( MLT_PRODUCER_SERVICE( producer ) );
 
 	if ( *frame != NULL && this->count > 0 )
 	{