X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_frame.c;h=368e861291ca6dd4f4bd9810191d7a160cb78f5f;hb=ba935b798fa57c7541cfa274021c330d1cdf7874;hp=f0b9351110cc89e27b2d0300c3de8f3c6a297eff;hpb=c9e2414c3588e554db5fc94d268bc0c9de3dba30;p=melted

diff --git a/src/framework/mlt_frame.c b/src/framework/mlt_frame.c
index f0b9351..368e861 100644
--- a/src/framework/mlt_frame.c
+++ b/src/framework/mlt_frame.c
@@ -362,6 +362,35 @@ int mlt_convert_rgb24_to_yuv422( uint8_t *rgb, int width, int height, int stride
 	return ret;
 }
 
+int mlt_convert_yuv420p_to_yuv422( uint8_t *yuv420p, int width, int height, int stride, uint8_t *yuv )
+{
+	int ret = 0;
+	register int i, j;
+
+	int half = width >> 1;
+
+	uint8_t *Y = yuv420p;
+	uint8_t *U = Y + width * height;
+	uint8_t *V = U + width * height / 4;
+
+	register uint8_t *d = yuv;
+
+	for ( i = 0; i < height; i++ )
+	{
+		register uint8_t *u = U + ( i / 2 ) * ( half );
+		register uint8_t *v = V + ( i / 2 ) * ( half );
+
+		for ( j = 0; j < half; j++ )
+		{
+			*d ++ = *Y ++;
+			*d ++ = *u ++;
+			*d ++ = *Y ++;
+			*d ++ = *v ++;
+		}
+	}
+	return ret;
+}
+
 int mlt_frame_composite_yuv( mlt_frame this, mlt_frame that, int x, int y, float weight )
 {
 	int ret = 0;
@@ -432,29 +461,43 @@ int mlt_frame_composite_yuv( mlt_frame this, mlt_frame that, int x, int y, float
 	return ret;
 }
 
+void *memfill( void *dst, void *src, int l, int elements )
+{
+	int i = 0;
+	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
 	int istride = iwidth * 2;
 	int ostride = owidth * 2;
 
+	iwidth = iwidth - ( iwidth % 4 );
+	owidth = owidth - ( owidth % 4 );
+	iheight = iheight - ( iheight % 2 );
+	oheight = oheight - ( oheight % 2 );
+
    	// Coordinates (0,0 is middle of output)
-   	int y, x;
+   	int y;
 
    	// Calculate ranges
    	int out_x_range = owidth / 2;
    	int out_y_range = oheight / 2;
-   	int in_x_range = iwidth / 2;
-   	int in_y_range = iheight / 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;
+   	uint8_t *out_ptr = out_line;
 
    	// Calculate a middle and possibly invalid pointer in the input
-   	uint8_t *in_middle = input + istride * in_y_range + in_x_range * 2;
-   	int in_line = - out_y_range * istride - out_x_range * 2;
-   	int in_ptr;
+   	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 };
 
    	// Loop for the entirety of our output height.
    	for ( y = - out_y_range; y < out_y_range ; y ++ )
@@ -462,33 +505,29 @@ void mlt_resize_yuv422( uint8_t *output, int owidth, int oheight, uint8_t *input
        	// Start at the beginning of the line
        	out_ptr = out_line;
 
-       	// Point the start of the current input line (NB: can be out of range)
-       	in_ptr = in_line;
-
-       	// Loop for the entirety of our output row.
-       	for ( x = - out_x_range; x < out_x_range; x ++ )
-       	{
-           	// Check if x and y are in the valid input range.
-           	if ( abs( x ) < in_x_range && abs( y ) < in_y_range  )
-           	{
-               	// We're in the input range for this row.
-               	*out_ptr ++ = *( in_middle + in_ptr ++ );
-               	*out_ptr ++ = *( in_middle + in_ptr ++ );
-           	}
-           	else
-           	{
-               	// We're not in the input range for this row.
-               	*out_ptr ++ = 16;
-               	*out_ptr ++ = 128;
-               	in_ptr += 2;
-           	}
-       	}
+		if ( abs( y ) < iheight / 2 )
+		{
+			// 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;
+
+			// Fill the outer part with black
+			out_ptr = memfill( out_ptr, black, 2, out_x_range - in_x_range );
+
+       		// Move to next input line
+       		in_line += istride;
+		}
+		else
+		{
+			// Fill whole line with black
+			out_ptr = memfill( out_ptr, black, 2, owidth );
+		}
 
        	// Move to next output line
        	out_line += ostride;
-
-       	// Move to next input line
-       	in_line += istride;
    	}
 }
 
@@ -552,6 +591,8 @@ uint8_t *mlt_frame_rescale_yuv422( mlt_frame this, int owidth, int oheight )
 		int istride = iwidth * 2;
 		int ostride = owidth * 2;
 
+		iwidth = iwidth - ( iwidth % 4 );
+
     	// Coordinates (0,0 is middle of output)
     	int y, x;
 
@@ -590,7 +631,7 @@ uint8_t *mlt_frame_rescale_yuv422( mlt_frame this, int owidth, int oheight )
         	in_line = in_middle + dy * istride;
 	
         	// Loop for the entirety of our output row.
-        	for ( x = - out_x_range; x < out_x_range; x += 2 )
+        	for ( x = - out_x_range; x < out_x_range; x += 1 )
         	{
 				// Calculated the derived x
 				dx = scale_width * x;
@@ -599,9 +640,7 @@ uint8_t *mlt_frame_rescale_yuv422( mlt_frame this, int owidth, int oheight )
             	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;
-                	*out_ptr ++ = *in_ptr ++;
-                	*out_ptr ++ = *in_ptr ++;
+					in_ptr = in_line + ( dx >> 1 ) * 4 - 2 * ( x & 1 );
                 	*out_ptr ++ = *in_ptr ++;
                 	*out_ptr ++ = *in_ptr ++;
             	}
@@ -610,8 +649,6 @@ uint8_t *mlt_frame_rescale_yuv422( mlt_frame this, int owidth, int oheight )
                 	// We're not in the input range for this row.
                 	*out_ptr ++ = 16;
                 	*out_ptr ++ = 128;
-                	*out_ptr ++ = 16;
-                	*out_ptr ++ = 128;
             	}
         	}