X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_frame.c;h=dd179837a149001ed6ac8e25790efce5972083d1;hb=9390e8b584f3f717f0a326893c0e37cf187a0a51;hp=69c717bf2c740e07d9b73a7b47e025d9b3f6d8aa;hpb=7da5daf600f8b97781d85a137c3aa81effb7e610;p=melted

diff --git a/src/framework/mlt_frame.c b/src/framework/mlt_frame.c
index 69c717b..dd17983 100644
--- a/src/framework/mlt_frame.c
+++ b/src/framework/mlt_frame.c
@@ -394,15 +394,18 @@ int mlt_convert_yuv420p_to_yuv422( uint8_t *yuv420p, int width, int height, int
 int mlt_frame_composite_yuv( mlt_frame this, mlt_frame that, int x, int y, float weight )
 {
 	int ret = 0;
-	int x_start = 0;
 	int width_src, height_src;
 	int width_dest, height_dest;
 	mlt_image_format format_src, format_dest;
 	uint8_t *p_src, *p_dest;
-	int x_end;
 	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;
@@ -410,52 +413,68 @@ int mlt_frame_composite_yuv( mlt_frame this, mlt_frame that, int x, int y, float
 	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 */ );
 	
-	x_end = width_src;
-	
 	stride_src = width_src * 2;
 	stride_dest = width_dest * 2;
-	uint8_t *lower = p_dest;
-	uint8_t *upper = p_dest + height_dest * stride_dest;
-
-	p_dest += ( y * stride_dest ) + ( x * 2 );
-
+	
+	// crop overlay off the left edge of frame
 	if ( x < 0 )
 	{
-		x_start = -x;
-		x_end += x_start;
+		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;
 
-	uint8_t *z = mlt_frame_get_alpha_mask( that );
+	// 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;
+
+	// now do the compositing only to cropped extents
 	for ( i = 0; i < height_src; i++ )
 	{
 		uint8_t *p = p_src;
 		uint8_t *q = p_dest;
 		uint8_t *o = p_dest;
+		uint8_t *z = p_alpha;
 
 		for ( j = 0; j < width_src; j ++ )
 		{
-			if ( q >= lower && q < upper && j >= x_start && j < x_end )
-			{
 				uint8_t y = *p ++;
 				uint8_t uv = *p ++;
 				uint8_t a = ( z == NULL ) ? 255 : *z ++;
 				float value = ( weight * ( float ) a / 255.0 );
 				*o ++ = (uint8_t)( y * value + *q++ * ( 1 - value ) );
 				*o ++ = (uint8_t)( uv * value + *q++ * ( 1 - value ) );
-			}
-			else
-			{
-				p += 2;
-				o += 2;
-				q += 2;
-				if ( z != NULL )
-					z += 1;
-			}
 		}
 
 		p_src += stride_src;
 		p_dest += stride_dest;
+		if ( p_alpha )
+			p_alpha += stride_src / 2;
 	}
 
 	return ret;
@@ -475,6 +494,11 @@ void mlt_resize_yuv422( uint8_t *output, int owidth, int oheight, uint8_t *input
 	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;
 
@@ -486,7 +510,7 @@ void mlt_resize_yuv422( uint8_t *output, int owidth, int oheight, uint8_t *input
 
    	// 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 * ( iheight / 2 ) + ( iwidth / 2 ) * 2;
@@ -506,8 +530,8 @@ void mlt_resize_yuv422( uint8_t *output, int owidth, int oheight, uint8_t *input
 			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, 4 * in_x_range );
-			out_ptr += 4 * in_x_range;
+			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 );
@@ -586,6 +610,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;
 
@@ -633,7 +659,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 - 2 * ( x & 1 );
+					in_ptr = in_line + ( dx >> 1 ) * 4 + 2 * ( x & 1 );
                 	*out_ptr ++ = *in_ptr ++;
                 	*out_ptr ++ = *in_ptr ++;
             	}