X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Ftransition_composite.c;h=e7376718ae172c9cf47d65d7cbd7981bf131268d;hb=dcec48366f9349da4bab349a2945bdd8cca18b81;hp=5a0db4ddb0d544b94c4bddaefbc5d9bea9d3ba06;hpb=cc7993dc7fdb45803bbd689573b623aa554929ec;p=melted

diff --git a/src/modules/core/transition_composite.c b/src/modules/core/transition_composite.c
index 5a0db4d..e737671 100644
--- a/src/modules/core/transition_composite.c
+++ b/src/modules/core/transition_composite.c
@@ -546,8 +546,8 @@ static int composite_yuv( uint8_t *p_dest, int width_dest, int height_dest, uint
 	int y = geometry.y * height_dest / geometry.nh;
 
 	// Align x to a full YUYV group
-	x &= 0xfffffffe;
-	width_src &= 0xfffffffe;
+	x = ( x | 1 ) ^ 1;
+	width_src = ( width_src | 1 ) ^ 1;
 
 	// optimization points - no work to do
 	if ( width_src <= 0 || height_src <= 0 )
@@ -573,6 +573,7 @@ static int composite_yuv( uint8_t *p_dest, int width_dest, int height_dest, uint
 	{
 		y_src = -y;
 		height_src -= y_src;
+		y = 0;
 	}
 	
 	// crop overlay below bottom edge of frame
@@ -845,7 +846,7 @@ static int get_b_frame_image( mlt_transition this, mlt_frame b_frame, uint8_t **
 	*width = geometry->sw * *width / geometry->nw;
 	*height = geometry->sh * *height / geometry->nh;
 
-	x &= 0xfffffffe;
+	x = ( x | 1 ) ^ 1;
 
 	// optimization points - no work to do
 	if ( *width < 1 || *height < 1 )
@@ -896,6 +897,16 @@ static struct geometry_s *composite_calculate( struct geometry_s *result, mlt_tr
 	return start;
 }
 
+static inline void inline_memcpy( uint8_t *dest, uint8_t *src, int length )
+{
+	uint8_t *end = src + length;
+	while ( src < end )
+	{
+		*dest ++ = *src ++;
+		*dest ++ = *src ++;
+	}
+}
+
 mlt_frame composite_copy_region( mlt_transition this, mlt_frame a_frame, mlt_position frame_position )
 {
 	// Create a frame to return
@@ -941,8 +952,17 @@ mlt_frame composite_copy_region( mlt_transition this, mlt_frame a_frame, mlt_pos
 	w = result.w * width / result.nw;
 	h = result.h * height / result.nh;
 
-	x &= 0xfffffffe;
-	w &= 0xfffffffe;
+	if ( y < 0 )
+	{
+		h = h + y;
+		y = 0;
+	}
+
+	if ( y + h > height )
+		h = height - y;
+
+	x = ( x | 1 ) ^ 1;
+	w = ( w | 1 ) ^ 1;
 
 	// Now we need to create a new destination image
 	dest = mlt_pool_alloc( w * h * 2 );
@@ -954,7 +974,7 @@ mlt_frame composite_copy_region( mlt_transition this, mlt_frame a_frame, mlt_pos
 
 	while ( q < r )
 	{
-		memcpy( q, p, w * 2 );
+		inline_memcpy( q, p, w * 2 );
 		q += w * 2;
 		p += width * 2;
 	}