X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Ffilter_resize.c;h=435cf12767e869af13ae471474f5ddfe6dec22a7;hb=3f7c53230945e427b019ba5df4fec587e19e29c1;hp=7e7fac3a26c603441ac33abd443f30206afb059e;hpb=6ff5549dc913d3976ef611d4c056b0fcb5d520e5;p=melted diff --git a/src/modules/core/filter_resize.c b/src/modules/core/filter_resize.c index 7e7fac3..435cf12 100644 --- a/src/modules/core/filter_resize.c +++ b/src/modules/core/filter_resize.c @@ -26,22 +26,19 @@ #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 :-). */ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable ) { + int error = 0; + // 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; @@ -56,32 +53,25 @@ 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; // 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 ) - { - scaled_width = input_ar / output_ar * normalised_width; - scaled_height = normalised_height; - } - //fprintf( stderr, "resize: %dx%d from %dx%d input aspect %f output aspect %f\n", - // scaled_width, scaled_height, normalised_width, normalised_height, input_ar, output_ar ); - -#if 0 - int real_width = get_value( properties, "real_height", "height" ); - int real_height = get_value( properties, "real_height", "height" ); - // DRD> Why? - if ( ( real_height * 2 ) == normalised_height ) + // Now ensure that our images fit in the output frame + if ( scaled_width > normalised_width ) { scaled_width = normalised_width; - scaled_height = normalised_height; + scaled_height = output_ar / input_ar * normalised_height + 0.5; } -#endif // Now calculate the actual image size that we want owidth = scaled_width * owidth / normalised_width; @@ -96,39 +86,51 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format * mlt_properties_set_int( properties, "resize_height", *height ); // Now get the image - mlt_frame_get_image( this, image, format, &owidth, &oheight, writable ); - - // Correct field order if needed - if ( mlt_properties_get_int( properties, "top_field_first" ) == 1 ) + 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 ) { - // Get the input image, width and height - int size; - uint8_t *image = mlt_properties_get_data( properties, "image", &size ); + // Get the requested scale operation + char *op = mlt_properties_get( mlt_filter_properties( filter ), "scale" ); - // Keep the original image around to be destroyed on frame close - mlt_properties_rename( properties, "image", "original_image" ); + // Correct field order if needed + if ( mlt_properties_get_int( properties, "top_field_first" ) == 1 ) + { + // Get the input image, width and height + int size; + uint8_t *image = mlt_properties_get_data( properties, "image", &size ); - // Offset the image pointer by one line - image += owidth * 2; - size -= owidth * 2; + // Keep the original image around to be destroyed on frame close + mlt_properties_rename( properties, "image", "original_image" ); - // Set the new image pointer with no destructor - mlt_properties_set_data( properties, "image", image, size, NULL, NULL ); + // Offset the image pointer by one line + image += owidth * 2; + size -= owidth * 2; - // Set the normalised field order - mlt_properties_set_int( properties, "top_field_first", 0 ); - } + // Set the new image pointer with no destructor + mlt_properties_set_data( properties, "image", image, size, NULL, NULL ); - if ( !strcmp( mlt_properties_get( properties, "resize.scale" ), "affine" ) ) - *image = mlt_frame_rescale_yuv422( this, *width, *height ); - else if ( strcmp( mlt_properties_get( properties, "resize.scale" ), "none" ) != 0 ) - *image = mlt_frame_resize_yuv422( this, *width, *height ); - else - { - *width = owidth; - *height = oheight; + // Set the normalised field order + mlt_properties_set_int( properties, "top_field_first", 0 ); + } + + if ( !strcmp( op, "affine" ) ) + { + *image = mlt_frame_rescale_yuv422( this, *width, *height ); + } + else if ( strcmp( op, "none" ) != 0 ) + { + *image = mlt_frame_resize_yuv422( this, *width, *height ); + } + else + { + *width = owidth; + *height = oheight; + } } - return 0; + + return error; } /** Filter processing. @@ -136,8 +138,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; } @@ -150,11 +156,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; } -