X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Ffilter_brightness.c;h=d597e8ab1df4113ef2c240ac3ac8169b84e48365;hb=8c69000b4c4a8423a5025f0463805da562714eaa;hp=d4b02af01aa8f3306debebd59ddb110114c57dee;hpb=978543a20e47302b82bc29007852bff8180031c2;p=melted diff --git a/src/modules/core/filter_brightness.c b/src/modules/core/filter_brightness.c index d4b02af..d597e8a 100644 --- a/src/modules/core/filter_brightness.c +++ b/src/modules/core/filter_brightness.c @@ -3,23 +3,22 @@ * 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_brightness.h" - +#include #include #include @@ -31,21 +30,33 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable ) { - mlt_frame_get_image( this, image, format, width, height, 1 ); - uint8_t *p = *image; - uint8_t *q = *image + *width * *height * 2; - - // Get the brightness level - double level = mlt_properties_get_double( mlt_frame_properties( this ), "brightness.level" ); + // Get the image + int error = mlt_frame_get_image( this, image, format, width, height, 1 ); - while ( p != q ) + // Only process if we have no error and a valid colour space + if ( error == 0 && *format == mlt_image_yuv422 ) { - float x = (float) *p * level; - *p = x < 16 ? 16 : x > 235 ? 235 : x; - p += 2; + // Get the brightness level + double level = mlt_properties_get_double( MLT_FRAME_PROPERTIES( this ), "brightness" ); + + // Only process if level is something other than 1 + if ( level != 1.0 ) + { + uint8_t *p = *image; + uint8_t *q = *image + *width * *height * 2; + int32_t x = 0; + int32_t m = level * ( 1 << 16 ); + + while ( p != q ) + { + x = ( *p * m ) >> 16; + *p = x < 16 ? 16 : x > 235 ? 235 : x; + p += 2; + } + } } - return 0; + return error; } /** Filter processing. @@ -53,36 +64,38 @@ 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 ) { - double level = fabs( mlt_properties_get_double( mlt_filter_properties( this ), "start" ) ); + // Get the starting brightness level + double level = fabs( mlt_properties_get_double( MLT_FILTER_PROPERTIES( this ), "start" ) ); // If there is an end adjust gain to the range - if ( mlt_properties_get( mlt_filter_properties( this ), "end" ) != NULL ) + if ( mlt_properties_get( MLT_FILTER_PROPERTIES( this ), "end" ) != NULL ) { // Determine the time position of this frame in the transition duration mlt_position in = mlt_filter_get_in( this ); mlt_position out = mlt_filter_get_out( this ); mlt_position time = mlt_frame_get_position( frame ); double position = ( double )( time - in ) / ( double )( out - in + 1 ); - double end = fabs( mlt_properties_get_double( mlt_filter_properties( this ), "end" ) ); + double end = fabs( mlt_properties_get_double( MLT_FILTER_PROPERTIES( this ), "end" ) ); level += ( end - level ) * position; } + + // Push the frame filter + mlt_properties_set_double( MLT_FRAME_PROPERTIES( frame ), "brightness", level ); mlt_frame_push_get_image( frame, filter_get_image ); - mlt_properties_set_double( mlt_frame_properties( frame ), "brightness.level", level ); + return frame; } /** Constructor for the filter. */ -mlt_filter filter_brightness_init( char *arg ) +mlt_filter filter_brightness_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg ) { - mlt_filter this = calloc( sizeof( struct mlt_filter_s ), 1 ); + mlt_filter this = mlt_filter_new( ); if ( this != NULL ) { - mlt_filter_init( this, NULL ); this->process = filter_process; - if ( arg != NULL ) - mlt_properties_set_double( mlt_filter_properties( this ), "start", atof( arg ) ); + mlt_properties_set( MLT_FILTER_PROPERTIES( this ), "start", arg == NULL ? "1" : arg ); } return this; }