X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_frame.c;h=3221f40b69c781da6f2edaeb0c44494dbd1da6da;hb=2af8bb9f6a61f6510aab8f45abf5f26e9e619c78;hp=3f583d935ddca6b8e8a98cfd080dc0037c655de5;hpb=c63b98c399b13d0672beb9cabba832a71d45a2ea;p=melted

diff --git a/src/framework/mlt_frame.c b/src/framework/mlt_frame.c
index 3f583d9..3221f40 100644
--- a/src/framework/mlt_frame.c
+++ b/src/framework/mlt_frame.c
@@ -20,24 +20,12 @@
 
 #include "config.h"
 #include "mlt_frame.h"
+#include "mlt_producer.h"
+#include "mlt_factory.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-typedef struct
-{
-	mlt_image_format vfmt;
-	int width;
-	int height;
-	uint8_t *image;
-	uint8_t *alpha;
-	mlt_audio_format afmt;
-	int16_t *audio;
-}
-frame_test;
-
-static frame_test test_card = { mlt_image_none, 0, 0, NULL, NULL, mlt_audio_none, NULL };
-
 /** Constructor for a frame.
 */
 
@@ -48,19 +36,42 @@ mlt_frame mlt_frame_init( )
 
 	if ( this != NULL )
 	{
+		// Get the normalisation
+		char *normalisation = mlt_environment( "MLT_NORMALISATION" );
+
 		// Initialise the properties
 		mlt_properties properties = &this->parent;
 		mlt_properties_init( properties, this );
 
 		// Set default properties on the frame
-		mlt_properties_set_position( properties, "position", 0.0 );
+		mlt_properties_set_position( properties, "_position", 0.0 );
 		mlt_properties_set_data( properties, "image", NULL, 0, NULL, NULL );
-		mlt_properties_set_int( properties, "width", 720 );
-		mlt_properties_set_int( properties, "height", 576 );
+
+		if ( normalisation == NULL || strcmp( normalisation, "NTSC" ) )
+		{
+			mlt_properties_set_int( properties, "width", 720 );
+			mlt_properties_set_int( properties, "height", 576 );
+			mlt_properties_set_int( properties, "normalised_width", 720 );
+			mlt_properties_set_int( properties, "normalised_height", 576 );
+		}
+		else
+		{
+			mlt_properties_set_int( properties, "width", 720 );
+			mlt_properties_set_int( properties, "height", 480 );
+			mlt_properties_set_int( properties, "normalised_width", 720 );
+			mlt_properties_set_int( properties, "normalised_height", 480 );
+		}
+
 		mlt_properties_set_double( properties, "aspect_ratio", 4.0 / 3.0 );
 		mlt_properties_set_data( properties, "audio", NULL, 0, NULL, NULL );
 		mlt_properties_set_data( properties, "alpha", NULL, 0, NULL, NULL );
+
+		// Construct stacks for frames and methods
+		this->stack_get_image = mlt_deque_init( );
+		this->stack_frame = mlt_deque_init( );
+		this->stack_service = mlt_deque_init( );
 	}
+
 	return this;
 }
 
