+ Top field first correction (original approach would not have worked [mea culpa...

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

diff --git a/src/modules/core/filter_resize.c b/src/modules/core/filter_resize.c
index 8ad0210..f9f80df 100644 (file)
--- a/src/modules/core/filter_resize.c
+++ b/src/modules/core/filter_resize.c
@@ -25,6 +25,17 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+#include <math.h>
+
+/** Swapbytes inline.
+*/
+
+static inline void swap_bytes( uint8_t *upper, uint8_t *lower )
+{
+       uint8_t t = *lower;
+       *lower = *upper;
+       *upper = t;
+}
 
 /** Do it :-).
 */
@@ -75,19 +86,19 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *
                //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 * normalised_width ) / output_ar + 0.5;
+               int scaled_width = rint( 0.5 + ( input_ar * normalised_width ) / output_ar );
                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 * normalised_height ) / input_ar + 0.5;
+                       scaled_height = rint( 0.5 + ( output_ar * normalised_height ) / input_ar );
                }
 
                // Now calculate the actual image size that we want
-               owidth = scaled_width * owidth / normalised_width;
-               oheight = scaled_height * oheight / normalised_height;
+               owidth = rint( 0.5 + scaled_width * owidth / normalised_width );
+               oheight = rint( 0.5 + scaled_height * oheight / normalised_height );
 
                // Tell frame we have conformed the aspect to the consumer
                mlt_frame_set_aspect_ratio( this, mlt_properties_get_double( properties, "consumer_aspect_ratio" ) );
@@ -109,27 +120,31 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *
                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 )
+               if ( mlt_properties_get_int( properties, "top_field_first" ) == 1 || mlt_properties_get_int( properties, "meta.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" );
-
-                       // 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 );
+                       uint8_t *ptr = image + owidth * 2;
+                       int h = oheight / 2;
+                       int w = owidth;
+
+                       // Swap the lines around
+                       while( h -- )
+                       {
+                               w = owidth;
+                               while( w -- )
+                               {
+                                       swap_bytes( image ++, ptr ++ );
+                                       swap_bytes( image ++, ptr ++ );
+                               }
+                               image += owidth * 2;
+                               ptr += owidth * 2;
+                       }
 
                        // Set the normalised field order
                        mlt_properties_set_int( properties, "top_field_first", 0 );
+                       mlt_properties_set_int( properties, "meta.top_field_first", 0 );
                }
 
                if ( !strcmp( op, "affine" ) )