fix broken aspect handling again

[melted] / src / modules / core / filter_resize.c

diff --git a/src/modules/core/filter_resize.c b/src/modules/core/filter_resize.c
index 537ce50..7e7fac3 100644 (file)
--- a/src/modules/core/filter_resize.c
+++ b/src/modules/core/filter_resize.c
@@ -26,22 +26,108 @@
 #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 ( *width == 0 )
-               *width = 720;
-       if ( *height == 0 )
-               *height = 576;
-       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 )
+       {
+               // 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" );
+               
+               // 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;
+
+               // Now ensure that our images fit in the normalised frame
+               if ( scaled_height > normalised_height )
+               {
+                       scaled_width = input_ar / output_ar * normalised_width;
+                       scaled_height = normalised_height;
+               }
+               //fprintf( stderr, "resize: %dx%d from %dx%d input aspect %f output aspect %f\n",
+               //      scaled_width, scaled_height, normalised_width, normalised_height, input_ar, output_ar );
+
+#if 0
+               int real_width = get_value( properties, "real_height", "height" );
+               int real_height = get_value( properties, "real_height", "height" );
+               // DRD> Why?
+               if ( ( real_height * 2 ) == normalised_height )
+               {
+                       scaled_width = normalised_width;
+                       scaled_height = normalised_height;
+               }
+#endif
+       
+               // Now calculate the actual image size that we want
+               owidth = scaled_width * owidth / normalised_width;
+               oheight = scaled_height * oheight / normalised_height;
+
+               // Tell frame we have conformed the aspect to the consumer
+               mlt_frame_set_aspect_ratio( this, output_ar );
+       }
+
+       // 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;
 }