X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Ftransition_composite.c;h=21909e8e026a7d945c930d699dc4e29114dd2308;hb=e6c03148e1dc3b0e363c9f304b3ed93fbc1a91a9;hp=6cc1055b85b297f558b52a5dc9310cdff7a9e161;hpb=24fd9b1360d877a8db8b3ef472c7651ec2cf71a2;p=melted

diff --git a/src/modules/core/transition_composite.c b/src/modules/core/transition_composite.c
index 6cc1055..21909e8 100644
--- a/src/modules/core/transition_composite.c
+++ b/src/modules/core/transition_composite.c
@@ -27,13 +27,7 @@
 #include <string.h>
 #include <math.h>
 
-typedef void ( *composite_line_fn )( uint8_t *dest, uint8_t *src, int width_src, uint8_t *alpha, int weight, uint16_t *luma, int softness );
-
-/* mmx function declarations */
-#ifdef USE_MMX
-	void composite_line_yuv_mmx( uint8_t *dest, uint8_t *src, int width_src, uint8_t *alpha, int weight, uint16_t *luma, int softness );
-	int composite_have_mmx( void );
-#endif
+typedef void ( *composite_line_fn )( uint8_t *dest, uint8_t *src, int width_src, uint8_t *alpha_b, uint8_t *alpha_a, int weight, uint16_t *luma, int softness );
 
 /** Geometry struct.
 */
@@ -70,18 +64,20 @@ static int alignment_parse( char* align )
 /** Calculate real geometry.
 */
 
