X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_frame.c;h=e17898431078191827e385eddd4a09c961ba3d71;hb=d61a4ab32e7b834996d394b2e8032680e05109ff;hp=914ef854b7f808de8deaa031e5d7cb0e22811b31;hpb=1e55d8082c842d4ae2d718eb2675719eeb615c0c;p=melted

diff --git a/src/framework/mlt_frame.c b/src/framework/mlt_frame.c
index 914ef85..e178984 100644
--- a/src/framework/mlt_frame.c
+++ b/src/framework/mlt_frame.c
@@ -25,6 +25,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <math.h>
 
 /** Constructor for a frame.
 */
@@ -263,18 +264,19 @@ int mlt_frame_get_image( mlt_frame this, uint8_t **buffer, mlt_image_format *for
 	mlt_producer producer = mlt_properties_get_data( properties, "test_card_producer", NULL );
 	int error = 0;
 
-	*width = *width >> 1 << 1;
-	
 	if ( get_image != NULL )
 	{
 		mlt_properties_set_int( properties, "image_count", mlt_properties_get_int( properties, "image_count" ) - 1 );
 		mlt_position position = mlt_frame_get_position( this );
 	   	error = get_image( this, buffer, format, width, height, writable );
+		mlt_properties_set_int( properties, "width", *width );
+		mlt_properties_set_int( properties, "height", *height );
+		mlt_properties_set_int( properties, "format", *format );
 		mlt_frame_set_position( this, position );
 	}
 	else if ( mlt_properties_get_data( properties, "image", NULL ) != NULL )
 	{
-		*format = mlt_image_yuv422;
+		*format = mlt_properties_get_int( properties, "format" );
 		*buffer = mlt_properties_get_data( properties, "image", NULL );
 		*width = mlt_properties_get_int( properties, "width" );
 		*height = mlt_properties_get_int( properties, "height" );
@@ -293,6 +295,7 @@ int mlt_frame_get_image( mlt_frame this, uint8_t **buffer, mlt_image_format *for
 			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 );
+			mlt_properties_set_int( properties, "format", *format );
 			mlt_properties_set_double( properties, "aspect_ratio", mlt_frame_get_aspect_ratio( test_frame ) );
 		}
 		else
@@ -311,6 +314,7 @@ int mlt_frame_get_image( mlt_frame this, uint8_t **buffer, mlt_image_format *for
 		*height = *height == 0 ? 576 : *height;
 		size = *width * *height;
 
+		mlt_properties_set_int( properties, "format", *format );
 		mlt_properties_set_int( properties, "width", *width );
 		mlt_properties_set_int( properties, "height", *height );
 		mlt_properties_set_int( properties, "aspect_ratio", 0 );
@@ -329,6 +333,7 @@ int mlt_frame_get_image( mlt_frame this, uint8_t **buffer, mlt_image_format *for
 					memset( *buffer, 255, size );
 				break;
 			case mlt_image_rgb24a:
+			case mlt_image_opengl:
 				size *= 4;
 				size += *width * 4;
 				*buffer = mlt_pool_alloc( size );
@@ -425,10 +430,10 @@ int mlt_frame_get_audio( mlt_frame this, int16_t **buffer, mlt_audio_format *for
 	if ( mlt_properties_get( properties, "meta.volume" ) )
 	{
 		double value = mlt_properties_get_double( properties, "meta.volume" );
+
 		if ( value == 0.0 )
 		{
 			memset( *buffer, 0, *samples * *channels * 2 );
-			mlt_properties_set_double( properties, "meta.volume", 1.0 );
 		}
 		else if ( value != 1.0 )
 		{
@@ -439,8 +444,9 @@ int mlt_frame_get_audio( mlt_frame this, int16_t **buffer, mlt_audio_format *for
 				*p = *p * value;
 				p ++;
 			}
-			mlt_properties_set_double( properties, "meta.volume", 1.0 );
 		}
+
+		mlt_properties_set( properties, "meta.volume", NULL );
 	}
 
 	return 0;
@@ -604,6 +610,129 @@ int mlt_convert_rgb24_to_yuv422( uint8_t *rgb, int width, int height, int stride
 	return ret;
 }
 
+int mlt_convert_bgr24a_to_yuv422( uint8_t *rgba, int width, int height, int stride, uint8_t *yuv, uint8_t *alpha )
+{
+	int ret = 0;
+	register int y0, y1, u0, u1, v0, v1;
+	register int r, g, b;
+	register uint8_t *d = yuv;
+	register int i, j;
+
+	for ( i = 0; i < height; i++ )
+	{
+		register uint8_t *s = rgba + ( stride * i );
+		for ( j = 0; j < ( width / 2 ); j++ )
+		{
+			b = *s++;
+			g = *s++;
+			r = *s++;
+			*alpha++ = *s++;
+			RGB2YUV (r, g, b, y0, u0 , v0);
+			b = *s++;
+			g = *s++;
+			r = *s++;
+			*alpha++ = *s++;
+			RGB2YUV (r, g, b, y1, u1 , v1);
+			*d++ = y0;
+			*d++ = (u0+u1) >> 1;
+			*d++ = y1;
+			*d++ = (v0+v1) >> 1;
+		}
+		if ( width % 2 )
+		{
+			b = *s++;
+			g = *s++;
+			r = *s++;
+			*alpha++ = *s++;
+			RGB2YUV (r, g, b, y0, u0 , v0);
+			*d++ = y0;
+			*d++ = u0;
+		}
+	}
+	return ret;
+}
+
+int mlt_convert_bgr24_to_yuv422( uint8_t *rgb, int width, int height, int stride, uint8_t *yuv )
+{
+	int ret = 0;
+	register int y0, y1, u0, u1, v0, v1;
+	register int r, g, b;
+	register uint8_t *d = yuv;
+	register int i, j;
+
+	for ( i = 0; i < height; i++ )
+	{
+		register uint8_t *s = rgb + ( stride * i );
+		for ( j = 0; j < ( width / 2 ); j++ )
+		{
+			b = *s++;
+			g = *s++;
+			r = *s++;
+			RGB2YUV (r, g, b, y0, u0 , v0);
+			b = *s++;
+			g = *s++;
+			r = *s++;
+			RGB2YUV (r, g, b, y1, u1 , v1);
+			*d++ = y0;
+			*d++ = (u0+u1) >> 1;
+			*d++ = y1;
+			*d++ = (v0+v1) >> 1;
+		}
+		if ( width % 2 )
+		{
+			b = *s++;
+			g = *s++;
+			r = *s++;
+			RGB2YUV (r, g, b, y0, u0 , v0);
+			*d++ = y0;
+			*d++ = u0;
+		}
+	}
+	return ret;
+}
+
+int mlt_convert_argb_to_yuv422( uint8_t *rgba, int width, int height, int stride, uint8_t *yuv, uint8_t *alpha )
+{
+	int ret = 0;
+	register int y0, y1, u0, u1, v0, v1;
+	register int r, g, b;
+	register uint8_t *d = yuv;
+	register int i, j;
+
+	for ( i = 0; i < height; i++ )
+	{
+		register uint8_t *s = rgba + ( stride * i );
+		for ( j = 0; j < ( width / 2 ); j++ )
+		{
+			*alpha++ = *s++;
+			r = *s++;
+			g = *s++;
+			b = *s++;
+			RGB2YUV (r, g, b, y0, u0 , v0);
+			*alpha++ = *s++;
+			r = *s++;
+			g = *s++;
+			b = *s++;
+			RGB2YUV (r, g, b, y1, u1 , v1);
+			*d++ = y0;
+			*d++ = (u0+u1) >> 1;
+			*d++ = y1;
+			*d++ = (v0+v1) >> 1;
+		}
+		if ( width % 2 )
+		{
+			*alpha++ = *s++;
+			r = *s++;
+			g = *s++;
+			b = *s++;
+			RGB2YUV (r, g, b, y0, u0 , v0);
+			*d++ = y0;
+			*d++ = u0;
+		}
+	}
+	return ret;
+}
+
 int mlt_convert_yuv420p_to_yuv422( uint8_t *yuv420p, int width, int height, int stride, uint8_t *yuv )
 {
 	int ret = 0;
@@ -633,81 +762,37 @@ int mlt_convert_yuv420p_to_yuv422( uint8_t *yuv420p, int width, int height, int
 	return ret;
 }
 
-uint8_t *mlt_resize_alpha( uint8_t *input, int owidth, int oheight, int iwidth, int iheight )
+uint8_t *mlt_resize_alpha( uint8_t *input, int owidth, int oheight, int iwidth, int iheight, uint8_t alpha_value )
 {
 	uint8_t *output = NULL;
 
 	if ( input != NULL && ( iwidth != owidth || iheight != oheight ) && ( owidth > 6 && oheight > 6 ) )
 	{
-		iwidth = iwidth - ( iwidth % 2 );
-		owidth = owidth - ( owidth % 2 );
+		uint8_t *out_line;
+		int offset_x = ( owidth - iwidth ) / 2;
+		int offset_y = ( oheight - iheight ) / 2;
+		int iused = iwidth;
 
 		output = mlt_pool_alloc( owidth * oheight );
+		memset( output, alpha_value, owidth * oheight );
 
-   		// Coordinates (0,0 is middle of output)
-   		int y;
-
-   		// Calculate ranges
-   		int out_x_range = owidth / 2;
-   		int out_y_range = oheight / 2;
-   		int in_x_range = iwidth / 2 < out_x_range ? iwidth / 2 : out_x_range;
-   		int in_y_range = iheight / 2 < out_y_range ? iheight / 2 : out_y_range;
-
-   		// Output pointers
-   		uint8_t *out_line = output;
-   		uint8_t *out_ptr = out_line;
+		offset_x -= offset_x % 2;
 
-   		// Calculate a middle and possibly invalid pointer in the input
-   		uint8_t *in_middle = input + iwidth * ( iheight / 2 ) + ( iwidth / 2 );
-   		int in_line = - in_y_range * iwidth - in_x_range;
-
-		int elements;
-
-		// Fill whole section with black
-		y = out_y_range - ( iheight / 2 );
-		int blank_elements = owidth * y;
-		elements = blank_elements;
-		while ( elements -- )
-			*out_line ++ = 0;
-
-		int active_width = iwidth;
-		int inactive_width = out_x_range - in_x_range;
-		uint8_t *p = NULL;
-		uint8_t *end = NULL;
+		out_line = output + offset_y * owidth;
+		out_line += offset_x;
 
    		// Loop for the entirety of our output height.
 		while ( iheight -- )
    		{
-       		// Start at the beginning of the line
-       		out_ptr = out_line;
-
-			// Fill the outer part with black
-			elements = inactive_width;
-			while ( elements -- )
-				*out_ptr ++ = 0;
-
    			// We're in the input range for this row.
-			p = in_middle + in_line;
-			end = out_ptr + active_width;
-			while ( out_ptr != end )
-				*out_ptr ++ = *p ++;
-
-			// Fill the outer part with black
-			elements = inactive_width;
-			while ( elements -- )
-				*out_ptr ++ = 0;
-	
+			memcpy( out_line, input, iused );
+
   			// Move to next input line
-   			in_line += iwidth;
+   			input += iwidth;
 
        		// Move to next output line
        		out_line += owidth;
    		}
-
-		// Fill whole section with black
-		elements = blank_elements;
-		while ( elements -- )
-			*out_line ++ = 0;
 	}
 
 	return output;
@@ -718,12 +803,13 @@ void mlt_resize_yuv422( uint8_t *output, int owidth, int oheight, uint8_t *input
 	// Calculate strides
 	int istride = iwidth * 2;
 	int ostride = owidth * 2;
+	int offset_x = ( owidth - iwidth );
+	int offset_y = ( oheight - iheight ) / 2;
+	uint8_t *in_line = input;
+	uint8_t *out_line;
+	int size = owidth * oheight;
+	uint8_t *p = output;
 
-	iwidth = iwidth - ( iwidth % 2 );
-	owidth = owidth - ( owidth % 2 );
-	//iheight = iheight - ( iheight % 2 );
-	//oheight = oheight - ( oheight % 2 );
-	
 	// Optimisation point
 	if ( output == NULL || input == NULL || ( owidth <= 6 || oheight <= 6 || iwidth <= 6 || oheight <= 6 ) )
 	{
@@ -735,93 +821,29 @@ void mlt_resize_yuv422( uint8_t *output, int owidth, int oheight, uint8_t *input
 		return;
 	}
 
-   	// Coordinates (0,0 is middle of output)
-   	int y;
-
-   	// Calculate ranges
-   	int out_x_range = owidth / 2;
-   	int out_y_range = oheight / 2;
-   	int in_x_range = iwidth / 2 < out_x_range ? iwidth / 2 : out_x_range;
-   	int in_y_range = iheight / 2 < out_y_range ? iheight / 2 : out_y_range;
-
-   	// Output pointers
-   	uint8_t *out_line = output;
-   	uint8_t *out_ptr = out_line;
-
-   	// Calculate a middle and possibly invalid pointer in the input
-   	uint8_t *in_middle = input + istride * ( iheight / 2 ) + iwidth;
-   	int in_line = - in_y_range * istride - in_x_range * 2;
-
-	int elements;
-
-	// Fill whole section with black
-	y = out_y_range - ( iheight / 2 );
-	int blank_elements = ostride * y / 2;
-	elements = blank_elements;
-	while ( elements -- )
+	while( size -- )
 	{
-		*out_line ++ = 16;
-		*out_line ++ = 128;
+		*p ++ = 16;
+		*p ++ = 128;
 	}
 
-	int active_width = 2 * iwidth;
-	int left_inactive_width = out_x_range - in_x_range;
-	int right_inactive_width = left_inactive_width;
-	uint8_t *p = NULL;
-	uint8_t *end = NULL;
+	offset_x -= offset_x % 4;
 
-	if ( in_line % 4 )
-	{
-		active_width -= 2;
-		in_middle += 2;
-		right_inactive_width += 2;
-	}
+	out_line = output + offset_y * ostride;
+	out_line += offset_x;
 
    	// Loop for the entirety of our output height.
 	while ( iheight -- )
    	{
-       	// Start at the beginning of the line
-       	out_ptr = out_line;
-
-		// Fill the outer part with black
-		elements = left_inactive_width;
-		while ( elements -- )
-		{
-			*out_ptr ++ = 16;
-			*out_ptr ++ = 128;
-		}
-
    		// We're in the input range for this row.
-		p = in_middle + in_line;
-		end = out_ptr + active_width;
-		while ( out_ptr != end )
-		{
-			*out_ptr ++ = *p ++;
-			*out_ptr ++ = *p ++;
-		}
-
-		// Fill the outer part with black
-		elements = right_inactive_width;
-		while ( elements -- )
-		{
-			*out_ptr ++ = 16;
-			*out_ptr ++ = 128;
-		}
+		memcpy( out_line, in_line, iwidth * 2 );
 
-  		// Move to next input line
-   		in_line += istride;
+		// Move to next input line
+		in_line += istride;
 
-       	// Move to next output line
-       	out_line += ostride;
+   		// Move to next output line
+   		out_line += ostride;
    	}
-
-	// Fill whole section with black
-	elements = blank_elements;
-	while ( elements -- )
-	{
-		*out_line ++ = 16;
-		*out_line ++ = 128;
-	}
 }
 
 /** A resizing function for yuv422 frames - this does not rescale, but simply
@@ -843,6 +865,8 @@ uint8_t *mlt_frame_resize_yuv422( mlt_frame this, int owidth, int oheight )
 	// If width and height are correct, don't do anything
 	if ( iwidth != owidth || iheight != oheight )
 	{
+		uint8_t alpha_value = mlt_properties_get_int( properties, "resize_alpha" );
+
 		// Create the output image
 		uint8_t *output = mlt_pool_alloc( owidth * ( oheight + 1 ) * 2 );
 
@@ -855,10 +879,10 @@ uint8_t *mlt_frame_resize_yuv422( mlt_frame this, int owidth, int oheight )
 		mlt_properties_set_int( properties, "height", oheight );
 
 		// We should resize the alpha too
-		alpha = mlt_resize_alpha( alpha, owidth, oheight, iwidth, iheight );
+		alpha = mlt_resize_alpha( alpha, owidth, oheight, iwidth, iheight, alpha_value );
 		if ( alpha != NULL )
 		{
-			mlt_properties_set_data( properties, "alpha", alpha, owidth * ( oheight + 1 ), ( mlt_destructor )mlt_pool_release, NULL );
+			mlt_properties_set_data( properties, "alpha", alpha, owidth * oheight, ( mlt_destructor )mlt_pool_release, NULL );
 			this->get_alpha_mask = NULL;
 		}
 
@@ -1004,6 +1028,15 @@ int mlt_frame_mix_audio( mlt_frame this, mlt_frame that, float weight_start, flo
 	float weight = weight_start;
 	float weight_step = ( weight_end - weight_start ) / *samples;
 
+	if ( src == dest )
+	{
+		*samples = samples_src;
+		*channels = channels_src;
+		*buffer = src;
+		*frequency = frequency_src;
+		return ret;
+	}
+
 	// Mixdown
 	for ( i = 0; i < *samples; i++ )
 	{
@@ -1021,6 +1054,71 @@ int mlt_frame_mix_audio( mlt_frame this, mlt_frame that, float weight_start, flo
 	return ret;
 }
 
+// Replacement for broken mlt_frame_audio_mix - this filter uses an inline low pass filter
+// to allow mixing without volume hacking
+int mlt_frame_combine_audio( mlt_frame this, mlt_frame that, int16_t **buffer, mlt_audio_format *format, int *frequency, int *channels, int *samples )
+{
+	int ret = 0;
+	int16_t *src, *dest;
+	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 vp[ 6 ];
+	double b_weight = 1.0;
+
+	if ( mlt_properties_get_int( MLT_FRAME_PROPERTIES( this ), "meta.mixdown" ) )
+		b_weight = 1.0 - mlt_properties_get_double( MLT_FRAME_PROPERTIES( this ), "meta.volume" );
+
+	mlt_frame_get_audio( that, &src, format, &frequency_src, &channels_src, &samples_src );
+	mlt_frame_get_audio( this, &dest, format, &frequency_dest, &channels_dest, &samples_dest );
+
+	int silent = mlt_properties_get_int( MLT_FRAME_PROPERTIES( this ), "silent_audio" );
+	mlt_properties_set_int( MLT_FRAME_PROPERTIES( this ), "silent_audio", 0 );
+	if ( silent )
+		memset( dest, 0, samples_dest * channels_dest * sizeof( int16_t ) );
+
+	silent = mlt_properties_get_int( MLT_FRAME_PROPERTIES( that ), "silent_audio" );
+	mlt_properties_set_int( MLT_FRAME_PROPERTIES( that ), "silent_audio", 0 );
+	if ( silent )
+		memset( src, 0, samples_src * channels_src * sizeof( int16_t ) );
+
+	if ( src == dest )
+	{
+		*samples = samples_src;
+		*channels = channels_src;
+		*buffer = src;
+		*frequency = frequency_src;
+		return ret;
+	}
+
+	// determine number of samples to process
+	*samples = samples_src < samples_dest ? samples_src : samples_dest;
+	*channels = channels_src < channels_dest ? channels_src : channels_dest;
+	*buffer = dest;
+	*frequency = frequency_dest;
+
+	for ( j = 0; j < *channels; j++ )
+		vp[ j ] = ( double )dest[ j ];
+
+ 	double Fc = 0.5;
+ 	double B = exp(-2.0 * M_PI * Fc);
+	double A = 1.0 - B;
+	double v;
+	
+	for ( i = 0; i < *samples; i++ )
+	{
+		for ( j = 0; j < *channels; j++ )
+		{
+			v = ( double )( b_weight * dest[ i * channels_dest + j ] + src[ i * channels_src + j ] );
+			v = v < -32767 ? -32767 : v > 32768 ? 32768 : v;
+			vp[ j ] = dest[ i * channels_dest + j ] = ( int16_t )( v * A + vp[ j ] * B );
+		}
+	}
+
+	return ret;
+}
+
 /* Will this break when mlt_position is converted to double? -Zach */
 int mlt_sample_calculator( float fps, int frequency, int64_t position )
 {