X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Ffilter_rescale.c;h=25ca5fcff7d38ce347e7101ef7ba51f9c13bd184;hb=f4963a6aa07644399b273b5d2b1f9299c9047414;hp=e606a17461d0f08b1c46cd9b9dfb14f092fb46bb;hpb=4a39b72c5ac8fd2dd6db81a95eab08adde0491b9;p=melted diff --git a/src/modules/core/filter_rescale.c b/src/modules/core/filter_rescale.c index e606a17..25ca5fc 100644 --- a/src/modules/core/filter_rescale.c +++ b/src/modules/core/filter_rescale.c @@ -3,35 +3,37 @@ * Copyright (C) 2003-2004 Ushodaya Enterprises Limited * Author: Dan Dennedy * - * 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_rescale.h" - +#include #include #include #include #include +#include typedef int ( *image_scaler )( mlt_frame this, uint8_t **image, mlt_image_format iformat, mlt_image_format oformat, int iwidth, int iheight, int owidth, int oheight ); +static void scale_alpha( mlt_frame this, int iwidth, int iheight, int owidth, int oheight ); + static int filter_scale( mlt_frame this, uint8_t **image, mlt_image_format iformat, mlt_image_format oformat, int iwidth, int iheight, int owidth, int oheight ) { // Get the properties - mlt_properties properties = mlt_frame_properties( this ); + mlt_properties properties = MLT_FRAME_PROPERTIES( this ); // Get the rescaling interpolsation char *interps = mlt_properties_get( properties, "rescale.interp" ); @@ -44,6 +46,12 @@ static int filter_scale( mlt_frame this, uint8_t **image, mlt_image_format iform // Return the output *image = mlt_properties_get_data( properties, "image", NULL ); + + // Scale the alpha channel only if exists and not correct size + int alpha_size = 0; + mlt_properties_get_data( properties, "alpha", &alpha_size ); + if ( alpha_size > 0 && alpha_size != ( owidth * oheight ) ) + scale_alpha( this, iwidth, iheight, owidth, oheight ); } else if ( iformat == mlt_image_rgb24 || iformat == mlt_image_rgb24a ) { @@ -61,21 +69,23 @@ static int filter_scale( mlt_frame this, uint8_t **image, mlt_image_format iform uint8_t *alpha = mlt_pool_alloc( iwidth * ( iheight + 1 ) ); // Convert the image and extract alpha - mlt_convert_rgb24a_to_yuv422( *image, iwidth, iheight, iwidth * 2, output, alpha ); + mlt_convert_rgb24a_to_yuv422( *image, iwidth, iheight, iwidth * 4, output, alpha ); mlt_properties_set_data( properties, "alpha", alpha, iwidth * ( iheight + 1 ), ( mlt_destructor )mlt_pool_release, NULL ); + + scale_alpha( this, iwidth, iheight, owidth, oheight ); } else { // No alpha to extract - mlt_convert_rgb24_to_yuv422( *image, iwidth, iheight, iwidth * 2, output ); + mlt_convert_rgb24_to_yuv422( *image, iwidth, iheight, iwidth * 3, output ); } + mlt_properties_set_data( properties, "image", output, iwidth * ( iheight + 1 ) * 2, ( mlt_destructor )mlt_pool_release, NULL ); + // Scale the frame - mlt_frame_rescale_yuv422( this, owidth, oheight ); - - // Return the output - *image = mlt_properties_get_data( properties, "image", NULL ); + output = mlt_frame_rescale_yuv422( this, owidth, oheight ); + } else { @@ -89,6 +99,8 @@ static int filter_scale( mlt_frame this, uint8_t **image, mlt_image_format iform mlt_convert_rgb24a_to_yuv422( *image, owidth, oheight, owidth * 4, output, alpha ); mlt_properties_set_data( properties, "alpha", alpha, owidth * ( oheight + 1 ), ( mlt_destructor )mlt_pool_release, NULL ); + + scale_alpha( this, iwidth, iheight, owidth, oheight ); } else { @@ -110,59 +122,27 @@ static int filter_scale( mlt_frame this, uint8_t **image, mlt_image_format iform static void scale_alpha( mlt_frame this, int iwidth, int iheight, int owidth, int oheight ) { + // Scale the alpha + uint8_t *output = NULL; uint8_t *input = mlt_frame_get_alpha_mask( this ); - + if ( input != NULL ) { - uint8_t *output = mlt_pool_alloc( owidth * oheight ); - - // Derived coordinates - int dy, dx; - - // Calculate ranges - int out_x_range = owidth / 2; - int out_y_range = oheight / 2; - int in_x_range = iwidth / 2; - int in_y_range = iheight / 2; - - // Output pointers - register uint8_t *out_line = output; - register uint8_t *out_ptr; - - // Calculate a middle pointer - uint8_t *in_middle = input + iwidth * in_y_range + in_x_range; - uint8_t *in_line; - - // Generate the affine transform scaling values - register int scale_width = ( iwidth << 16 ) / owidth; - register int scale_height = ( iheight << 16 ) / oheight; - register int base = 0; - - int outer = out_x_range * scale_width; - int bottom = out_y_range * scale_height; - - // Loop for the entirety of our output height. - for ( dy = - bottom; dy < bottom; dy += scale_height ) - { - // Start at the beginning of the line - out_ptr = out_line; - - // Pointer to the middle of the input line - in_line = in_middle + ( dy >> 16 ) * iwidth; - - // Loop for the entirety of our output row. - for ( dx = - outer; dx < outer; dx += scale_width ) - { - base = dx >> 15; - *out_ptr ++ = *( in_line + base ); - } - - // Move to next output line - out_line += owidth; - } - - this->get_alpha_mask = NULL; - mlt_properties_set_data( mlt_frame_properties( this ), "alpha", output, 0, mlt_pool_release, NULL ); + uint8_t *out_line; + int x, y; + int ox = ( iwidth << 10 ) / owidth; + int oy = ( iheight << 10 ) / oheight; + + output = mlt_pool_alloc( owidth * oheight ); + out_line = output; + + // Loop for the entirety of our output height. + for ( y = 0; y < oheight; y ++ ) + for ( x = 0; x < owidth; x ++ ) + *out_line ++ = *( input + ( ( 512 + ( y * oy * iwidth ) + x * ox ) >> 10 ) ); + + // Set it back on the frame + mlt_properties_set_data( MLT_FRAME_PROPERTIES( this ), "alpha", output, owidth * oheight, mlt_pool_release, NULL ); } } @@ -172,13 +152,13 @@ static void scale_alpha( mlt_frame this, int iwidth, int iheight, int owidth, in static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable ) { // Get the frame properties - mlt_properties properties = mlt_frame_properties( this ); + mlt_properties properties = MLT_FRAME_PROPERTIES( this ); // Get the filter from the stack mlt_filter filter = mlt_frame_pop_service( this ); // Get the filter properties - mlt_properties filter_properties = mlt_filter_properties( filter ); + mlt_properties filter_properties = MLT_FILTER_PROPERTIES( filter ); // Get the image scaler method image_scaler scaler_method = mlt_properties_get_data( filter_properties, "method", NULL ); @@ -203,7 +183,7 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format * // Default from the scaler if not specifed on the frame if ( interps == NULL ) { - interps = mlt_properties_get( mlt_filter_properties( filter ), "interpolation" ); + interps = mlt_properties_get( MLT_FILTER_PROPERTIES( filter ), "interpolation" ); mlt_properties_set( properties, "rescale.interp", interps ); } @@ -223,10 +203,15 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format * 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_width", iwidth ); mlt_properties_set_int( properties, "rescale_height", iheight ); } - + + // Deinterlace if height is changing to prevent fields mixing on interpolation + // One exception: non-interpolated, integral scaling + if ( iheight != oheight && ( strcmp( interps, "nearest" ) || ( iheight % oheight != 0 ) ) ) + mlt_properties_set_int( properties, "consumer_deinterlace", 1 ); + // Get the image as requested mlt_frame_get_image( this, image, format, &iwidth, &iheight, writable ); @@ -247,9 +232,6 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format * scaler_method( this, image, *format, mlt_image_yuv422, iwidth, iheight, owidth, oheight ); *width = owidth; *height = oheight; - - // Scale the alpha - scale_alpha( this, iwidth, iheight, owidth, oheight ); } else if ( *format == mlt_image_rgb24 && wanted_format == mlt_image_rgb24 ) { @@ -259,9 +241,6 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format * // Return the output *width = owidth; *height = oheight; - - // Scale the alpha - scale_alpha( this, iwidth, iheight, owidth, oheight ); } else if ( *format == mlt_image_rgb24 || *format == mlt_image_rgb24a ) { @@ -272,9 +251,6 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format * *format = mlt_image_yuv422; *width = owidth; *height = oheight; - - // Scale the alpha - scale_alpha( this, iwidth, iheight, owidth, oheight ); } else { @@ -323,7 +299,7 @@ static mlt_frame filter_process( mlt_filter this, mlt_frame frame ) /** Constructor for the filter. */ -mlt_filter filter_rescale_init( char *arg ) +mlt_filter filter_rescale_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg ) { // Create a new scaler mlt_filter this = mlt_filter_new( ); @@ -332,7 +308,7 @@ mlt_filter filter_rescale_init( char *arg ) if ( this != NULL ) { // Get the properties - mlt_properties properties = mlt_filter_properties( this ); + mlt_properties properties = MLT_FILTER_PROPERTIES( this ); // Set the process method this->process = filter_process;