+ Meta override for field order misreporting/errors in encoders

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

diff --git a/src/modules/core/filter_resize.c b/src/modules/core/filter_resize.c
index 2315f780c354909c1896aca1ce6220dfbd651a32..81e850d5d73741cce78520eb874a28e626b04caa 100644 (file)
--- a/src/modules/core/filter_resize.c
+++ b/src/modules/core/filter_resize.c
@@ -25,6 +25,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+#include <math.h>
 
 /** Do it :-).
 */
@@ -39,16 +40,26 @@ 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" ) )
                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" );
@@ -59,30 +70,32 @@ 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 = 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 / input_ar * normalised_height + 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" ) );
        }
 
+       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 );
@@ -91,13 +104,13 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *
        error = mlt_frame_get_image( this, image, format, &owidth, &oheight, writable );
 
        // We only know how to process yuv422 at the moment
-       if ( error == 0 && *format == mlt_image_yuv422 )
+       if ( error == 0 && *format == mlt_image_yuv422 && *image != NULL )
        {
                // Get the requested scale operation
                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;
@@ -143,6 +156,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 );