X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Ffilter_resize.c;h=ba27859b2947d3843594906ff4b4a18039e52980;hb=eae86b6ff2d11421e4839ffbe79c4c547d15751a;hp=4122d8f373a51d1ca091ac637d94aa229c2df26b;hpb=00db7ed91dfa61f9e144b6d5548350a5954deb61;p=melted

diff --git a/src/modules/core/filter_resize.c b/src/modules/core/filter_resize.c
index 4122d8f..ba27859 100644
--- a/src/modules/core/filter_resize.c
+++ b/src/modules/core/filter_resize.c
@@ -34,7 +34,7 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *
 	int error = 0;
 
 	// Get the properties from the frame
-	mlt_properties properties = mlt_frame_properties( this );
+	mlt_properties properties = MLT_FRAME_PROPERTIES( this );
 
 	// Pop the top of stack now
 	mlt_filter filter = mlt_frame_pop_service( this );
@@ -48,23 +48,31 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *
 	if ( rescale != NULL && !strcmp( rescale, "none" ) )
 		return mlt_frame_get_image( this, image, format, width, height, writable );
 
-	if ( mlt_properties_get( properties, "distort" ) == NULL )
+	if ( mlt_properties_get_int( properties, "distort" ) == 0 )
 	{
 		// Normalise the input and out display aspect
 		int normalised_width = mlt_properties_get_int( properties, "normalised_width" );
 		int normalised_height = mlt_properties_get_int( properties, "normalised_height" );
-		double input_ar = mlt_frame_get_aspect_ratio( this );
-		double output_ar = mlt_properties_get_double( properties, "consumer_aspect_ratio" );
+		int real_width = mlt_properties_get_int( properties, "real_width" );
+		int real_height = mlt_properties_get_int( properties, "real_height" );
+		if ( real_width == 0 )
+			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 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 = normalised_width;
-		int scaled_height = output_ar / input_ar * normalised_height;
+		int scaled_width = input_ar / output_ar * normalised_width + 0.5;
+		int scaled_height = normalised_height;
 
-		// Now ensure that our images fit in the normalised frame
-		if ( scaled_height > normalised_height )
+		// Now ensure that our images fit in the output frame
+		if ( scaled_width > normalised_width )
 		{
-			scaled_width = input_ar / output_ar * normalised_width;
-			scaled_height = normalised_height;
+			scaled_width = normalised_width;
+			scaled_height = output_ar / input_ar * normalised_height + 0.5;
 		}
 	
 		// Now calculate the actual image size that we want
@@ -72,7 +80,7 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *
 		oheight = scaled_height * oheight / normalised_height;
 
 		// Tell frame we have conformed the aspect to the consumer
-		mlt_frame_set_aspect_ratio( this, output_ar );
+		mlt_frame_set_aspect_ratio( this, mlt_properties_get_double( properties, "consumer_aspect_ratio" ) );
 	}
 
 	// Now pass on the calculations down the line
@@ -86,7 +94,7 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *
 	if ( error == 0 && *format == mlt_image_yuv422 )
 	{
 		// Get the requested scale operation
-		char *op = mlt_properties_get( mlt_filter_properties( filter ), "scale" );
+		char *op = mlt_properties_get( MLT_FILTER_PROPERTIES( filter ), "scale" );
 
 		// Correct field order if needed
 		if ( mlt_properties_get_int( properties, "top_field_first" ) == 1 )
@@ -98,10 +106,13 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *
 			// Keep the original image around to be destroyed on frame close
 			mlt_properties_rename( properties, "image", "original_image" );
 
+			// Duplicate the last line in the field to avoid artifact
+			memcpy( image + oheight * owidth * 2, image + oheight * owidth * 2 - owidth * 4, owidth * 2 );
+
 			// Offset the image pointer by one line
 			image += owidth * 2;
 			size -= owidth * 2;
-
+			
 			// Set the new image pointer with no destructor
 			mlt_properties_set_data( properties, "image", image, size, NULL, NULL );
 
@@ -124,7 +135,7 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *
 		}
 	}
 
-	return 0;
+	return error;
 }
 
 /** Filter processing.
@@ -150,8 +161,7 @@ mlt_filter filter_resize_init( char *arg )
 	if ( mlt_filter_init( this, this ) == 0 )
 	{
 		this->process = filter_process;
-		mlt_properties_set( mlt_filter_properties( this ), "scale", arg == NULL ? "off" : arg );
+		mlt_properties_set( MLT_FILTER_PROPERTIES( this ), "scale", arg == NULL ? "off" : arg );
 	}
 	return this;
 }
-