-static void geometry_calculate( mlt_transition this, struct geometry_s *output, float position )
+static void geometry_calculate( mlt_transition this, struct geometry_s *output, double position )
 {
 	mlt_properties properties = MLT_TRANSITION_PROPERTIES( this );
 	mlt_geometry geometry = mlt_properties_get_data( properties, "geometries", NULL );
+	int mirror_off = mlt_properties_get_int( properties, "mirror_off" );
+	int repeat_off = mlt_properties_get_int( properties, "repeat_off" );
 	int length = mlt_geometry_get_length( geometry );
 
 	// Allow wrapping
-	if ( position >= length && length != 0 )
+	if ( !repeat_off && position >= length && length != 0 )
 	{
 		int section = position / length;
 		position -= section * length;
-		if ( section % 2 == 1 )
+		if ( !mirror_off && section % 2 == 1 )
 			position = length - position;
 	}
 
@@ -103,12 +99,20 @@ static mlt_geometry transition_parse_keys( mlt_transition this, int normalised_w
 	// Get the in and out position
 	mlt_position in = mlt_transition_get_in( this );
 	mlt_position out = mlt_transition_get_out( this );
+	int length = out - in + 1;
+	double cycle = mlt_properties_get_double( properties, "cycle" );
 
 	// Get the new style geometry string
 	char *property = mlt_properties_get( properties, "geometry" );
 
+	// Allow a geometry repeat cycle
+	if ( cycle >= 1 )
+		length = cycle;
+	else if ( cycle > 0 )
+		length *= cycle;
+
 	// Parse the geometry if we have one
-	mlt_geometry_parse( geometry, property, out - in + 1, normalised_width, normalised_height );
+	mlt_geometry_parse( geometry, property, length, normalised_width, normalised_height );
 
 	// Check if we're using the old style geometry
 	if ( property == NULL )
@@ -181,20 +185,16 @@ static int position_calculate( mlt_transition this, mlt_position position )
 /** Calculate the field delta for this frame - position between two frames.
 */
 
-static inline float delta_calculate( mlt_transition this, mlt_frame frame )
+static inline double delta_calculate( mlt_transition this, mlt_frame frame, mlt_position position )
 {
 	// Get the in and out position
 	mlt_position in = mlt_transition_get_in( this );
 	mlt_position out = mlt_transition_get_out( this );
-	float length = out - in + 1;
-
-	// Get the position of the frame
-	char *name = mlt_properties_get( MLT_TRANSITION_PROPERTIES( this ), "_unique_id" );
-	mlt_position position = mlt_properties_get_position( MLT_FRAME_PROPERTIES( frame ), name );
+	double length = out - in + 1;
 
 	// Now do the calcs
-	float x = ( float )( position - in ) / length;
-	float y = ( float )( position + 1 - in ) / length;
+	double x = ( double )( position - in ) / length;
+	double y = ( double )( position + 1 - in ) / length;
 
 	return length * ( y - x ) / 2.0;
 }
@@ -370,28 +370,90 @@ static void luma_read_yuv422( uint8_t *image, uint16_t **map, int width, int hei
 /** Composite a source line over a destination line
 */
 
-static inline
-void composite_line_yuv( uint8_t *dest, uint8_t *src, int width_src, uint8_t *alpha, int weight, uint16_t *luma, int softness )
+static void composite_line_yuv( uint8_t *dest, uint8_t *src, int width, uint8_t *alpha_b, uint8_t *alpha_a,  int weight, uint16_t *luma, int softness )
+{
+	register int j;
+	register int a;
+	register int mix;
+	
+	for ( j = 0; j < width; j ++ )
+	{
+		a = *alpha_b ++;
+		mix = ( luma == NULL ) ? weight : smoothstep( luma[ j ], luma[ j ] + softness, weight + softness );
+		mix = ( mix * a ) >> 8;
+		*dest = ( *src++ * mix + *dest * ( ( 1 << 16 ) - mix ) ) >> 16;
+		dest++;
+		*dest = ( *src++ * mix + *dest * ( ( 1 << 16 ) - mix ) ) >> 16;
+		dest++;
+		*alpha_a = mix | *alpha_a;
+		alpha_a ++;
+	}
+}
+
+static void composite_line_yuv_or( uint8_t *dest, uint8_t *src, int width, uint8_t *alpha_b, uint8_t *alpha_a,  int weight, uint16_t *luma, int softness )
+{
+	register int j;
+	register int a;
+	register int mix;
+	
+	for ( j = 0; j < width; j ++ )
+	{
+		a = *alpha_b ++ | *alpha_a;
+		mix = ( luma == NULL ) ? weight : smoothstep( luma[ j ], luma[ j ] + softness, weight + softness );
+		mix = ( mix * a ) >> 8;
+		*dest = ( *src++ * mix + *dest * ( ( 1 << 16 ) - mix ) ) >> 16;
+		dest++;
+		*dest = ( *src++ * mix + *dest * ( ( 1 << 16 ) - mix ) ) >> 16;
+		dest++;
+		*alpha_a = mix | *alpha_a;
+		alpha_a ++;
+	}
+}
+
+static void composite_line_yuv_and( uint8_t *dest, uint8_t *src, int width, uint8_t *alpha_b, uint8_t *alpha_a,  int weight, uint16_t *luma, int softness )
+{
+	register int j;
+	register int a;
+	register int mix;
+	
+	for ( j = 0; j < width; j ++ )
+	{
+		a = *alpha_b ++ & *alpha_a;
+		mix = ( luma == NULL ) ? weight : smoothstep( luma[ j ], luma[ j ] + softness, weight + softness );
+		mix = ( mix * a ) >> 8;
+		*dest = ( *src++ * mix + *dest * ( ( 1 << 16 ) - mix ) ) >> 16;
+		dest++;
+		*dest = ( *src++ * mix + *dest * ( ( 1 << 16 ) - mix ) ) >> 16;
+		dest++;
+		*alpha_a = mix | *alpha_a;
+		alpha_a ++;
+	}
+}
+
+static void composite_line_yuv_xor( uint8_t *dest, uint8_t *src, int width, uint8_t *alpha_b, uint8_t *alpha_a,  int weight, uint16_t *luma, int softness )
 {
 	register int j;
-	int a, mix;
+	register int a;
+	register int mix;
 	
-	for ( j = 0; j < width_src; j ++ )
+	for ( j = 0; j < width; j ++ )
 	{
-		a = ( alpha == NULL ) ? 255 : *alpha ++;
-		mix = ( luma == NULL ) ? weight : linearstep( luma[ j ], luma[ j ] + softness, weight );
-		mix = ( mix * ( a + 1 ) ) >> 8;
+		a = *alpha_b ++ ^ *alpha_a;
+		mix = ( luma == NULL ) ? weight : smoothstep( luma[ j ], luma[ j ] + softness, weight + softness );
+		mix = ( mix * a ) >> 8;
 		*dest = ( *src++ * mix + *dest * ( ( 1 << 16 ) - mix ) ) >> 16;
 		dest++;
 		*dest = ( *src++ * mix + *dest * ( ( 1 << 16 ) - mix ) ) >> 16;
 		dest++;
+		*alpha_a = mix | *alpha_a;
+		alpha_a ++;
 	}
 }
 
 /** Composite function.
 */
 
-static int composite_yuv( uint8_t *p_dest, int width_dest, int height_dest, uint8_t *p_src, int width_src, int height_src, uint8_t *p_alpha, struct geometry_s geometry, int field, uint16_t *p_luma, int32_t softness, composite_line_fn line_fn )
+static int composite_yuv( uint8_t *p_dest, int width_dest, int height_dest, uint8_t *p_src, int width_src, int height_src, uint8_t *alpha_b, uint8_t *alpha_a, struct geometry_s geometry, int field, uint16_t *p_luma, int32_t softness, composite_line_fn line_fn )
 {
 	int ret = 0;
 	int i;
@@ -445,8 +507,8 @@ static int composite_yuv( uint8_t *p_dest, int width_dest, int height_dest, uint
 	p_dest += ( x < 0 ? 0 : x ) * bpp + ( y < 0 ? 0 : y ) * stride_dest;
 
 	// offset pointer into alpha channel based upon cropping
-	if ( p_alpha )
-		p_alpha += x_src + y_src * stride_src / bpp;
+	alpha_b += x_src + y_src * stride_src / bpp;
+	alpha_a += x + y * stride_dest / bpp;
 
 	// offset pointer into luma channel based upon cropping
 	if ( p_luma )
@@ -458,7 +520,6 @@ static int composite_yuv( uint8_t *p_dest, int width_dest, int height_dest, uint
 	// field 1 = upper field and y should be even.
 	if ( ( field > -1 ) && ( y % 2 == field ) )
 	{
-		//fprintf( stderr, "field %d y %d\n", field, y );
 		if ( ( field == 1 && y < height_dest - 1 ) || ( field == 0 && y == 0 ) )
 			p_dest += stride_dest;
 		else
@@ -469,50 +530,35 @@ static int composite_yuv( uint8_t *p_dest, int width_dest, int height_dest, uint
 	if ( field == 1 )
 	{
 		p_src += stride_src;
-		if ( p_alpha )
-			p_alpha += stride_src / bpp;
+		alpha_b += stride_src / bpp;
+		alpha_a += stride_dest / bpp;
 		height_src--;
 	}
 
 	stride_src *= step;
 	stride_dest *= step;
-	int alpha_stride = stride_src / bpp;
+	int alpha_b_stride = stride_src / bpp;
+	int alpha_a_stride = stride_dest / bpp;
 
 	// Make sure than x and w are even
 	if ( x_uneven )
 	{
 		p_src += 2;
 		width_src --;
+		alpha_a ++;
 	}
 
 	// now do the compositing only to cropped extents
-	if ( line_fn != NULL )
-	{
-		for ( i = 0; i < height_src; i += step )
-		{
-			line_fn( p_dest, p_src, width_src, p_alpha, weight, p_luma, softness );
-	
-			p_src += stride_src;
-			p_dest += stride_dest;
-			if ( p_alpha )
-				p_alpha += alpha_stride;
-			if ( p_luma )
-				p_luma += alpha_stride;
-		}
-	}
-	else
+	for ( i = 0; i < height_src; i += step )
 	{
-		for ( i = 0; i < height_src; i += step )
-		{
-			composite_line_yuv( p_dest, p_src, width_src, p_alpha, weight, p_luma, softness );
-	
-			p_src += stride_src;
-			p_dest += stride_dest;
-			if ( p_alpha )
-				p_alpha += alpha_stride;
-			if ( p_luma )
-				p_luma += alpha_stride;
-		}
+		line_fn( p_dest, p_src, width_src, alpha_b, alpha_a, weight, p_luma, softness );
+
+		p_src += stride_src;
+		p_dest += stride_dest;
+		alpha_b += alpha_b_stride;
+		alpha_a += alpha_a_stride;
+		if ( p_luma )
+			p_luma += alpha_b_stride;
 	}
 
 	return ret;
@@ -523,7 +569,7 @@ static int composite_yuv( uint8_t *p_dest, int width_dest, int height_dest, uint
 */
 
 static inline void
-scale_luma ( uint16_t *dest_buf, int dest_width, int dest_height, const uint16_t *src_buf, int src_width, int src_height )
+scale_luma ( uint16_t *dest_buf, int dest_width, int dest_height, const uint16_t *src_buf, int src_width, int src_height, int invert )
 {
 	register int i, j;
 	register int x_step = ( src_width << 16 ) / dest_width;
@@ -537,7 +583,7 @@ scale_luma ( uint16_t *dest_buf, int dest_width, int dest_height, const uint16_t
 		
 		for ( j = 0; j < dest_width; j++ )
 		{
-			*dest_buf++ = src[ x >> 16 ];
+			*dest_buf++ = src[ x >> 16 ] ^ invert;
 			x += x_step;
 		}
 		y += y_step;
@@ -550,15 +596,29 @@ static uint16_t* get_luma( mlt_properties properties, int width, int height )
 	int luma_width = mlt_properties_get_int( properties, "_luma.width" );
 	int luma_height = mlt_properties_get_int( properties, "_luma.height" );
 	uint16_t *luma_bitmap = mlt_properties_get_data( properties, "_luma.bitmap", NULL );
+	int invert = mlt_properties_get_int( properties, "luma_invert" );
 	
 	// If the filename property changed, reload the map
 	char *resource = mlt_properties_get( properties, "luma" );
 
 	char temp[ 512 ];
 
-	if ( strchr( resource, '%' ) )
+	if ( luma_width == 0 || luma_height == 0 )
 	{
+		luma_width = width;
+		luma_height = height;
+	}
+
+	if ( resource != NULL && strchr( resource, '%' ) )
+	{
+		// TODO: Clean up quick and dirty compressed/existence check
+		FILE *test;
 		sprintf( temp, "%s/lumas/%s/%s", mlt_factory_prefix( ), mlt_environment( "MLT_NORMALISATION" ), strchr( resource, '%' ) + 1 );
+		test = fopen( temp, "r" );
+		if ( test == NULL )
+			strcat( temp, ".png" );
+		else
+			fclose( test );
 		resource = temp;
 	}
 
@@ -571,7 +631,7 @@ static uint16_t* get_luma( mlt_properties properties, int width, int height )
 		// Load the original luma once
 		if ( orig_bitmap == NULL )
 		{
-			char *extension = extension = strrchr( resource, '.' );
+			char *extension = strrchr( resource, '.' );
 			
 			// See if it is a PGM
 			if ( extension != NULL && strcmp( extension, ".pgm" ) == 0 )
@@ -643,7 +703,7 @@ static uint16_t* get_luma( mlt_properties properties, int width, int height )
 		}
 		// Scale luma map
 		luma_bitmap = mlt_pool_alloc( width * height * sizeof( uint16_t ) );
-		scale_luma( luma_bitmap, width, height, orig_bitmap, luma_width, luma_height );
+		scale_luma( luma_bitmap, width, height, orig_bitmap, luma_width, luma_height, invert * ( ( 1 << 16 ) - 1 ) );
 
 		// Remember the scaled luma size to prevent unnecessary scaling
 		mlt_properties_set_int( properties, "_luma.width", width );
@@ -665,7 +725,7 @@ static int get_b_frame_image( mlt_transition this, mlt_frame b_frame, uint8_t **
 	mlt_properties b_props = MLT_FRAME_PROPERTIES( b_frame );
 	mlt_properties properties = MLT_TRANSITION_PROPERTIES( this );
 
-	if ( mlt_properties_get( properties, "distort" ) == NULL && mlt_properties_get( b_props, "distort" ) == NULL && geometry->item.distort == 0 )
+	if ( mlt_properties_get_int( properties, "distort" ) == 0 && mlt_properties_get_int( b_props, "distort" ) == 0 && geometry->item.distort == 0 )
 	{
 		// Adjust b_frame pixel aspect
 		int normalised_width = geometry->item.w;
@@ -674,6 +734,7 @@ static int get_b_frame_image( mlt_transition this, mlt_frame b_frame, uint8_t **
 		int real_height = get_value( b_props, "real_height", "height" );
 		double input_ar = mlt_frame_get_aspect_ratio( b_frame );
 		double output_ar = mlt_properties_get_double( b_props, "consumer_aspect_ratio" );
+		if ( input_ar == 0.0 ) input_ar = output_ar;
 		int scaled_width = input_ar / output_ar * real_width;
 		int scaled_height = real_height;
 			
@@ -689,12 +750,20 @@ static int get_b_frame_image( mlt_transition this, mlt_frame b_frame, uint8_t **
 			scaled_height = normalised_height;
 		}
 
-		// Now apply the fill
-		// TODO: Should combine fill/distort in one property
-		if ( mlt_properties_get( properties, "fill" ) != NULL )
+		// Honour the fill request - this will scale the image to fill width or height while maintaining a/r
+		// ????: Shouln't this be the default behaviour?
+		if ( mlt_properties_get_int( properties, "fill" ) )
 		{
-			scaled_width = ( geometry->item.w / scaled_width ) * scaled_width;
-			scaled_height = ( geometry->item.h / scaled_height ) * scaled_height;
+			if ( scaled_height < normalised_height && scaled_width * normalised_height / scaled_height < normalised_width )
+			{
+				scaled_width = scaled_width * normalised_height / scaled_height;
+				scaled_height = normalised_height;
+			}
+			else if ( scaled_width < normalised_width && scaled_height * normalised_width / scaled_width < normalised_height )
+			{
+				scaled_height = scaled_height * normalised_width / scaled_width;
+				scaled_width = normalised_width;
+			}
 		}
 
 		// Save the new scaled dimensions
@@ -708,34 +777,23 @@ static int get_b_frame_image( mlt_transition this, mlt_frame b_frame, uint8_t **
 	}
 
 	// We want to ensure that we bypass resize now...
-	mlt_properties_set( b_props, "distort", "true" );
+	mlt_properties_set_int( b_props, "distort", 1 );
 
 	// Take into consideration alignment for optimisation
 	if ( !mlt_properties_get_int( properties, "titles" ) )
 		alignment_calculate( geometry );
 
 	// Adjust to consumer scale
-	int x = geometry->item.x * *width / geometry->nw;
-	int y = geometry->item.y * *height / geometry->nh;
 	*width = geometry->sw * *width / geometry->nw;
 	*height = geometry->sh * *height / geometry->nh;
 
-	//x = ( x | 1 ) ^ 1;
-
-	// optimization points - no work to do
-	if ( *width < 1 || *height < 1 )
-		return 1;
-
-	if ( ( x < 0 && -x >= *width ) || ( y < 0 && -y >= *height ) )
-		return 1;
-
 	ret = mlt_frame_get_image( b_frame, image, &format, width, height, 1 );
 
-	return ret;
+	return ret && image != NULL;
 }
 
 
-static mlt_geometry composite_calculate( mlt_transition this, struct geometry_s *result, mlt_frame a_frame, float position )
+static mlt_geometry composite_calculate( mlt_transition this, struct geometry_s *result, mlt_frame a_frame, double position )
 {
 	// Get the properties from the transition
 	mlt_properties properties = MLT_TRANSITION_PROPERTIES( this );
@@ -762,6 +820,11 @@ static mlt_geometry composite_calculate( mlt_transition this, struct geometry_s
 	else
 	{
 		int length = mlt_transition_get_out( this ) - mlt_transition_get_in( this ) + 1;
+		double cycle = mlt_properties_get_double( properties, "cycle" );
+		if ( cycle > 1 )
+			length = cycle;
+		else if ( cycle > 0 )
+			length *= cycle;
 		mlt_geometry_refresh( start, mlt_properties_get( properties, "geometry" ), length, normalised_width, normalised_height );
 	}
 
@@ -826,7 +889,7 @@ mlt_frame composite_copy_region( mlt_transition this, mlt_frame a_frame, mlt_pos
 	// Will need to know region to copy
 	struct geometry_s result;
 
-	float delta = delta_calculate( this, a_frame );
+	double delta = delta_calculate( this, a_frame, frame_position );
 
 	// Calculate the region now
 	composite_calculate( this, &result, a_frame, position + delta / 2 );
@@ -878,19 +941,22 @@ mlt_frame composite_copy_region( mlt_transition this, mlt_frame a_frame, mlt_pos
 		x = 0;
 	}
 
-	// Copy the region of the image
-	p = image + y * ss + x * 2;
-
-	while ( h -- )
+	if ( w > 0 && h > 0 )
 	{
-		inline_memcpy( dest, p, w * 2 );
-		dest += ds;
-		p += ss;
+		// Copy the region of the image
+		p = image + y * ss + x * 2;
+
+		while ( h -- )
+		{
+			inline_memcpy( dest, p, w * 2 );
+			dest += ds;
+			p += ss;
+		}
 	}
 
 	// Assign this position to the b frame
 	mlt_frame_set_position( b_frame, frame_position );
-	mlt_properties_set( b_props, "distort", "true" );
+	mlt_properties_set_int( b_props, "distort", 1 );
 
 	// Return the frame
 	return b_frame;
@@ -907,15 +973,26 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f
 	// Get the transition from the a frame
 	mlt_transition this = mlt_frame_pop_service( a_frame );
 
-	// This compositer is yuv422 only
-	*format = mlt_image_yuv422;
-
-	// Get the image from the a frame
-	mlt_frame_get_image( a_frame, image, format, width, height, 1 );
+	// Get in and out
+	double position = mlt_deque_pop_back_double( MLT_FRAME_IMAGE_STACK( a_frame ) );
+	int out = mlt_frame_pop_service_int( a_frame );
+	int in = mlt_frame_pop_service_int( a_frame );
 
 	// Get the properties from the transition
 	mlt_properties properties = MLT_TRANSITION_PROPERTIES( this );
 
+	// TODO: clean up always_active behaviour
+	if ( mlt_properties_get_int( properties, "always_active" ) )
+	{
+		mlt_events_block( properties, properties );
+		mlt_properties_set_int( properties, "in", in );
+		mlt_properties_set_int( properties, "out", out );
+		mlt_events_unblock( properties, properties );
+	}
+
+	// This compositer is yuv422 only
+	*format = mlt_image_yuv422;
+
 	if ( b_frame != NULL )
 	{
 		// Get the properties of the a frame
@@ -928,17 +1005,46 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f
 		struct geometry_s result;
 
 		// Calculate the position
-		float position = mlt_properties_get_double( b_props, "relative_position" );
-		float delta = delta_calculate( this, a_frame );
+		double delta = delta_calculate( this, a_frame, position );
 
 		// Get the image from the b frame
 		uint8_t *image_b = NULL;
 		int width_b = *width;
 		int height_b = *height;
 	
+		// Composites always need scaling... defaulting to lowest
+		char *rescale = mlt_properties_get( a_props, "rescale.interp" );
+		if ( rescale == NULL || !strcmp( rescale, "none" ) )
+			rescale = "nearest";
+		mlt_properties_set( a_props, "rescale.interp", rescale );
+		mlt_properties_set( b_props, "rescale.interp", rescale );
+
 		// Do the calculation
 		composite_calculate( this, &result, a_frame, position );
 
+		// Since we are the consumer of the b_frame, we must pass along these
+		// consumer properties from the a_frame
+		mlt_properties_set_double( b_props, "consumer_deinterlace", mlt_properties_get_double( a_props, "consumer_deinterlace" ) );
+		mlt_properties_set_double( b_props, "consumer_aspect_ratio", mlt_properties_get_double( a_props, "consumer_aspect_ratio" ) );
+		mlt_properties_set_int( b_props, "normalised_width", mlt_properties_get_double( a_props, "normalised_width" ) );
+		mlt_properties_set_int( b_props, "normalised_height", mlt_properties_get_double( a_props, "normalised_height" ) );
+
+		// TODO: Dangerous/temporary optimisation - if nothing to do, then do nothing
+		if ( mlt_properties_get_int( properties, "no_alpha" ) && 
+			 result.item.x == 0 && result.item.y == 0 && result.item.w == *width && result.item.h == *height && result.item.mix == 100 )
+		{
+			mlt_frame_get_image( b_frame, image, format, width, height, 1 );
+			if ( !mlt_frame_is_test_card( a_frame ) )
+				mlt_frame_replace_image( a_frame, *image, *format, *width, *height );
+			return 0;
+		}
+
+		if ( a_frame == b_frame )
+			get_b_frame_image( this, b_frame, &image_b, &width_b, &height_b, &result );
+
+		// Get the image from the a frame
+		mlt_frame_get_image( a_frame, image, format, width, height, 1 );
+
 		// Optimisation - no compositing required
 		if ( result.item.mix == 0 || ( result.item.w == 0 && result.item.h == 0 ) )
 			return 0;
@@ -957,28 +1063,21 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f
 			mlt_properties_set_int( b_props, "dest_height", mlt_properties_get_int( a_props, "dest_height" ) );
 		}
 
-		// Since we are the consumer of the b_frame, we must pass along these
-		// consumer properties from the a_frame
-		mlt_properties_set_double( b_props, "consumer_deinterlace", mlt_properties_get_double( a_props, "consumer_deinterlace" ) );
-		mlt_properties_set_double( b_props, "consumer_aspect_ratio", mlt_properties_get_double( a_props, "consumer_aspect_ratio" ) );
-		mlt_properties_set_int( b_props, "normalised_width", mlt_properties_get_double( a_props, "normalised_width" ) );
-		mlt_properties_set_int( b_props, "normalised_height", mlt_properties_get_double( a_props, "normalised_height" ) );
-
 		// Special case for titling...
 		if ( mlt_properties_get_int( properties, "titles" ) )
 		{
 			if ( mlt_properties_get( b_props, "rescale.interp" ) == NULL )
 				mlt_properties_set( b_props, "rescale.interp", "hyper" );
-			mlt_properties_set( properties, "fill", NULL );
 			width_b = mlt_properties_get_int( a_props, "dest_width" );
 			height_b = mlt_properties_get_int( a_props, "dest_height" );
 		}
 
-		if ( get_b_frame_image( this, b_frame, &image_b, &width_b, &height_b, &result ) == 0 )
+		if ( image_b != NULL || get_b_frame_image( this, b_frame, &image_b, &width_b, &height_b, &result ) == 0 )
 		{
 			uint8_t *dest = *image;
 			uint8_t *src = image_b;
-			uint8_t *alpha = mlt_frame_get_alpha_mask( b_frame );
+			uint8_t *alpha_b = mlt_frame_get_alpha_mask( b_frame );
+			uint8_t *alpha_a = mlt_frame_get_alpha_mask( a_frame );
 			int progressive = 
 					mlt_properties_get_int( a_props, "consumer_deinterlace" ) ||
 					mlt_properties_get_int( properties, "progressive" );
@@ -986,21 +1085,35 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f
 			
 			int32_t luma_softness = mlt_properties_get_double( properties, "softness" ) * ( 1 << 16 );
 			uint16_t *luma_bitmap = get_luma( properties, width_b, height_b );
-			//composite_line_fn line_fn = mlt_properties_get_int( properties, "_MMX" ) ? composite_line_yuv_mmx : NULL;
-			composite_line_fn line_fn = NULL;
+			composite_line_fn line_fn = composite_line_yuv;
+
+			if ( mlt_properties_get_int( properties, "or" ) )
+				line_fn = composite_line_yuv_or;
+			if ( mlt_properties_get_int( properties, "and" ) )
+				line_fn = composite_line_yuv_and;
+			if ( mlt_properties_get_int( properties, "xor" ) )
+				line_fn = composite_line_yuv_xor;
+
+			if ( mlt_properties_get( properties, "alpha_a" ) )
+				memset( alpha_a, mlt_properties_get_int( properties, "alpha_a" ), *width * *height );
+
+			if ( mlt_properties_get( properties, "alpha_b" ) )
+				memset( alpha_b, mlt_properties_get_int( properties, "alpha_b" ), width_b * height_b );
 
 			for ( field = 0; field < ( progressive ? 1 : 2 ); field++ )
 			{
 				// Assume lower field (0) first
-				float field_position = position + field * delta;
+				double field_position = position + field * delta;
 				
 				// Do the calculation if we need to
 				composite_calculate( this, &result, a_frame, field_position );
 
 				if ( mlt_properties_get_int( properties, "titles" ) )
 				{
-					result.nw = result.item.w = *width;
-					result.nh = result.item.h = *height;
+					result.item.w = *width * ( result.item.w / result.nw );
+					result.nw = result.item.w;
+					result.item.h = *height * ( result.item.h / result.nh );
+					result.nh = *height;
 					result.sw = width_b;
 					result.sh = height_b;
 				}
@@ -1009,10 +1122,14 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f
 				alignment_calculate( &result );
 
 				// Composite the b_frame on the a_frame
-				composite_yuv( dest, *width, *height, src, width_b, height_b, alpha, result, progressive ? -1 : field, luma_bitmap, luma_softness, line_fn );
+				composite_yuv( dest, *width, *height, src, width_b, height_b, alpha_b, alpha_a, result, progressive ? -1 : field, luma_bitmap, luma_softness, line_fn );
 			}
 		}
 	}
+	else
+	{
+		mlt_frame_get_image( a_frame, image, format, width, height, 1 );
+	}
 
 	return 0;
 }
@@ -1022,14 +1139,20 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f
 
 static mlt_frame composite_process( mlt_transition this, 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( this ), "_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 ) );
-
-	// Propogate the transition properties to the b frame
-	mlt_properties_set_double( MLT_FRAME_PROPERTIES( b_frame ), "relative_position", position_calculate( this, mlt_frame_get_position( a_frame ) ) );
+	// UGH - this is a TODO - find a more reliable means of obtaining in/out for the always_active case
+	if ( mlt_properties_get_int(  MLT_TRANSITION_PROPERTIES( this ), "always_active" ) == 0 )
+	{
+		mlt_frame_push_service_int( a_frame, mlt_properties_get_int( MLT_TRANSITION_PROPERTIES( this ), "in" ) );
+		mlt_frame_push_service_int( a_frame, mlt_properties_get_int( MLT_TRANSITION_PROPERTIES( this ), "out" ) );
+		mlt_deque_push_back_double( MLT_FRAME_IMAGE_STACK( a_frame ), position_calculate( this, mlt_frame_get_position( a_frame ) ) );
+	}
+	else
+	{
+		mlt_properties props = mlt_properties_get_data( MLT_FRAME_PROPERTIES( b_frame ), "_producer", NULL );
+		mlt_frame_push_service_int( a_frame, mlt_properties_get_int( props, "in" ) );
+		mlt_frame_push_service_int( a_frame, mlt_properties_get_int( props, "out" ) );
+		mlt_deque_push_back_double( MLT_FRAME_IMAGE_STACK( a_frame ), mlt_properties_get_int( props, "_frame" ) - mlt_properties_get_int( props, "in" ) );
+	}
 	
 	mlt_frame_push_service( a_frame, this );
 	mlt_frame_push_frame( a_frame, b_frame );
@@ -1050,11 +1173,14 @@ mlt_transition transition_composite_init( char *arg )
 		this->process = composite_process;
 		
 		// Default starting motion and zoom
-		mlt_properties_set( properties, "start", arg != NULL ? arg : "85%,5%:10%x10%" );
+		mlt_properties_set( properties, "start", arg != NULL ? arg : "0,0:100%x100%" );
 		
 		// Default factory
 		mlt_properties_set( properties, "factory", "fezzik" );
 
+		// Inform apps and framework that this is a video only transition
+		mlt_properties_set_int( properties, "_transition_type", 1 );
+
 #ifdef USE_MMX
 		//mlt_properties_set_int( properties, "_MMX", composite_have_mmx() );
 #endif