X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Ffilter_luma.c;h=0a146bebfce49d5aeba678f190a5b4abe70efe6f;hb=b698c58e57643e9df6941d91b07a40c997bd7e64;hp=878fb6a4cde0108452c9ae808016313febd3b118;hpb=eccf04749681f70957f34fdd6742224774e72d15;p=mlt diff --git a/src/modules/core/filter_luma.c b/src/modules/core/filter_luma.c index 878fb6a4..0a146beb 100644 --- a/src/modules/core/filter_luma.c +++ b/src/modules/core/filter_luma.c @@ -3,27 +3,27 @@ * 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_luma.h" - +#include #include #include #include #include +#include #include #include @@ -37,45 +37,65 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format * int error = 0; mlt_filter filter = mlt_frame_pop_service( this ); mlt_properties properties = MLT_FILTER_PROPERTIES( filter ); + + mlt_service_lock( MLT_FILTER_SERVICE( filter ) ); + mlt_transition luma = mlt_properties_get_data( properties, "luma", NULL ); mlt_frame b_frame = mlt_properties_get_data( properties, "frame", NULL ); + mlt_properties b_frame_props = b_frame ? MLT_FRAME_PROPERTIES( b_frame ) : NULL; int out = mlt_properties_get_int( properties, "period" ); - - if ( out == 0 ) - out = 24; + int cycle = mlt_properties_get_int( properties, "cycle" ); + int duration = mlt_properties_get_int( properties, "duration" ); + char *name = mlt_properties_get( properties, "_unique_id" ); + mlt_position position = mlt_properties_get_position( MLT_FRAME_PROPERTIES(this), name ); + + out = out? out + 1 : 25; + if ( cycle ) + out = cycle; + if ( duration < 1 || duration > out ) + duration = out; + *format = mlt_image_yuv422; + + if ( b_frame == NULL || mlt_properties_get_int( b_frame_props, "width" ) != *width || mlt_properties_get_int( b_frame_props, "height" ) != *height ) + { + b_frame = mlt_frame_init( MLT_FILTER_SERVICE( filter ) ); + mlt_properties_set_data( properties, "frame", b_frame, 0, ( mlt_destructor )mlt_frame_close, NULL ); + } if ( luma == NULL ) { char *resource = mlt_properties_get( properties, "resource" ); - luma = mlt_factory_transition( "luma", resource ); + mlt_profile profile = mlt_service_profile( MLT_FILTER_SERVICE( filter ) ); + luma = mlt_factory_transition( profile, "luma", resource ); if ( luma != NULL ) { mlt_properties luma_properties = MLT_TRANSITION_PROPERTIES( luma ); mlt_properties_set_int( luma_properties, "in", 0 ); - mlt_properties_set_int( luma_properties, "out", out ); + mlt_properties_set_int( luma_properties, "out", duration - 1 ); mlt_properties_set_int( luma_properties, "reverse", 1 ); mlt_properties_set_data( properties, "luma", luma, 0, ( mlt_destructor )mlt_transition_close, NULL ); } } - if ( b_frame == NULL ) - { - b_frame = mlt_frame_init( ); - mlt_properties_set_data( properties, "frame", b_frame, 0, ( mlt_destructor )mlt_frame_close, NULL ); - } - - if ( luma != NULL && - ( mlt_properties_get( properties, "blur" ) != NULL || - (int)mlt_frame_get_position( this ) % ( out + 1 ) != out ) ) + mlt_position modulo_pos = position % out; + mlt_log_debug( MLT_FILTER_SERVICE(filter), "pos %d mod period %d\n", position, modulo_pos ); + if ( luma != NULL && + ( mlt_properties_get( properties, "blur" ) != NULL || + ( position >= duration && modulo_pos < duration - 1 ) ) ) { mlt_properties luma_properties = MLT_TRANSITION_PROPERTIES( luma ); mlt_properties_pass( luma_properties, properties, "luma." ); + int in = position / out * out + mlt_frame_get_position( this ) - position; + mlt_properties_set_int( luma_properties, "in", in ); + mlt_properties_set_int( luma_properties, "out", in + duration - 1 ); mlt_transition_process( luma, this, b_frame ); } error = mlt_frame_get_image( this, image, format, width, height, 1 ); - if ( error == 0 ) + // We only need a copy of the last frame in the cycle, but we could miss it + // with realtime frame-dropping, so we copy the last several frames of the cycle. + if ( error == 0 && modulo_pos > out - duration ) { mlt_properties a_props = MLT_FRAME_PROPERTIES( this ); int size = 0; @@ -84,6 +104,7 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format * if ( dst != NULL ) { + mlt_log_debug( MLT_FILTER_SERVICE(filter), "copying frame %d\n", modulo_pos ); mlt_properties b_props = MLT_FRAME_PROPERTIES( b_frame ); memcpy( dst, src, size ); mlt_properties_set_data( b_props, "image", dst, size, mlt_pool_release, NULL ); @@ -93,6 +114,8 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format * } } + mlt_service_unlock( MLT_FILTER_SERVICE( filter ) ); + return error; } @@ -101,6 +124,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 ) { + // Get a unique name to store the frame position + char *name = mlt_properties_get( MLT_FILTER_PROPERTIES( this ), "_unique_id" ); + + // Assign the current position to the name + mlt_properties_set_position( MLT_FRAME_PROPERTIES( frame ), name, mlt_frame_get_position( frame ) ); + // Push the filter on to the stack mlt_frame_push_service( frame, this ); @@ -113,7 +142,7 @@ static mlt_frame filter_process( mlt_filter this, mlt_frame frame ) /** Constructor for the filter. */ -mlt_filter filter_luma_init( void *arg ) +mlt_filter filter_luma_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg ) { mlt_filter this = mlt_filter_new( ); if ( this != NULL )