X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fgtk2%2Ffilter_rescale.c;h=92b2b7b6713c9de90daae075afd9204f622f9d82;hb=f9ae36b8488bf8f32a40d482171df888913e28cd;hp=f70c039cfa4563476be1827efa021e05630e7e7c;hpb=0b288164cbeb9a3c98107d439d86844be13ba910;p=melted

diff --git a/src/modules/gtk2/filter_rescale.c b/src/modules/gtk2/filter_rescale.c
index f70c039..92b2b7b 100644
--- 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;
@@ -63,8 +65,17 @@ 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 );
@@ -91,6 +102,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 );
@@ -205,15 +223,11 @@ static mlt_frame filter_process( mlt_filter this, mlt_frame frame )
 
 mlt_filter filter_rescale_init( char *arg )
 {
-	mlt_filter this = calloc( sizeof( struct mlt_filter_s ), 1 );
-	if ( mlt_filter_init( this, this ) == 0 )
+	mlt_filter this = mlt_filter_new( );
+	if ( this != NULL )
 	{
 		this->process = filter_process;
-		if ( arg != NULL )
-			mlt_properties_set( mlt_filter_properties( this ), "interpolation", arg );
-		else
-			mlt_properties_set( mlt_filter_properties( this ), "interpolation", "bilinear" );
+		mlt_properties_set( mlt_filter_properties( this ), "interpolation", arg == NULL ? "bilinear" : arg );
 	}
 	return this;
 }
-