X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Ftransition_luma.c;h=c938f0cabf30988547dae8647c488ea24537ddba;hb=4a39b72c5ac8fd2dd6db81a95eab08adde0491b9;hp=15ed02213ae3d7c2ac03ba16ab178e0d22e6d1db;hpb=4bc1c05b81568697d4f7cb7b033c85be0ed95034;p=melted

diff --git a/src/modules/core/transition_luma.c b/src/modules/core/transition_luma.c
index 15ed022..c938f0c 100644
--- a/src/modules/core/transition_luma.c
+++ b/src/modules/core/transition_luma.c
@@ -19,45 +19,13 @@
  */
 
 #include "transition_luma.h"
-#include <framework/mlt_frame.h>
+#include <framework/mlt.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
 #include <string.h>
-
-/** Luma class.
-*/
-
-typedef struct 
-{
-	struct mlt_transition_s parent;
-	char *filename;
-	int width;
-	int height;
-	float *bitmap;
-}
-transition_luma;
-
-
-// forward declarations
-static void transition_close( mlt_transition parent );
-
-
-// image processing functions
-
-static inline float smoothstep( float edge1, float edge2, float a )
-{
-	if ( a < edge1 )
-		return 0.0;
-
-	if ( a >= edge2 )
-		return 1.0;
-
-	a = ( a - edge1 ) / ( edge2 - edge1 );
-
-	return ( a * a * ( 3 - 2 * a ) );
-}
+#include <math.h>
 
 /** Calculate the position for this frame.
 */
@@ -69,7 +37,8 @@ static float position_calculate( mlt_transition this, mlt_frame frame )
 	mlt_position out = mlt_transition_get_out( this );
 
 	// Get the position of the frame
-	mlt_position position = mlt_frame_get_position( frame );
+	char *name = mlt_properties_get( mlt_transition_properties( this ), "_unique_id" );
+	mlt_position position = mlt_properties_get_position( mlt_frame_properties( frame ), name );
 
 	// Now do the calcs
 	return ( float )( position - in ) / ( float )( out - in + 1 );
@@ -89,107 +58,58 @@ static float delta_calculate( mlt_transition this, mlt_frame frame )
 
 	// Now do the calcs
 	float x = ( float )( position - in ) / ( float )( out - in + 1 );
-	position++;
-	float y = ( float )( position - in ) / ( float )( out - in + 1 );
+	float y = ( float )( position + 1 - in ) / ( float )( out - in + 1 );
 
 	return ( y - x ) / 2.0;
 }
 
