X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Ffilter_resize.c;h=2e79ab5d8ab5d56e57c342889fa116afc5f44da0;hb=bf3264b9e340ba5c11cbf59835a8af3db94e0cc2;hp=d245ed0d409b4f915f315f7446c5a82f1e74c27a;hpb=e48990e98a385144481adfb64405e2a9d07de3a2;p=melted diff --git a/src/modules/core/filter_resize.c b/src/modules/core/filter_resize.c index d245ed0..2e79ab5 100644 --- a/src/modules/core/filter_resize.c +++ b/src/modules/core/filter_resize.c @@ -3,19 +3,19 @@ * Copyright (C) 2003-2004 Ushodaya Enterprises Limited * Author: Charles Yates * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "filter_resize.h" @@ -25,6 +25,17 @@ #include #include #include +#include + +/** Swapbytes inline. +*/ + +static inline void swap_bytes( uint8_t *upper, uint8_t *lower ) +{ + uint8_t t = *lower; + *lower = *upper; + *upper = t; +} /** Do it :-). */ @@ -39,10 +50,20 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format * // Pop the top of stack now mlt_filter filter = mlt_frame_pop_service( this ); + // Retrieve the aspect ratio + double aspect_ratio = mlt_deque_pop_back_double( MLT_FRAME_IMAGE_STACK( this ) ); + // Assign requested width/height from our subordinate int owidth = *width; int oheight = *height; + // Check for the special case - no aspect ratio means no problem :-) + if ( aspect_ratio == 0.0 ) + aspect_ratio = mlt_properties_get_double( properties, "consumer_aspect_ratio" ); + + // Reset the aspect ratio + mlt_properties_set_double( properties, "aspect_ratio", aspect_ratio ); + // Hmmm... char *rescale = mlt_properties_get( properties, "rescale.interp" ); if ( rescale != NULL && !strcmp( rescale, "none" ) ) @@ -59,30 +80,32 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format * 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 input_ar = aspect_ratio * 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 = input_ar / output_ar * normalised_width + 0.5; + int scaled_width = rint( 0.5 + ( input_ar * normalised_width ) / output_ar ); int scaled_height = normalised_height; // Now ensure that our images fit in the output frame if ( scaled_width > normalised_width ) { scaled_width = normalised_width; - scaled_height = output_ar / input_ar * normalised_height + 0.5; + scaled_height = rint( 0.5 + ( output_ar * normalised_height ) / input_ar ); } - + // Now calculate the actual image size that we want - owidth = scaled_width * owidth / normalised_width; - oheight = scaled_height * oheight / normalised_height; + owidth = rint( 0.5 + scaled_width * owidth / normalised_width ); + oheight = rint( 0.5 + scaled_height * oheight / normalised_height ); // Tell frame we have conformed the aspect to the consumer mlt_frame_set_aspect_ratio( this, mlt_properties_get_double( properties, "consumer_aspect_ratio" ) ); } + mlt_properties_set_int( properties, "distort", 0 ); + // Now pass on the calculations down the line mlt_properties_set_int( properties, "resize_width", *width ); mlt_properties_set_int( properties, "resize_height", *height ); @@ -96,28 +119,36 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format * // Get the requested scale operation char *op = mlt_properties_get( MLT_FILTER_PROPERTIES( filter ), "scale" ); + // Provides a manual override for misreported field order + if ( mlt_properties_get( properties, "meta.top_field_first" ) ) + mlt_properties_set( properties, "top_field_first", mlt_properties_get_int( properties, "meta.top_field_first" ) ); + // 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 ); - - // 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 ); + uint8_t *ptr = image + owidth * 2; + int h = oheight / 2; + int w = owidth; + + // Swap the lines around + while( h -- ) + { + w = owidth; + while( w -- ) + { + swap_bytes( image ++, ptr ++ ); + swap_bytes( image ++, ptr ++ ); + } + image += owidth * 2; + ptr += owidth * 2; + } // Set the normalised field order mlt_properties_set_int( properties, "top_field_first", 0 ); + mlt_properties_set_int( properties, "meta.top_field_first", 0 ); } if ( !strcmp( op, "affine" ) ) @@ -143,6 +174,9 @@ 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 ) { + // Store the aspect ratio reported by the source + mlt_deque_push_back_double( MLT_FRAME_IMAGE_STACK( frame ), mlt_frame_get_aspect_ratio( frame ) ); + // Push this on to the service stack mlt_frame_push_service( frame, this );