@@ -77,7 +88,7 @@ mlt_properties mlt_frame_properties( mlt_frame this )
 
 int mlt_frame_is_test_card( mlt_frame this )
 {
-	return ( this->stack_get_image_size == 0 && mlt_properties_get_data( mlt_frame_properties( this ), "image", NULL ) == NULL );
+	return mlt_properties_get_int( mlt_frame_properties( this ), "test_image" );
 }
 
 /** Check if we have a way to derive something than test audio.
@@ -85,7 +96,7 @@ int mlt_frame_is_test_card( mlt_frame this )
 
 int mlt_frame_is_test_audio( mlt_frame this )
 {
-	return this->get_audio == NULL;
+	return this->get_audio == NULL || mlt_properties_get_int( mlt_frame_properties( this ), "test_audio" );
 }
 
 /** Get the aspect ratio of the frame.
@@ -109,7 +120,7 @@ int mlt_frame_set_aspect_ratio( mlt_frame this, double value )
 
 mlt_position mlt_frame_get_position( mlt_frame this )
 {
-	return mlt_properties_get_position( mlt_frame_properties( this ), "position" );
+	return mlt_properties_get_position( mlt_frame_properties( this ), "_position" );
 }
 
 /** Set the position of this frame.
@@ -117,7 +128,7 @@ mlt_position mlt_frame_get_position( mlt_frame this )
 
 int mlt_frame_set_position( mlt_frame this, mlt_position value )
 {
-	return mlt_properties_set_position( mlt_frame_properties( this ), "position", value );
+	return mlt_properties_set_position( mlt_frame_properties( this ), "_position", value );
 }
 
 /** Stack a get_image callback.
@@ -125,10 +136,7 @@ int mlt_frame_set_position( mlt_frame this, mlt_position value )
 
 int mlt_frame_push_get_image( mlt_frame this, mlt_get_image get_image )
 {
-	int ret = this->stack_get_image_size >= 10;
-	if ( ret == 0 )
-		this->stack_get_image[ this->stack_get_image_size ++ ] = get_image;
-	return ret;
+	return mlt_deque_push_back( this->stack_get_image, get_image );
 }
 
 /** Pop a get_image callback.
@@ -136,10 +144,7 @@ int mlt_frame_push_get_image( mlt_frame this, mlt_get_image get_image )
 
 mlt_get_image mlt_frame_pop_get_image( mlt_frame this )
 {
-	mlt_get_image result = NULL;
-	if ( this->stack_get_image_size > 0 )
-		result = this->stack_get_image[ -- this->stack_get_image_size ];
-	return result;
+	return mlt_deque_pop_back( this->stack_get_image );
 }
 
 /** Push a frame.
@@ -147,10 +152,7 @@ mlt_get_image mlt_frame_pop_get_image( mlt_frame this )
 
 int mlt_frame_push_frame( mlt_frame this, mlt_frame that )
 {
-	int ret = this->stack_frame_size >= 10;
-	if ( ret == 0 )
-		this->stack_frame[ this->stack_frame_size ++ ] = that;
-	return ret;
+	return mlt_deque_push_back( this->stack_frame, that );
 }
 
 /** Pop a frame.
@@ -158,16 +160,30 @@ int mlt_frame_push_frame( mlt_frame this, mlt_frame that )
 
 mlt_frame mlt_frame_pop_frame( mlt_frame this )
 {
-	mlt_frame result = NULL;
-	if ( this->stack_frame_size > 0 )
-		result = this->stack_frame[ -- this->stack_frame_size ];
-	return result;
+	return mlt_deque_pop_back( this->stack_frame );
+}
+
+/** Push a service.
+*/
+
+int mlt_frame_push_service( mlt_frame this, void *that )
+{
+	return mlt_deque_push_back( this->stack_service, that );
+}
+
+/** Pop a service.
+*/
+
+void *mlt_frame_pop_service( mlt_frame this )
+{
+	return mlt_deque_pop_back( this->stack_service );
 }
 
 int mlt_frame_get_image( mlt_frame this, uint8_t **buffer, mlt_image_format *format, int *width, int *height, int writable )
 {
 	mlt_properties properties = mlt_frame_properties( this );
 	mlt_get_image get_image = mlt_frame_pop_get_image( this );
+	mlt_producer producer = mlt_properties_get_data( properties, "test_card_producer", NULL );
 	
 	if ( get_image != NULL )
 	{
@@ -180,49 +196,83 @@ int mlt_frame_get_image( mlt_frame this, uint8_t **buffer, mlt_image_format *for
 		*width = mlt_properties_get_int( properties, "width" );
 		*height = mlt_properties_get_int( properties, "height" );
 	}
+	else if ( producer != NULL )
+	{
+		mlt_frame test_frame = NULL;
+		mlt_service_get_frame( mlt_producer_service( producer ), &test_frame, 0 );
+		if ( test_frame != NULL )
+		{
+			mlt_properties test_properties = mlt_frame_properties( test_frame );
+			mlt_properties_set_double( test_properties, "consumer_aspect_ratio", mlt_properties_get_double( properties, "consumer_aspect_ratio" ) );
+			mlt_properties_set_double( test_properties, "consumer_scale", mlt_properties_get_double( properties, "consumer_scale" ) );
+			mlt_properties_set( test_properties, "rescale.interp", "nearest" );
+			mlt_frame_get_image( test_frame, buffer, format, width, height, writable );
+			mlt_properties_set_data( properties, "test_card_frame", test_frame, 0, ( mlt_destructor )mlt_frame_close, NULL );
+			mlt_properties_set_data( properties, "image", *buffer, *width * *height * 2, NULL, NULL );
+			mlt_properties_set_int( properties, "width", *width );
+			mlt_properties_set_int( properties, "height", *height );
+		}
+		else
+		{
+			mlt_properties_set_data( properties, "test_card_producer", NULL, 0, NULL, NULL );
+			mlt_frame_get_image( this, buffer, format, width, height, writable );
+		}
+	}
 	else
 	{
-		if ( test_card.vfmt != *format )
+		uint8_t *p;
+		uint8_t *q;
+		int size = 0;
+
+		*width = *width == 0 ? 720 : *width;
+		*height = *height == 0 ? 576 : *height;
+		size = *width * *height;
+
+		mlt_properties_set_int( properties, "width", *width );
+		mlt_properties_set_int( properties, "height", *height );
+
+		switch( *format )
 		{
-			uint8_t *p;
-			uint8_t *q;
-			
-			test_card.vfmt = *format;
-			test_card.width = *width == 0 ? 720 : *width;
-			test_card.height = *height == 0 ? 576 : *height;
-
-			switch( *format )
-			{
-				case mlt_image_none:
-					break;
-				case mlt_image_rgb24:
-					test_card.image = realloc( test_card.image, test_card.width * test_card.height * 3 );
-					memset( test_card.image, 255, test_card.width * test_card.height * 3 );
-					break;
-				case mlt_image_rgb24a:
-					test_card.image = realloc( test_card.image, test_card.width * test_card.height * 4 );
-					memset( test_card.image, 255, test_card.width * test_card.height * 4 );
-					break;
-				case mlt_image_yuv422:
-					test_card.image = realloc( test_card.image, test_card.width * test_card.height * 2 );
-					p = test_card.image;
-					q = test_card.image + test_card.width * test_card.height * 2;
-					while ( p != q )
-					{
-						*p ++ = 255;
-						*p ++ = 128;
-					}
-					break;
-				case mlt_image_yuv420p:
-					test_card.image = realloc( test_card.image, test_card.width * test_card.height * 3 / 2 );
-					memset( test_card.image, 255, test_card.width * test_card.height * 3 / 2 );
-					break;
-			}
+			case mlt_image_none:
+				size = 0;
+				*buffer = NULL;
+				break;
+			case mlt_image_rgb24:
+				size *= 3;
+				size += *width * 3;
+				*buffer = mlt_pool_alloc( size );
+				if ( *buffer )
+					memset( *buffer, 255, size );
+				break;
+			case mlt_image_rgb24a:
+				size *= 4;
+				size += *width * 4;
+				*buffer = mlt_pool_alloc( size );
+				if ( *buffer )
+					memset( *buffer, 255, size );
+				break;
+			case mlt_image_yuv422:
+				size *= 2;
+				size += *width * 2;
+				*buffer = mlt_pool_alloc( size );
+				p = *buffer;
+				q = p + size;
+				while ( p != NULL && p != q )
+				{
+					*p ++ = 255;
+					*p ++ = 128;
+				}
+				break;
+			case mlt_image_yuv420p:
+				size = size * 3 / 2;
+				*buffer = mlt_pool_alloc( size );
+				if ( *buffer )
+					memset( *buffer, 255, size );
+				break;
 		}
 
-		*width = test_card.width;
-		*height = test_card.height;
-		*buffer = test_card.image;
+		mlt_properties_set_data( properties, "image", *buffer, size, ( mlt_destructor )mlt_pool_release, NULL );
+		mlt_properties_set_int( properties, "test_image", 1 );
 	}
 
 	return 0;
@@ -232,39 +282,43 @@ uint8_t *mlt_frame_get_alpha_mask( mlt_frame this )
 {
 	if ( this->get_alpha_mask != NULL )
 		return this->get_alpha_mask( this );
-	return test_card.alpha;
+	return NULL;
 }
 
 int mlt_frame_get_audio( mlt_frame this, int16_t **buffer, mlt_audio_format *format, int *frequency, int *channels, int *samples )
 {
+	mlt_properties properties = mlt_frame_properties( this );
+
 	if ( this->get_audio != NULL )
 	{
 		return this->get_audio( this, buffer, format, frequency, channels, samples );
 	}
 	else
 	{
-		if ( *samples <= 0 )
-			*samples = 1920;
-		if ( *channels <= 0 )
-			*channels = 2;
-		if ( *frequency <= 0 )
-			*frequency = 48000;
-		if ( test_card.audio == NULL || test_card.afmt != *format )
-		{
-			test_card.afmt = *format;
-			test_card.audio = realloc( test_card.audio, *samples * *channels * sizeof( int16_t ) );
-			memset( test_card.audio, 0, *samples * *channels * sizeof( int16_t ) );
-		}
-		
-		*buffer = test_card.audio;
+		int size = 0;
+		*samples = *samples <= 0 ? 1920 : *samples;
+		*channels = *channels <= 0 ? 2 : *channels;
+		*frequency = *frequency <= 0 ? 48000 : *frequency;
+		size = *samples * *channels * sizeof( int16_t );
+		*buffer = mlt_pool_alloc( size );
+		if ( *buffer != NULL )
+			memset( *buffer, 0, size );
+		mlt_properties_set_data( properties, "audio", *buffer, size, ( mlt_destructor )mlt_pool_release, NULL );
+		mlt_properties_set_int( properties, "test_audio", 1 );
 	}
 	return 0;
 }
 
 void mlt_frame_close( mlt_frame this )
 {
-	mlt_properties_close( &this->parent );
-	free( this );
+	if ( this != NULL )
+	{
+		mlt_deque_close( this->stack_get_image );
+		mlt_deque_close( this->stack_frame );
+		mlt_deque_close( this->stack_service );
+		mlt_properties_close( &this->parent );
+		free( this );
+	}
 }
 
 /***** convenience functions *****/
@@ -389,133 +443,6 @@ int mlt_convert_yuv420p_to_yuv422( uint8_t *yuv420p, int width, int height, int
 	return ret;
 }
 
-int mlt_frame_composite_yuv( mlt_frame this, mlt_frame that, int x, int y, float weight )
-{
-	int ret = 0;
-	int width_src = 0, height_src = 0;
-	int width_dest = 0, height_dest = 0;
-	mlt_image_format format_src = mlt_image_yuv422, format_dest = 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;
-
-	format_src = mlt_image_yuv422;
-	format_dest = mlt_image_yuv422;
-
-	//fprintf( stderr, "call get_image on frame a\n"), fflush( stderr );
-	mlt_frame_get_image( this, &p_dest, &format_dest, &width_dest, &height_dest, 1 /* writable */ );
-	//fprintf( stderr, "call get_image on frame b\n"), fflush( stderr );
-	mlt_frame_get_image( that, &p_src, &format_src, &width_src, &height_src, 0 /* writable */ );
-
-	//fprintf( stderr, "mlt_frame_composite_yuv %dx%d -> %dx%d\n", width_src, height_src, width_dest, height_dest );
-	//fflush(stderr);
-	//return ret;
-	stride_src = width_src * 2;
-	stride_dest = width_dest * 2;
-	
-	// 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;
-
-	// crop overlay off the top edge of the frame
-	if ( y < 0 )
-	{
-		y_src = -y;
-		height_src -= y_src;
-	}
-	// 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!
-//	if ( interlaced && y % 2 )
-//		++y;
-	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;
-
-	uint8_t Y;
-	uint8_t UV;
-	uint8_t a;
-	float value;
-
-	// 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;
-
-		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 ) );
-		}
-
-		p_src += stride_src;
-		p_dest += stride_dest;
-		if ( p_alpha )
-			p_alpha += stride_src / 2;
-	}
-
-	return ret;
-}
-
-void *memfill( void *dst, void *src, int l, int elements )
-{
-	int i = 0;
-	if ( l == 2 )
-	{
-		uint8_t *p = dst;
-		uint8_t *src1 = src;
-		uint8_t *src2 = src + 1;
-		for ( i = 0; i < elements; i ++ )
-		{
-			*p ++ = *src1;
-			*p ++ = *src2;
-		}
-		dst = p;
-	}
-	else
-	{
-		for ( i = 0; i < elements; i ++ )
-			dst = memcpy( dst, src, l ) + l;
-	}
-	return dst;
-}
-
 void mlt_resize_yuv422( uint8_t *output, int owidth, int oheight, uint8_t *input, int iwidth, int iheight )
 {
 	// Calculate strides
@@ -527,6 +454,10 @@ void mlt_resize_yuv422( uint8_t *output, int owidth, int oheight, uint8_t *input
 	iheight = iheight - ( iheight % 2 );
 	oheight = oheight - ( oheight % 2 );
 
+	// Optimisation point
+	if ( iwidth == owidth && iheight == oheight )
+		memcpy( output, input, iheight * istride );
+
    	// Coordinates (0,0 is middle of output)
    	int y;
 
@@ -544,38 +475,61 @@ void mlt_resize_yuv422( uint8_t *output, int owidth, int oheight, uint8_t *input
    	uint8_t *in_middle = input + istride * ( iheight / 2 ) + ( iwidth / 2 ) * 2;
    	int in_line = - in_y_range * istride - in_x_range * 2;
 
-	uint8_t black[ 2 ] = { 16, 128 };
+	int elements;
+
+	// Fill whole section with black
+	y = out_y_range - ( iheight / 2 );
+	int blank_elements = ostride * y / 2;
+	elements = blank_elements;
+	while ( elements -- )
+	{
+		*out_line ++ = 0;
+		*out_line ++ = 128;
+	}
+
+	int active_width = 2 * iwidth;
+	int inactive_width = out_x_range - in_x_range;
 
    	// Loop for the entirety of our output height.
-   	for ( y = - out_y_range; y < out_y_range ; y ++ )
+	while ( iheight -- )
    	{
        	// Start at the beginning of the line
        	out_ptr = out_line;
 
-		if ( abs( y ) < iheight / 2 )
+		// Fill the outer part with black
+		elements = inactive_width;
+		while ( elements -- )
 		{
-			// Fill the outer part with black
-			out_ptr = memfill( out_ptr, black, 2, out_x_range - in_x_range );
-
-       		// We're in the input range for this row.
-			memcpy( out_ptr, in_middle + in_line, 2 * iwidth );
-			out_ptr += 2 * iwidth;
+			*out_ptr ++ = 0;
+			*out_ptr ++ = 128;
+		}
 
-			// Fill the outer part with black
-			out_ptr = memfill( out_ptr, black, 2, out_x_range - in_x_range );
+   		// We're in the input range for this row.
+		memcpy( out_ptr, in_middle + in_line, active_width );
+		out_ptr += active_width;
 
-       		// Move to next input line
-       		in_line += istride;
-		}
-		else
+		// Fill the outer part with black
+		elements = inactive_width;
+		while ( elements -- )
 		{
-			// Fill whole line with black
-			out_ptr = memfill( out_ptr, black, 2, owidth );
+			*out_ptr ++ = 0;
+			*out_ptr ++ = 128;
 		}
 
+  		// Move to next input line
+   		in_line += istride;
+
        	// Move to next output line
        	out_line += ostride;
    	}
+
+	// Fill whole section with black
+	elements = blank_elements;
+	while ( elements -- )
+	{
+		*out_line ++ = 0;
+		*out_line ++ = 128;
+	}
 }
 
 /** A resizing function for yuv422 frames - this does not rescale, but simply
@@ -596,20 +550,19 @@ uint8_t *mlt_frame_resize_yuv422( mlt_frame this, int owidth, int oheight )
 	if ( iwidth != owidth || iheight != oheight )
 	{
 		// Create the output image
-		uint8_t *output = malloc( owidth * oheight * 2 );
+		uint8_t *output = mlt_pool_alloc( owidth * ( oheight + 1 ) * 2 );
 
 		// Call the generic resize
 		mlt_resize_yuv422( output, owidth, oheight, input, iwidth, iheight );
 
 		// Now update the frame
-		mlt_properties_set_data( properties, "image", output, owidth * oheight * 2, free, NULL );
+		mlt_properties_set_data( properties, "image", output, owidth * ( oheight + 1 ) * 2, ( mlt_destructor )mlt_pool_release, NULL );
 		mlt_properties_set_int( properties, "width", owidth );
 		mlt_properties_set_int( properties, "height", oheight );
 
 		// Return the output
 		return output;
 	}
-
 	// No change, return input
 	return input;
 }
@@ -632,7 +585,7 @@ uint8_t *mlt_frame_rescale_yuv422( mlt_frame this, int owidth, int oheight )
 	if ( iwidth != owidth || iheight != oheight )
 	{
 		// Create the output image
-		uint8_t *output = malloc( owidth * oheight * 2 );
+		uint8_t *output = mlt_pool_alloc( owidth * ( oheight + 1 ) * 2 );
 
 		// Calculate strides
 		int istride = iwidth * 2;
@@ -640,9 +593,6 @@ uint8_t *mlt_frame_rescale_yuv422( mlt_frame this, int owidth, int oheight )
 
 		iwidth = iwidth - ( iwidth % 4 );
 
-    	// Coordinates (0,0 is middle of output)
-    	int y, x;
-
 		// Derived coordinates
 		int dy, dx;
 
@@ -653,50 +603,44 @@ uint8_t *mlt_frame_rescale_yuv422( mlt_frame this, int owidth, int oheight )
     	int in_y_range = iheight / 2;
 
     	// Output pointers
-    	uint8_t *out_line = output;
-    	uint8_t *out_ptr;
+    	register uint8_t *out_line = output;
+    	register uint8_t *out_ptr;
 
     	// Calculate a middle pointer
     	uint8_t *in_middle = input + istride * in_y_range + in_x_range * 2;
     	uint8_t *in_line;
-		uint8_t *in_ptr;
 
 		// Generate the affine transform scaling values
-		float scale_width = ( float )iwidth / ( float )owidth;
-		float scale_height = ( float )iheight / ( float )oheight;
+		register int scale_width = ( iwidth << 16 ) / owidth;
+		register int scale_height = ( iheight << 16 ) / oheight;
+		register int base = 0;
+
+		int outer = out_x_range * scale_width;
+		int bottom = out_y_range * scale_height;
 
     	// Loop for the entirety of our output height.
-    	for ( y = - out_y_range; y < out_y_range ; y ++ )
+    	for ( dy = - bottom; dy < bottom; dy += scale_height )
     	{
-			// Calculate the derived y value
-			dy = scale_height * y;
-
         	// Start at the beginning of the line
         	out_ptr = out_line;
 	
         	// Pointer to the middle of the input line
-        	in_line = in_middle + dy * istride;
-	
+        	in_line = in_middle + ( dy >> 16 ) * istride;
+
         	// Loop for the entirety of our output row.
-        	for ( x = - out_x_range; x < out_x_range; x += 1 )
+        	for ( dx = - outer; dx < outer; dx += scale_width )
         	{
-				// Calculated the derived x
-				dx = scale_width * x;
-
-            	// Check if x and y are in the valid input range.
-            	if ( abs( dx ) < in_x_range && abs( dy ) < in_y_range  )
-            	{
-                	// We're in the input range for this row.
-					in_ptr = in_line + ( dx >> 1 ) * 4 + 2 * ( x & 1 );
-                	*out_ptr ++ = *in_ptr ++;
-                	*out_ptr ++ = *in_ptr ++;
-            	}
-            	else
-            	{
-                	// We're not in the input range for this row.
-                	*out_ptr ++ = 16;
-                	*out_ptr ++ = 128;
-            	}
+				base = dx >> 15;
+				base &= 0xfffffffe;
+				*out_ptr ++ = *( in_line + base );
+				base &= 0xfffffffc;
+				*out_ptr ++ = *( in_line + base + 1 );
+				dx += scale_width;
+				base = dx >> 15;
+				base &= 0xfffffffe;
+				*out_ptr ++ = *( in_line + base );
+				base &= 0xfffffffc;
+				*out_ptr ++ = *( in_line + base + 3 );
         	}
 
         	// Move to next output line
@@ -704,7 +648,7 @@ uint8_t *mlt_frame_rescale_yuv422( mlt_frame this, int owidth, int oheight )
     	}
 
 		// Now update the frame
-		mlt_properties_set_data( properties, "image", output, owidth * oheight * 2, free, NULL );
+		mlt_properties_set_data( properties, "image", output, owidth * ( oheight + 1 ) * 2, ( mlt_destructor )mlt_pool_release, NULL );
 		mlt_properties_set_int( properties, "width", owidth );
 		mlt_properties_set_int( properties, "height", oheight );
 
@@ -716,22 +660,25 @@ uint8_t *mlt_frame_rescale_yuv422( mlt_frame this, int owidth, int oheight )
 	return input;
 }
 
-int mlt_frame_mix_audio( mlt_frame this, mlt_frame that, float weight, int16_t **buffer, mlt_audio_format *format, int *frequency, int *channels, int *samples )
+int mlt_frame_mix_audio( mlt_frame this, mlt_frame that, float weight_start, float weight_end, int16_t **buffer, mlt_audio_format *format, int *frequency, int *channels, int *samples )
 {
 	int ret = 0;
 	int16_t *p_src, *p_dest;
 	int16_t *src, *dest;
 	//static int16_t *extra_src = NULL, *extra_dest = NULL;
 	static int extra_src_samples = 0, extra_dest_samples = 0;
-	int frequency_src = 0, frequency_dest = 0;
-	int channels_src = 0, channels_dest = 0;
-	int samples_src = 0, samples_dest = 0;
+	int frequency_src = *frequency, frequency_dest = *frequency;
+	int channels_src = *channels, channels_dest = *channels;
+	int samples_src = *samples, samples_dest = *samples;
 	int i, j;
+	double d = 0, s = 0;
 
 	mlt_frame_get_audio( this, &p_dest, format, &frequency_dest, &channels_dest, &samples_dest );
-	//fprintf( stderr, "frame dest samples %d channels %d position %f\n", samples_dest, channels_dest, mlt_properties_get_position( mlt_frame_properties( this ), "position" ) );
+	//fprintf( stderr, "mix: frame dest samples %d channels %d position %lld\n", samples_dest, channels_dest, mlt_properties_get_position( mlt_frame_properties( this ), "_position" ) );
 	mlt_frame_get_audio( that, &p_src, format, &frequency_src, &channels_src, &samples_src );
-	//fprintf( stderr, "frame src  samples %d channels %d\n", samples_src, channels_src );
+	//fprintf( stderr, "mix: frame src  samples %d channels %d\n", samples_src, channels_src );
+	src = p_src;
+	dest = p_dest;
 	if ( channels_src > 6 )
 		channels_src = 0;
 	if ( channels_dest > 6 )
@@ -759,9 +706,6 @@ int mlt_frame_mix_audio( mlt_frame this, mlt_frame that, float weight, int16_t *
 	}
 	else
 		src = p_src;
-#else
-	src = p_src;
-	dest = p_dest;
 #endif
 
 	// determine number of samples to process	
@@ -772,16 +716,24 @@ int mlt_frame_mix_audio( mlt_frame this, mlt_frame that, float weight, int16_t *
 	
 	*channels = channels_src < channels_dest ? channels_src : channels_dest;
 	*buffer = p_dest;
+	*frequency = frequency_dest;
+
+	// Compute a smooth ramp over start to end
+	float weight = weight_start;
+	float weight_step = ( weight_end - weight_start ) / *samples;
 
 	// Mixdown
 	for ( i = 0; i < *samples; i++ )
 	{
 		for ( j = 0; j < *channels; j++ )
 		{
-			double d = (double) dest[ i * channels_dest + j ];
-			double s = (double) src[ i * channels_src + j ];
+			if ( j < channels_dest )
+				d = (double) dest[ i * channels_dest + j ];
+			if ( j < channels_src )
+				s = (double) src[ i * channels_src + j ];
 			dest[ i * channels_dest + j ] = s * weight + d * ( 1.0 - weight );
 		}
+		weight += weight_step;
 	}
 
 	// We have to copy --sigh