X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Ffilter_resize.c;h=6b29d98c5da1bf1869eaca8fbfda7771d030c8a5;hb=9671ab81bdb3a86155fbf8627e06f6de18e93fff;hp=1ebb7419b5b8b0c317b2b605587fb8692138cf46;hpb=e4c9ccbcef39cadaccbad655bc6e36e825bf3dde;p=melted

diff --git a/src/modules/core/filter_resize.c b/src/modules/core/filter_resize.c
index 1ebb741..6b29d98 100644
--- a/src/modules/core/filter_resize.c
+++ b/src/modules/core/filter_resize.c
@@ -22,21 +22,111 @@
 
 #include <framework/mlt_frame.h>
 
+#include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 
+static int get_value( mlt_properties properties, char *preferred, char *fallback )
+{
+	int value = mlt_properties_get_int( properties, preferred );
+	if ( value == 0 )
+		value = mlt_properties_get_int( properties, fallback );
+	return value;
+}
+
 /** Do it :-).
 */
 
 static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable )
 {
+	// Get the properties from the frame
+	mlt_properties properties = mlt_frame_properties( this );
+
+	// Assign requested width/height from our subordinate
 	int owidth = *width;
 	int oheight = *height;
-	mlt_frame_get_image( this, image, format, &owidth, &oheight, 0 );
-	if ( !strcmp( mlt_properties_get( mlt_frame_properties( this ), "resize.scale" ), "affine" ) )
+
+	// Hmmm...
+	char *rescale = mlt_properties_get( properties, "rescale.interp" );
+	if ( rescale != NULL && !strcmp( rescale, "none" ) )
+		return mlt_frame_get_image( this, image, format, width, height, writable );
+
+	if ( mlt_properties_get( properties, "distort" ) == NULL )
+	{
+		// Now do additional calcs based on real_width/height etc
+		int normalised_width = mlt_properties_get_int( properties, "normalised_width" );
+		int normalised_height = mlt_properties_get_int( properties, "normalised_height" );
+		int real_width = get_value( properties, "real_width", "width" );
+		int real_height = get_value( properties, "real_height", "height" );
+		double input_ar = mlt_frame_get_aspect_ratio( this );
+		double output_ar = mlt_properties_get_double( properties, "consumer_aspect_ratio" );
+		int scaled_width = ( input_ar > output_ar ? input_ar / output_ar : output_ar / input_ar ) * real_width;
+		int scaled_height = ( input_ar > output_ar ? input_ar / output_ar : output_ar / input_ar ) * real_height;
+
+		// Now ensure that our images fit in the normalised frame
+		if ( scaled_width > normalised_width )
+		{
+			scaled_height = scaled_height * normalised_width / scaled_width;
+			scaled_width = normalised_width;
+		}
+		if ( scaled_height > normalised_height )
+		{
+			scaled_width = scaled_width * normalised_height / scaled_height;
+			scaled_height = normalised_height;
+		}
+
+		if ( input_ar == output_ar && scaled_height == normalised_height )
+		{
+			scaled_width = normalised_width;
+		}
+		else if ( ( real_height * 2 ) == normalised_height )
+		{
+			scaled_width = normalised_width;
+			scaled_height = normalised_height;
+		}
+	
+		// Now calculate the actual image size that we want
+		owidth = scaled_width * owidth / normalised_width;
+		oheight = scaled_height * oheight / normalised_height;
+	}
+
+	// Now pass on the calculations down the line
+	mlt_properties_set_int( properties, "resize_width", *width );
+	mlt_properties_set_int( properties, "resize_height", *height );
+
+	// Now get the image
+	mlt_frame_get_image( this, image, format, &owidth, &oheight, writable );
+	
+	// Correct field order if needed
+	if ( mlt_properties_get_int( properties, "top_field_first" ) == 1 )
+	{
+		// Get the input image, width and height
+		int size;
+		uint8_t *image = mlt_properties_get_data( properties, "image", &size );
+
+		// Keep the original image around to be destroyed on frame close
+		mlt_properties_rename( properties, "image", "original_image" );
+
+		// 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 );
+
+		// Set the normalised field order
+		mlt_properties_set_int( properties, "top_field_first", 0 );
+	}
+
+	if ( !strcmp( mlt_properties_get( properties, "resize.scale" ), "affine" ) )
 		*image = mlt_frame_rescale_yuv422( this, *width, *height );
-	else
+	else if ( strcmp( mlt_properties_get( properties, "resize.scale" ), "none" ) != 0 )
 		*image = mlt_frame_resize_yuv422( this, *width, *height );
+	else
+	{
+		*width = owidth;
+		*height = oheight;
+	}
 	return 0;
 }
 
@@ -53,13 +143,16 @@ static mlt_frame filter_process( mlt_filter this, mlt_frame frame )
 /** Constructor for the filter.
 */
 
-mlt_filter filter_resize_init( void *arg )
+mlt_filter filter_resize_init( char *arg )
 {
 	mlt_filter this = calloc( sizeof( struct mlt_filter_s ), 1 );
 	if ( mlt_filter_init( this, this ) == 0 )
 	{
 		this->process = filter_process;
-		mlt_properties_set( mlt_filter_properties( this ), "scale", "off" );
+		if ( arg != NULL )
+			mlt_properties_set( mlt_filter_properties( this ), "scale", arg );
+		else
+			mlt_properties_set( mlt_filter_properties( this ), "scale", "off" );
 	}
 	return this;
 }