X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Ffilter_resize.c;h=627d9e0b933c1ee943f0d7dbb2c1d577bf36552c;hb=90da79f8e465d43102645de7323d15c12801515f;hp=60a288722442761a7af180470eda655db3206ddb;hpb=efe08354d45db7bf5478ffa17c35330a3e0d415c;p=melted diff --git a/src/modules/core/filter_resize.c b/src/modules/core/filter_resize.c index 60a2887..627d9e0 100644 --- a/src/modules/core/filter_resize.c +++ b/src/modules/core/filter_resize.c @@ -26,14 +26,6 @@ #include #include -static int get_value( mlt_properties properties, char *preferred, char *fallback ) -{ - int value = mlt_properties_get_int( properties, preferred ); - if ( value == 0 ) - value = mlt_properties_get_int( properties, fallback ); - return value; -} - /** Do it :-). */ @@ -44,6 +36,9 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format * // Get the properties from the frame mlt_properties properties = mlt_frame_properties( this ); + // Pop the top of stack now + mlt_filter filter = mlt_frame_pop_service( this ); + // Assign requested width/height from our subordinate int owidth = *width; int oheight = *height; @@ -58,18 +53,26 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format * // Normalise the input and out display aspect int normalised_width = mlt_properties_get_int( properties, "normalised_width" ); int normalised_height = mlt_properties_get_int( properties, "normalised_height" ); - double input_ar = mlt_frame_get_aspect_ratio( this ); - double output_ar = mlt_properties_get_double( properties, "consumer_aspect_ratio" ); + int real_width = mlt_properties_get_int( properties, "real_width" ); + int real_height = mlt_properties_get_int( properties, "real_height" ); + if ( real_width == 0 ) + 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 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 = normalised_width; - int scaled_height = output_ar / input_ar * normalised_height; + int scaled_width = input_ar / output_ar * normalised_width + 0.5; + int scaled_height = normalised_height; - // Now ensure that our images fit in the normalised frame - if ( scaled_height > normalised_height ) + // Now ensure that our images fit in the output frame + if ( scaled_width > normalised_width ) { - scaled_width = input_ar / output_ar * normalised_width; - scaled_height = normalised_height; + scaled_width = normalised_width; + scaled_height = output_ar / input_ar * normalised_height + 0.5; } // Now calculate the actual image size that we want @@ -77,7 +80,7 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format * oheight = scaled_height * oheight / normalised_height; // Tell frame we have conformed the aspect to the consumer - mlt_frame_set_aspect_ratio( this, output_ar ); + mlt_frame_set_aspect_ratio( this, mlt_properties_get_double( properties, "consumer_aspect_ratio" ) ); } // Now pass on the calculations down the line @@ -90,6 +93,9 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format * // We only know how to process yuv422 at the moment if ( error == 0 && *format == mlt_image_yuv422 ) { + // 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 ) { @@ -100,10 +106,13 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format * // 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 ); @@ -111,11 +120,11 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format * mlt_properties_set_int( properties, "top_field_first", 0 ); } - if ( !strcmp( mlt_properties_get( properties, "resize.scale" ), "affine" ) ) + if ( !strcmp( op, "affine" ) ) { *image = mlt_frame_rescale_yuv422( this, *width, *height ); } - else if ( strcmp( mlt_properties_get( properties, "resize.scale" ), "none" ) != 0 ) + else if ( strcmp( op, "none" ) != 0 ) { *image = mlt_frame_resize_yuv422( this, *width, *height ); } @@ -126,7 +135,7 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format * } } - return 0; + return error; } /** Filter processing. @@ -134,8 +143,12 @@ 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 ) { + // Push this on to the service stack + mlt_frame_push_service( frame, this ); + + // Push the get_image method on to the stack mlt_frame_push_get_image( frame, filter_get_image ); - mlt_properties_set( mlt_frame_properties( frame ), "resize.scale", mlt_properties_get( mlt_filter_properties( this ), "scale" ) ); + return frame; } @@ -148,11 +161,7 @@ mlt_filter filter_resize_init( char *arg ) if ( mlt_filter_init( this, this ) == 0 ) { this->process = filter_process; - if ( arg != NULL ) - mlt_properties_set( mlt_filter_properties( this ), "scale", arg ); - else - mlt_properties_set( mlt_filter_properties( this ), "scale", "off" ); + mlt_properties_set( mlt_filter_properties( this ), "scale", arg == NULL ? "off" : arg ); } return this; } -