[Mlt-devel] mlt/src/modules/qimage producer_qimage.c,1.1,1.2

[Dan D. <dde...@us...>]

Update of /cvsroot/mlt/mlt/src/modules/qimage
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv23519/src/modules/qimage

Modified Files:
	producer_qimage.c 
Log Message:
apply patch from Jean-Baptiste <jb...@ad...> to add rgb24a support to producer_qimage

Index: producer_qimage.c
===================================================================
RCS file: /cvsroot/mlt/mlt/src/modules/qimage/producer_qimage.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- producer_qimage.c	29 Mar 2006 08:59:07 -0000	1.1
+++ producer_qimage.c	24 May 2006 06:01:53 -0000	1.2
@@ -92,24 +92,44 @@
 	// The fault is not in the design of mlt, but in the implementation of the qimage 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;
+			// 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;
+		}
 	}
 	else
 	{