X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Ffilter_brightness.c;h=bc692c64605583785f7ab3d0f2776a10bbaedf8c;hb=e273c00863839656468d7273759fe8d5daddac23;hp=d4b02af01aa8f3306debebd59ddb110114c57dee;hpb=978543a20e47302b82bc29007852bff8180031c2;p=mlt diff --git a/src/modules/core/filter_brightness.c b/src/modules/core/filter_brightness.c index d4b02af0..bc692c64 100644 --- a/src/modules/core/filter_brightness.c +++ b/src/modules/core/filter_brightness.c @@ -3,87 +3,113 @@ * 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 #include #include +#define CLAMP( x, min, max ) (x) < (min) ? (min) : (x) > (max) ? (max) : (x) + /** Do it :-). */ -static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable ) +static int filter_get_image( mlt_frame frame, 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; + mlt_filter filter = (mlt_filter) mlt_frame_pop_service( frame ); + mlt_properties properties = MLT_FILTER_PROPERTIES( filter ); + mlt_position position = mlt_filter_get_position( filter, frame ); + mlt_position length = mlt_filter_get_length2( filter, frame ); - // Get the brightness level - double level = mlt_properties_get_double( mlt_frame_properties( this ), "brightness.level" ); + // Get the image + *format = mlt_image_yuv422; + int error = mlt_frame_get_image( frame, image, format, width, height, 1 ); - while ( p != q ) + // Only process if we have no error and a valid colour space + if ( error == 0 ) { - float x = (float) *p * level; - *p = x < 16 ? 16 : x > 235 ? 235 : x; - p += 2; + double level = 1.0; + + // Use animated "level" property only if it has been set since init + char* level_property = mlt_properties_get( MLT_FILTER_PROPERTIES( filter ), "level" ); + if ( level_property != NULL ) + { + level = mlt_properties_anim_get_double( properties, "level", position, length ); + } + else + { + // Get level using old "start,"end" mechanics + // Get the starting brightness level + level = fabs( mlt_properties_get_double( MLT_FILTER_PROPERTIES( filter ), "start" ) ); + + // If there is an end adjust gain to the range + if ( mlt_properties_get( MLT_FILTER_PROPERTIES( filter ), "end" ) != NULL ) + { + // Determine the time position of this frame in the transition duration + double end = fabs( mlt_properties_get_double( MLT_FILTER_PROPERTIES( filter ), "end" ) ); + level += ( end - level ) * mlt_filter_get_progress( filter, frame ); + } + } + + // Only process if level is something other than 1 + if ( level != 1.0 ) + { + int i = *width * *height + 1; + uint8_t *p = *image; + int32_t m = level * ( 1 << 16 ); + int32_t n = 128 * ( ( 1 << 16 ) - m ); + + while ( --i ) + { + p[0] = CLAMP( (p[0] * m) >> 16, 16, 235 ); + p[1] = CLAMP( (p[1] * m + n) >> 16, 16, 240 ); + p += 2; + } + } } - return 0; + return error; } /** Filter processing. */ -static mlt_frame filter_process( mlt_filter this, mlt_frame frame ) +static mlt_frame filter_process( mlt_filter filter, mlt_frame frame ) { - 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 ) - { - // 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" ) ); - level += ( end - level ) * position; - } + mlt_frame_push_service( frame, filter ); 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 ); - if ( this != NULL ) + mlt_filter filter = mlt_filter_new( ); + if ( filter != NULL ) { - mlt_filter_init( this, NULL ); - this->process = filter_process; - if ( arg != NULL ) - mlt_properties_set_double( mlt_filter_properties( this ), "start", atof( arg ) ); + filter->process = filter_process; + mlt_properties_set( MLT_FILTER_PROPERTIES( filter ), "start", arg == NULL ? "1" : arg ); + mlt_properties_set( MLT_FILTER_PROPERTIES( filter ), "level", NULL ); } - return this; + return filter; }