hold modifications and test card env var

[mlt] / src / modules / gtk2 / filter_rescale.c

diff --git a/src/modules/gtk2/filter_rescale.c b/src/modules/gtk2/filter_rescale.c
index f4c69ace4575162e48749b60ae1d44014db36ce6..f9789a6efc254c4d16b37286da2d4b401a2e702f 100644 (file)
--- a/src/modules/gtk2/filter_rescale.c
+++ b/src/modules/gtk2/filter_rescale.c
@@ -38,6 +38,8 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *
                *width = 720;
        if ( *height == 0 )
                *height = 576;
+       if ( *width < 2 || *height < 6 )
+               return 1;
 
        mlt_properties properties = mlt_frame_properties( this );
        int iwidth = *width;
@@ -48,13 +50,6 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *
        char *interps = mlt_properties_get( properties, "rescale.interp" );
        int interp = PIXOPS_INTERP_BILINEAR;
        
-       if ( strcmp( interps, "nearest" ) == 0 )
-               interp = PIXOPS_INTERP_NEAREST;
-       else if ( strcmp( interps, "tiles" ) == 0 )
-               interp = PIXOPS_INTERP_TILES;
-       else if ( strcmp( interps, "hyper" ) == 0 )
-               interp = PIXOPS_INTERP_HYPER;
-
        // If real_width/height exist, we want that as minimum information
        if ( mlt_properties_get_int( properties, "real_width" ) )
        {
@@ -63,12 +58,31 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *
        }
 
        // Let the producer know what we are actually requested to obtain
-       mlt_properties_set_int( properties, "rescale_width", *width );
-       mlt_properties_set_int( properties, "rescale_height", *height );
+       if ( *format == mlt_image_yuv422 && strcmp( interps, "none" ) )
+       {
+               mlt_properties_set_int( properties, "rescale_width", *width );
+               mlt_properties_set_int( properties, "rescale_height", *height );
+       }
+       else
+       {
+               // When no scaling is requested, revert the requested dimensions if possible
+               mlt_properties_set_int( properties, "rescale_width", ( iwidth / 2 ) * 2 );
+               mlt_properties_set_int( properties, "rescale_height", ( iheight / 2 ) * 2 );
+       }
 
        // Get the image as requested
        mlt_frame_get_image( this, &input, format, &iwidth, &iheight, writable );
 
+       // Get rescale interpretation again, in case the producer wishes to override scaling
+       interps = mlt_properties_get( properties, "rescale.interp" );
+
+       if ( strcmp( interps, "nearest" ) == 0 )
+               interp = PIXOPS_INTERP_NEAREST;
+       else if ( strcmp( interps, "tiles" ) == 0 )
+               interp = PIXOPS_INTERP_TILES;
+       else if ( strcmp( interps, "hyper" ) == 0 )
+               interp = PIXOPS_INTERP_HYPER;
+
        if ( input != NULL )
        {
                // If width and height are correct, don't do anything
@@ -91,6 +105,13 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *
                        // Return the output
                        *image = output;
                }
+               else if ( *format == mlt_image_yuv422 && !strcmp( interps, "none" ) )
+               {
+                       // Do nothing
+                       *width = iwidth;
+                       *height = iheight;
+                       *image = input;
+               }
                else if ( *format == mlt_image_rgb24 || *format == mlt_image_rgb24a )
                {
                        int bpp = (*format == mlt_image_rgb24a ? 4 : 3 );
@@ -213,4 +234,3 @@ mlt_filter filter_rescale_init( char *arg )
        }
        return this;
 }
-