X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_frame.c;h=880cdef4395fa3b61bb9f52daea727ecb209320f;hb=0bd5d91026b8bd143f957f119d61d5fedd45cf70;hp=a598f4e76b226406a1099d8d2091ee6d089385d3;hpb=20b174a97de49eff52526ec3a8b3154d8e2ce815;p=melted

diff --git a/src/framework/mlt_frame.c b/src/framework/mlt_frame.c
index a598f4e..880cdef 100644
--- a/src/framework/mlt_frame.c
+++ b/src/framework/mlt_frame.c
@@ -662,14 +662,14 @@ uint8_t *mlt_frame_rescale_yuv422( mlt_frame this, int owidth, int oheight )
 		uint8_t *in_ptr;
 
 		// Generate the affine transform scaling values
-		float scale_width = ( float )iwidth / ( float )owidth;
-		float scale_height = ( float )iheight / ( float )oheight;
+		int scale_width = ( iwidth << 16 ) / owidth;
+		int scale_height = ( iheight << 16 ) / oheight;
 
     	// Loop for the entirety of our output height.
     	for ( y = - out_y_range; y < out_y_range ; y ++ )
     	{
 			// Calculate the derived y value
-			dy = scale_height * y;
+			dy = ( scale_height * y ) >> 16;
 
         	// Start at the beginning of the line
         	out_ptr = out_line;
@@ -681,23 +681,13 @@ uint8_t *mlt_frame_rescale_yuv422( mlt_frame this, int owidth, int oheight )
         	for ( x = - out_x_range; x < out_x_range; x += 1 )
         	{
 				// 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 * 2;
-                	*out_ptr ++ = *in_ptr ++;
-					in_ptr = in_line + ( ( dx >> 1 ) << 2 ) + ( ( x & 1 ) << 1 ) + 1;
-                	*out_ptr ++ = *in_ptr ++;
-            	}
-            	else
-            	{
-                	// We're not in the input range for this row.
-                	*out_ptr ++ = 16;
-                	*out_ptr ++ = 128;
-            	}
+				dx = ( scale_width * x ) >> 16;
+
+               	// We're in the input range for this row.
+				in_ptr = in_line + ( dx << 1 );
+               	*out_ptr ++ = *in_ptr ++;
+				in_ptr = in_line + ( ( dx >> 1 ) << 2 ) + ( ( x & 1 ) << 1 ) + 1;
+               	*out_ptr ++ = *in_ptr;
         	}
 
         	// Move to next output line
@@ -731,9 +721,9 @@ int mlt_frame_mix_audio( mlt_frame this, mlt_frame that, float weight, int16_t *
 	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 %lld\n", samples_dest, channels_dest, mlt_properties_get_position( mlt_frame_properties( this ), "position" ) );
+	//fprintf( stderr, "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, "frame src  samples %d channels %d\n", samples_src, channels_src );
 	src = p_src;
 	dest = p_dest;
 	if ( channels_src > 6 )