-static int frame_composite_yuv( mlt_frame this, mlt_frame that, int x, int y, float weight, int *width, int *height )
+static inline int dissolve_yuv( mlt_frame this, mlt_frame that, float weight, int width, int height )
 {
 	int ret = 0;
-	int width_src = *width, height_src = *height;
-	int width_dest = *width, height_dest = *height;
-	mlt_image_format format_src = mlt_image_yuv422, format_dest = mlt_image_yuv422;
+	int width_src = width, height_src = height;
+	mlt_image_format format = mlt_image_yuv422;
 	uint8_t *p_src, *p_dest;
-	int i, j;
-	int stride_src;
-	int stride_dest;
-	int x_src = 0, y_src = 0;
-
-	// optimization point - no work to do
-	if ( ( x < 0 && -x >= width_src ) || ( y < 0 && -y >= height_src ) )
-		return ret;
+	uint8_t *p;
+	uint8_t *limit;
 
-	format_src = mlt_image_yuv422;
-	format_dest = mlt_image_yuv422;
+	int32_t weigh = weight * ( 1 << 16 );
+	int32_t weigh_complement = ( 1 - weight ) * ( 1 << 16 );
 
-	mlt_frame_get_image( this, &p_dest, &format_dest, &width_dest, &height_dest, 1 /* writable */ );
-	mlt_frame_get_image( that, &p_src, &format_src, &width_src, &height_src, 0 /* writable */ );
+	if ( mlt_properties_get( &this->parent, "distort" ) )
+		mlt_properties_set( &that->parent, "distort", mlt_properties_get( &this->parent, "distort" ) );
+	mlt_properties_set_int( &that->parent, "consumer_deinterlace", mlt_properties_get_int( &this->parent, "consumer_deinterlace" ) );
+	mlt_frame_get_image( this, &p_dest, &format, &width, &height, 1 );
+	mlt_frame_get_image( that, &p_src, &format, &width_src, &height_src, 0 );
 
-	stride_src = width_src * 2;
-	stride_dest = width_dest * 2;
+	// Pick the lesser of two evils ;-)
+	width_src = width_src > width ? width : width_src;
+	height_src = height_src > height ? height : height_src;
 	
-	// crop overlay off the left edge of frame
-	if ( x < 0 )
-	{
-		x_src = -x;
-		width_src -= x_src;
-		x = 0;
-	}
-	
-	// crop overlay beyond right edge of frame
-	else if ( x + width_src > width_dest )
-		width_src = width_dest - x;
+	p = p_dest;
+	limit = p_dest + height_src * width_src * 2;
 
-	// crop overlay off the top edge of the frame
-	if ( y < 0 )
+	while ( p < limit )
 	{
-		y_src = -y;
-		height_src -= y_src;
+		*p_dest++ = ( *p_src++ * weigh + *p++ * weigh_complement ) >> 16;
+		*p_dest++ = ( *p_src++ * weigh + *p++ * weigh_complement ) >> 16;
 	}
-	// crop overlay below bottom edge of frame
-	else if ( y + height_src > height_dest )
-		height_src = height_dest - y;
-
-	// offset pointer into overlay buffer based on cropping
-	p_src += x_src * 2 + y_src * stride_src;
-
-	// offset pointer into frame buffer based upon positive, even coordinates only!
-	p_dest += ( x < 0 ? 0 : x ) * 2 + ( y < 0 ? 0 : y ) * stride_dest;
-
-	// Get the alpha channel of the overlay
-	uint8_t *p_alpha = mlt_frame_get_alpha_mask( that );
-
-	// offset pointer into alpha channel based upon cropping
-	if ( p_alpha )
-		p_alpha += x_src + y_src * stride_src / 2;
 
-	uint8_t *p = p_src;
-	uint8_t *q = p_dest;
-	uint8_t *o = p_dest;
-	uint8_t *z = p_alpha;
+	return ret;
+}
 
-	uint8_t Y;
-	uint8_t UV;
-	uint8_t a;
-	float value;
+// image processing functions
 
