*width = 720;
if ( *height == 0 )
*height = 576;
+ if ( *width < 2 || *height < 6 )
+ return 1;
mlt_properties properties = mlt_frame_properties( this );
int iwidth = *width;
}
// 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 );
// 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 );
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;
}
-