X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Ffilter_resize.c;h=8ad0210f827d2775f666e8ccb40ebd8e370ddb54;hb=18deadc4f5b3c17c46055d16b78259c561772f29;hp=d245ed0d409b4f915f315f7446c5a82f1e74c27a;hpb=e48990e98a385144481adfb64405e2a9d07de3a2;p=melted

diff --git a/src/modules/core/filter_resize.c b/src/modules/core/filter_resize.c
index d245ed0..8ad0210 100644
--- a/src/modules/core/filter_resize.c
+++ b/src/modules/core/filter_resize.c
@@ -39,10 +39,20 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *
 	// Pop the top of stack now
 	mlt_filter filter = mlt_frame_pop_service( this );
 
+	// Retrieve the aspect ratio
+	double aspect_ratio = mlt_deque_pop_back_double( MLT_FRAME_IMAGE_STACK( this ) );
+
 	// Assign requested width/height from our subordinate
 	int owidth = *width;
 	int oheight = *height;
 
+	// Check for the special case - no aspect ratio means no problem :-)
+	if ( aspect_ratio == 0.0 )
+		aspect_ratio = mlt_properties_get_double( properties, "consumer_aspect_ratio" );
+
+	// Reset the aspect ratio
+	mlt_properties_set_double( properties, "aspect_ratio", aspect_ratio );
+
 	// Hmmm...
 	char *rescale = mlt_properties_get( properties, "rescale.interp" );
 	if ( rescale != NULL && !strcmp( rescale, "none" ) )
@@ -59,22 +69,22 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *
 			real_width = mlt_properties_get_int( properties, "width" );
 		if ( real_height == 0 )
 			real_height = mlt_properties_get_int( properties, "height" );
-		double input_ar = mlt_frame_get_aspect_ratio( this ) * real_width / real_height;
+		double input_ar = aspect_ratio * real_width / real_height;
 		double output_ar = mlt_properties_get_double( properties, "consumer_aspect_ratio" ) * owidth / oheight;
 		
 		//fprintf( stderr, "normalised %dx%d output %dx%d %f %f\n", normalised_width, normalised_height, owidth, oheight, ( float )output_ar, ( float )mlt_properties_get_double( properties, "consumer_aspect_ratio" ) * owidth / oheight );
 
 		// Optimised for the input_ar > output_ar case (e.g. widescreen on standard)
-		int scaled_width = input_ar / output_ar * normalised_width + 0.5;
+		int scaled_width = ( input_ar * normalised_width ) / output_ar + 0.5;
 		int scaled_height = normalised_height;
 
 		// Now ensure that our images fit in the output frame
 		if ( scaled_width > normalised_width )
 		{
 			scaled_width = normalised_width;
-			scaled_height = output_ar / input_ar * normalised_height + 0.5;
+			scaled_height = ( output_ar * normalised_height ) / input_ar + 0.5;
 		}
-	
+
 		// Now calculate the actual image size that we want
 		owidth = scaled_width * owidth / normalised_width;
 		oheight = scaled_height * oheight / normalised_height;
@@ -83,6 +93,8 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *
 		mlt_frame_set_aspect_ratio( this, mlt_properties_get_double( properties, "consumer_aspect_ratio" ) );
 	}
 
+	mlt_properties_set_int( properties, "distort", 0 );
+
 	// Now pass on the calculations down the line
 	mlt_properties_set_int( properties, "resize_width", *width );
 	mlt_properties_set_int( properties, "resize_height", *height );
@@ -143,6 +155,9 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *
 
 static mlt_frame filter_process( mlt_filter this, mlt_frame frame )
 {
+	// Store the aspect ratio reported by the source
+	mlt_deque_push_back_double( MLT_FRAME_IMAGE_STACK( frame ), mlt_frame_get_aspect_ratio( frame ) );
+
 	// Push this on to the service stack
 	mlt_frame_push_service( frame, this );