-	// now do the compositing only to cropped extents
-	for ( i = 0; i < height_src; i++ )
-	{
-		p = p_src;
-		q = p_dest;
-		o = p_dest;
-		z = p_alpha;
+static inline int32_t smoothstep( int32_t edge1, int32_t edge2, uint32_t a )
+{
+	if ( a < edge1 )
+		return 0;
 
-		for ( j = 0; j < width_src; j ++ )
-		{
-			Y = *p ++;
-			UV = *p ++;
-			a = ( z == NULL ) ? 255 : *z ++;
-			value = ( weight * ( float ) a / 255.0 );
-			*o ++ = (uint8_t)( Y * value + *q++ * ( 1 - value ) );
-			*o ++ = (uint8_t)( UV * value + *q++ * ( 1 - value ) );
-		}
+	if ( a >= edge2 )
+		return 0x10000;
 
-		p_src += stride_src;
-		p_dest += stride_dest;
-		if ( p_alpha )
-			p_alpha += stride_src / 2;
-	}
+	a = ( ( a - edge1 ) << 16 ) / ( edge2 - edge1 );
 
-	return ret;
+	return ( ( ( a * a ) >> 16 )  * ( ( 3 << 16 ) - ( 2 * a ) ) ) >> 16;
 }
 
 /** powerful stuff
@@ -197,7 +117,7 @@ static int frame_composite_yuv( mlt_frame this, mlt_frame that, int x, int y, fl
     \param field_order -1 = progressive, 0 = lower field first, 1 = top field first
 */
 static void luma_composite( mlt_frame a_frame, mlt_frame b_frame, int luma_width, int luma_height,
-							float *luma_bitmap, float pos, float frame_delta, float softness, int field_order,
+							uint16_t *luma_bitmap, float pos, float frame_delta, float softness, int field_order,
 							int *width, int *height )
 {
 	int width_src = *width, height_src = *height;
@@ -207,146 +127,125 @@ static void luma_composite( mlt_frame a_frame, mlt_frame b_frame, int luma_width
 	int i, j;
 	int stride_src;
 	int stride_dest;
-	float weight = 0;
-	int field;
+	uint16_t weight = 0;
 
 	format_src = mlt_image_yuv422;
 	format_dest = mlt_image_yuv422;
 
-	mlt_frame_get_image( a_frame, &p_dest, &format_dest, &width_dest, &height_dest, 1 /* writable */ );
-	mlt_frame_get_image( b_frame, &p_src, &format_src, &width_src, &height_src, 0 /* writable */ );
+	if ( mlt_properties_get( &a_frame->parent, "distort" ) )
+		mlt_properties_set( &b_frame->parent, "distort", mlt_properties_get( &a_frame->parent, "distort" ) );
+	mlt_properties_set_int( &b_frame->parent, "consumer_deinterlace", mlt_properties_get_int( &a_frame->parent, "consumer_deinterlace" ) );
+	mlt_frame_get_image( a_frame, &p_dest, &format_dest, &width_dest, &height_dest, 1 );
+	mlt_frame_get_image( b_frame, &p_src, &format_src, &width_src, &height_src, 0 );
 
+	// Pick the lesser of two evils ;-)
+	width_src = width_src > width_dest ? width_dest : width_src;
+	height_src = height_src > height_dest ? height_dest : height_src;
+	
 	stride_src = width_src * 2;
 	stride_dest = width_dest * 2;
 
 	// Offset the position based on which field we're looking at ...
-	float field_pos[ 2 ];
-	field_pos[ 0 ] = pos + ( ( field_order == 0 ? 1 : 0 ) * frame_delta * 0.5 );
-	field_pos[ 1 ] = pos + ( ( field_order == 0 ? 0 : 1 ) * frame_delta * 0.5 );
+	int32_t field_pos[ 2 ];
+	field_pos[ 0 ] = ( pos + ( ( field_order == 0 ? 1 : 0 ) * frame_delta * 0.5 ) ) * ( 1 << 16 ) * ( 1.0 + softness );
+	field_pos[ 1 ] = ( pos + ( ( field_order == 0 ? 0 : 1 ) * frame_delta * 0.5 ) ) * ( 1 << 16 ) * ( 1.0 + softness );
 
-	// adjust the position for the softness level
-	field_pos[ 0 ] *= ( 1.0 + softness );
-	field_pos[ 1 ] *= ( 1.0 + softness );
+	register uint8_t *p;
+	register uint8_t *q;
+	register uint8_t *o;
+	uint16_t  *l;
 
-	uint8_t *p;
-	uint8_t *q;
-	uint8_t *o;
-	float  *l;
+	uint32_t value;
+
+	int32_t x_diff = ( luma_width << 16 ) / *width;
+	int32_t y_diff = ( luma_height << 16 ) / *height;
+	int32_t x_offset = 0;
+	int32_t y_offset = 0;
+	uint8_t *p_row;
+	uint8_t *q_row;
 
-	uint8_t y;
-	uint8_t uv;
-   	float value;
+	int32_t i_softness = softness * ( 1 << 16 );
 
-	float x_diff = ( float )luma_width / ( float )*width;
-	float y_diff = ( float )luma_height / ( float )*height;
+	int field_count = field_order < 0 ? 1 : 2;
+	int field_stride_src = field_count * stride_src;
+	int field_stride_dest = field_count * stride_dest;
+	int field = 0;
 
 	// composite using luma map
-	for ( field = 0; field < ( field_order < 0 ? 1 : 2 ); ++field )
+	while ( field < field_count )
 	{
-		for ( i = field; i < height_src; i += ( field_order < 0 ? 1 : 2 ) )
-		{
-			p = &p_src[ i * stride_src ];
-			q = &p_dest[ i * stride_dest ];
-			o = &p_dest[ i * stride_dest ];
-			l = &luma_bitmap[ ( int )( ( float )i * y_diff ) * luma_width ];
+		p_row = p_src + field * stride_src;
+		q_row = p_dest + field * stride_dest;
+		y_offset = field << 16;
+		i = field;
 
-			for ( j = 0; j < width_src; j ++ )
+		while ( i < height_src )
+		{
+			p = p_row;
+			q = q_row;
+			o = q;
+			l = luma_bitmap + ( y_offset >> 16 ) * ( luma_width * field_count );
+			x_offset = 0;
+			j = width_src;
+
+			while( j -- )
 			{
-				y = *p ++;
-				uv = *p ++;
-             	weight = l[ ( int )( ( float )j * x_diff ) ];
-   				value = smoothstep( weight, weight + softness, field_pos[ field ] );
-
-				*o ++ = (uint8_t)( y * value + *q++ * ( 1 - value ) );
-				*o ++ = (uint8_t)( uv * value + *q++ * ( 1 - value ) );
+             	weight = l[ x_offset >> 16 ];
+   				value = smoothstep( weight, i_softness + weight, field_pos[ field ] );
+				*o ++ = ( *p ++ * value + *q++ * ( ( 1 << 16 ) - value ) ) >> 16;
+				*o ++ = ( *p ++ * value + *q++ * ( ( 1 << 16 ) - value ) ) >> 16;
+				x_offset += x_diff;
 			}
-		}
-	}
-}
-
-/** Get the image.
-*/
-
-static int transition_get_image( mlt_frame this, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable )
-{
-	// Get the properties of the a frame
-	mlt_properties a_props = mlt_frame_properties( this );
-
-	// Get the b frame from the stack
-	mlt_frame b_frame = mlt_frame_pop_frame( this );
-
-	// Get the properties of the b frame
-	mlt_properties b_props = mlt_frame_properties( b_frame );
-
-	// Arbitrary composite defaults
-	float mix = mlt_properties_get_double( b_props, "image.mix" );
-	float frame_delta = mlt_properties_get_double( b_props, "luma.delta" );
-	int luma_width = mlt_properties_get_int( b_props, "luma.width" );
-	int luma_height = mlt_properties_get_int( b_props, "luma.height" );
-	float *luma_bitmap = mlt_properties_get_data( b_props, "luma.bitmap", NULL );
-	float luma_softness = mlt_properties_get_double( b_props, "luma.softness" );
-	int progressive = mlt_properties_get_int( b_props, "progressive" ) ||
-			mlt_properties_get_int( a_props, "consumer_progressive" ) ||
-			mlt_properties_get_int( b_props, "luma.progressive" );
-
-	int top_field_first =  mlt_properties_get_int( b_props, "top_field_first" );
-	int reverse = mlt_properties_get_int( b_props, "luma.reverse" );
-
-	// Since we are the consumer of the b_frame, we must pass along this
-	// consumer property from the a_frame
-	mlt_properties_set_double( b_props, "consumer_aspect_ratio", mlt_properties_get_double( a_props, "consumer_aspect_ratio" ) );
-	mlt_properties_set_double( b_props, "consumer_scale", mlt_properties_get_double( a_props, "consumer_scale" ) );
-		
-	// Honour the reverse here
-	mix = reverse ? 1 - mix : mix;
-	frame_delta *= reverse ? -1.0 : 1.0;
 
-	// Ensure we get scaling on the b_frame
-	mlt_properties_set( b_props, "rescale.interp", "nearest" );
-
-	if ( luma_width > 0 && luma_height > 0 && luma_bitmap != NULL )
-		// Composite the frames using a luma map
-		luma_composite( this, b_frame, luma_width, luma_height, luma_bitmap, mix, frame_delta,
-			luma_softness, progressive ? -1 : top_field_first, width, height );
-	else
-		// Dissolve the frames using the time offset for mix value
-		frame_composite_yuv( this, b_frame, 0, 0, mix, width, height );
-
-	// Extract the a_frame image info
-	*width = mlt_properties_get_int( a_props, "width" );
-	*height = mlt_properties_get_int( a_props, "height" );
-	*image = mlt_properties_get_data( a_props, "image", NULL );
+			y_offset += y_diff;
+			i += field_count;
+			p_row += field_stride_src;
+			q_row += field_stride_dest;
+		}
 
-	return 0;
+		field ++;
+	}
 }
 
 /** Load the luma map from PGM stream.
 */
 
-static void luma_read_pgm( FILE *f, float **map, int *width, int *height )
+static void luma_read_pgm( FILE *f, uint16_t **map, int *width, int *height )
 {
 	uint8_t *data = NULL;
 	while (1)
 	{
 		char line[128];
+		char comment[128];
 		int i = 2;
 		int maxval;
 		int bpp;
-		float *p;
-		
+		uint16_t *p;
+
 		line[127] = '\0';
 
 		// get the magic code
 		if ( fgets( line, 127, f ) == NULL )
 			break;
+
+		// skip comments
+		while ( sscanf( line, " #%s", comment ) > 0 )
+			if ( fgets( line, 127, f ) == NULL )
+				break;
+
 		if ( line[0] != 'P' || line[1] != '5' )
 			break;
 
 		// skip white space and see if a new line must be fetched
 		for ( i = 2; i < 127 && line[i] != '\0' && isspace( line[i] ); i++ );
-		if ( line[i] == '\0' && fgets( line, 127, f ) == NULL )
+		if ( ( line[i] == '\0' || line[i] == '#' ) && fgets( line, 127, f ) == NULL )
 			break;
 
+		// skip comments
+		while ( sscanf( line, " #%s", comment ) > 0 )
+			if ( fgets( line, 127, f ) == NULL )
+				break;
+
 		// get the dimensions
 		if ( line[0] == 'P' )
 			i = sscanf( line, "P5 %d %d %d", width, height, &maxval );
@@ -358,6 +257,12 @@ static void luma_read_pgm( FILE *f, float **map, int *width, int *height )
 		{
 			if ( fgets( line, 127, f ) == NULL )
 				break;
+
+			// skip comments
+			while ( sscanf( line, " #%s", comment ) > 0 )
+				if ( fgets( line, 127, f ) == NULL )
+					break;
+
 			i = sscanf( line, "%d", height );
 			if ( i == 0 )
 				break;
@@ -370,6 +275,12 @@ static void luma_read_pgm( FILE *f, float **map, int *width, int *height )
 		{
 			if ( fgets( line, 127, f ) == NULL )
 				break;
+
+			// skip comments
+			while ( sscanf( line, " #%s", comment ) > 0 )
+				if ( fgets( line, 127, f ) == NULL )
+					break;
+
 			i = sscanf( line, "%d", &maxval );
 			if ( i == 0 )
 				break;
@@ -377,20 +288,18 @@ static void luma_read_pgm( FILE *f, float **map, int *width, int *height )
 
 		// determine if this is one or two bytes per pixel
 		bpp = maxval > 255 ? 2 : 1;
-		
+
 		// allocate temporary storage for the raw data
-		// IRRIGATE ME
-		data = malloc( *width * *height * bpp );
+		data = mlt_pool_alloc( *width * *height * bpp );
 		if ( data == NULL )
 			break;
 
 		// read the raw data
 		if ( fread( data, *width * *height * bpp, 1, f ) != 1 )
 			break;
-		
+
 		// allocate the luma bitmap
-		// IRRIGATE ME
-		*map =  p = (float*) malloc( *width * *height * sizeof( float ) );
+		*map = p = (uint16_t*)mlt_pool_alloc( *width * *height * sizeof( uint16_t ) );
 		if ( *map == NULL )
 			break;
 
@@ -398,61 +307,217 @@ static void luma_read_pgm( FILE *f, float **map, int *width, int *height )
 		for ( i = 0; i < *width * *height * bpp; i += bpp )
 		{
 			if ( bpp == 1 )
-				*p++ = (float) data[ i ] / (float) maxval;
+				*p++ = data[ i ] << 8;
 			else
-				*p++ = (float) ( ( data[ i ] << 8 ) + data[ i+1 ] ) / (float) maxval;
+				*p++ = ( data[ i ] << 8 ) + data[ i+1 ];
 		}
 
 		break;
 	}
-		
+
 	if ( data != NULL )
-		free( data );
+		mlt_pool_release( data );
 }
 
+/** Generate a luma map from an RGB image.
+*/
 
-/** Luma transition processing.
+static void luma_read_yuv422( uint8_t *image, uint16_t **map, int width, int height )
+{
+	int i;
+	
+	// allocate the luma bitmap
+	uint16_t *p = *map = ( uint16_t* )mlt_pool_alloc( width * height * sizeof( uint16_t ) );
+	if ( *map == NULL )
+		return;
+
+	// proces the image data into the luma bitmap
+	for ( i = 0; i < width * height * 2; i += 2 )
+		*p++ = ( image[ i ] - 16 ) * 299; // 299 = 65535 / 219
+}
+
+/** Generate a luma map from a YUV image.
 */
+static void luma_read_rgb24( uint8_t *image, uint16_t **map, int width, int height )
+{
+}
 
-static mlt_frame transition_process( mlt_transition transition, mlt_frame a_frame, mlt_frame b_frame )
+/** Get the image.
+*/
+
+static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable )
 {
-	transition_luma *this = (transition_luma*) transition->child;
+	// Get the b frame from the stack
+	mlt_frame b_frame = mlt_frame_pop_frame( a_frame );
+
+	// Get the transition object
+	mlt_transition transition = mlt_frame_pop_service( a_frame );
 
 	// Get the properties of the transition
 	mlt_properties properties = mlt_transition_properties( transition );
-	
+
+	// Get the properties of the a frame
+	mlt_properties a_props = mlt_frame_properties( a_frame );
+
 	// Get the properties of the b frame
 	mlt_properties b_props = mlt_frame_properties( b_frame );
 
+	// The cached luma map information
+	int luma_width = mlt_properties_get_int( properties, "width" );
+	int luma_height = mlt_properties_get_int( properties, "height" );
+	uint16_t *luma_bitmap = mlt_properties_get_data( properties, "bitmap", NULL );
+	
 	// If the filename property changed, reload the map
-	char *luma_file = mlt_properties_get( properties, "resource" );
-	if ( luma_file != NULL && ( this->filename == NULL || ( this->filename && strcmp( luma_file, this->filename ) ) ) )
+	char *resource = mlt_properties_get( properties, "resource" );
+
+	if ( luma_bitmap == NULL && resource != NULL )
 	{
-		FILE *pipe;
-		
-		free( this->filename );
-		this->filename = strdup( luma_file );
-		pipe = fopen( luma_file, "r" );
-		if ( pipe != NULL )
+		char *extension = extension = strrchr( resource, '.' );
+
+		// See if it is a PGM
+		if ( extension != NULL && strcmp( extension, ".pgm" ) == 0 )
 		{
-			free( this->bitmap );
-			luma_read_pgm( pipe, &this->bitmap, &this->width, &this->height );
-			fclose( pipe );
+			// Open PGM
+			FILE *f = fopen( resource, "r" );
+			if ( f != NULL )
+			{
+				// Load from PGM
+				luma_read_pgm( f, &luma_bitmap, &luma_width, &luma_height );
+				fclose( f );
+
+				// Set the transition properties
+				mlt_properties_set_int( properties, "width", luma_width );
+				mlt_properties_set_int( properties, "height", luma_height );
+				mlt_properties_set_data( properties, "bitmap", luma_bitmap, luma_width * luma_height * 2, mlt_pool_release, NULL );
+			}
+		}
+		else
+		{
+			// Get the factory producer service
+			char *factory = mlt_properties_get( properties, "factory" );
+
+			// Create the producer
+			mlt_producer producer = mlt_factory_producer( factory, resource );
+
+			// If we have one
+			if ( producer != NULL )
+			{
+				// Get the producer properties
+				mlt_properties producer_properties = mlt_producer_properties( producer );
+
+				// Ensure that we loop
+				mlt_properties_set( producer_properties, "eof", "loop" );
+
+				// Now pass all producer. properties on the transition down
+				mlt_properties_pass( producer_properties, properties, "producer." );
+
+				// We will get the alpha frame from the producer
+				mlt_frame luma_frame = NULL;
+
+				// Get the luma frame
+				if ( mlt_service_get_frame( mlt_producer_service( producer ), &luma_frame, 0 ) == 0 )
+				{
+					uint8_t *luma_image;
+					mlt_image_format luma_format = mlt_image_yuv422;
+
+					// Get image from the luma producer
+					mlt_properties_set( mlt_frame_properties( luma_frame ), "rescale.interp", "none" );
+					mlt_frame_get_image( luma_frame, &luma_image, &luma_format, &luma_width, &luma_height, 0 );
+
+					// Generate the luma map
+					if ( luma_image != NULL && luma_format == mlt_image_yuv422 )
+						luma_read_yuv422( luma_image, &luma_bitmap, luma_width, luma_height );
+						
+					else if ( luma_image != NULL && luma_format == mlt_image_rgb24 )
+						luma_read_rgb24( luma_image, &luma_bitmap, luma_width, luma_height );
+					
+					// Set the transition properties
+					mlt_properties_set_int( properties, "width", luma_width );
+					mlt_properties_set_int( properties, "height", luma_height );
+					mlt_properties_set_data( properties, "bitmap", luma_bitmap, luma_width * luma_height * 2, mlt_pool_release, NULL );
+
+					// Cleanup the luma frame
+					mlt_frame_close( luma_frame );
+				}
+
+				// Cleanup the luma producer
+				mlt_producer_close( producer );
+			}
 		}
 	}
 
-	// Set the b frame properties
-	mlt_properties_set_double( b_props, "image.mix", position_calculate( transition, b_frame ) );
-	mlt_properties_set_double( b_props, "luma.delta", delta_calculate( transition, b_frame ) );
-	mlt_properties_set_int( b_props, "luma.width", this->width );
-	mlt_properties_set_int( b_props, "luma.height", this->height );
-	mlt_properties_set_data( b_props, "luma.bitmap", this->bitmap, 0, NULL, NULL );
-	mlt_properties_set_int( b_props, "luma.reverse", mlt_properties_get_int( properties, "reverse" ) );
-	mlt_properties_set_double( b_props, "luma.softness", mlt_properties_get_double( properties, "softness" ) );
+	// Arbitrary composite defaults
+	float mix = position_calculate( transition, a_frame );
+	float frame_delta = delta_calculate( transition, a_frame );
+	
+	float luma_softness = mlt_properties_get_double( properties, "softness" );
+	int progressive = 
+			mlt_properties_get_int( a_props, "consumer_deinterlace" ) ||
+			mlt_properties_get_int( properties, "progressive" ) ||
+			mlt_properties_get_int( b_props, "luma.progressive" );
+	int top_field_first =  mlt_properties_get_int( b_props, "top_field_first" );
+	int reverse = mlt_properties_get_int( properties, "reverse" );
+
+	if ( mlt_properties_get( a_props, "rescale.interp" ) == NULL )
+		mlt_properties_set( a_props, "rescale.interp", "nearest" );
 
-	mlt_frame_push_get_image( a_frame, transition_get_image );
+	// Since we are the consumer of the b_frame, we must pass along this
+	// consumer property from the a_frame
+	if ( !strcmp( mlt_properties_get( a_props, "rescale.interp" ), "none" ) )
+		mlt_properties_set_double( b_props, "consumer_aspect_ratio", mlt_properties_get_double( a_props, "aspect_ratio" ) );
+	else
+		mlt_properties_set_double( b_props, "consumer_aspect_ratio", mlt_properties_get_double( a_props, "consumer_aspect_ratio" ) );
+
+	// Honour the reverse here
+	if ( mix >= 1.0 )
+		mix -= floor( mix );
+
+	mix = reverse ? 1 - mix : mix;
+	frame_delta *= reverse ? -1.0 : 1.0;
+
+	// Ensure we get scaling on the b_frame
+	mlt_properties_set( b_props, "rescale.interp", "nearest" );
+
+	if ( mlt_properties_get( properties, "fixed" ) )
+		mix = mlt_properties_get_double( properties, "fixed" );
+
+	if ( luma_width > 0 && luma_height > 0 && luma_bitmap != NULL )
+		// Composite the frames using a luma map
+		luma_composite( a_frame, b_frame, luma_width, luma_height, luma_bitmap, mix, frame_delta,
+			luma_softness, progressive ? -1 : top_field_first, width, height );
+	else
+		// Dissolve the frames using the time offset for mix value
+		dissolve_yuv( a_frame, b_frame, mix, *width, *height );
+
+	// Extract the a_frame image info
+	*width = mlt_properties_get_int( a_props, "width" );
+	*height = mlt_properties_get_int( a_props, "height" );
+	*image = mlt_properties_get_data( a_props, "image", NULL );
+
+	return 0;
+}
+
+
+/** Luma transition processing.
+*/
+
+static mlt_frame transition_process( mlt_transition transition, mlt_frame a_frame, mlt_frame b_frame )
+{
+	// Get a unique name to store the frame position
+	char *name = mlt_properties_get( mlt_transition_properties( transition ), "_unique_id" );
+
+	// Assign the current position to the name
+	mlt_properties_set_position( mlt_frame_properties( a_frame ), name, mlt_frame_get_position( a_frame ) );
+
+	// Push the transition on to the frame
+	mlt_frame_push_service( a_frame, transition );
+
+	// Push the b_frame on to the stack
 	mlt_frame_push_frame( a_frame, b_frame );
 
+	// Push the transition method
+	mlt_frame_push_get_image( a_frame, transition_get_image );
+	
 	return a_frame;
 }
 
@@ -461,27 +526,19 @@ static mlt_frame transition_process( mlt_transition transition, mlt_frame a_fram
 
 mlt_transition transition_luma_init( char *lumafile )
 {
-	transition_luma *this = calloc( sizeof( transition_luma ), 1 );
-	if ( this != NULL )
+	mlt_transition transition = mlt_transition_new( );
+	if ( transition != NULL )
 	{
-		mlt_transition transition = &this->parent;
-		mlt_transition_init( transition, this );
+		// Set the methods
 		transition->process = transition_process;
-		transition->close = transition_close;
+		
+		// Default factory
+		mlt_properties_set( mlt_transition_properties( transition ), "factory", "fezzik" );
+
+		// Set the main property
 		mlt_properties_set( mlt_transition_properties( transition ), "resource", lumafile );
-		return &this->parent;
+		
+		return transition;
 	}
 	return NULL;
 }
-
-/** Close the transition.
-*/
-
-static void transition_close( mlt_transition parent )
-{
-	transition_luma *this = (transition_luma*) parent->child;
-	free( this->bitmap );
-	free( this->filename );
-	free( this );
-}
-