X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Ffilter_obscure.c;h=ccd108a3e70af7e3b24882da07863ab6f6c9abd5;hb=bf3264b9e340ba5c11cbf59835a8af3db94e0cc2;hp=e6e7c718048cbda64f02fbdb4151be07772c1351;hpb=8a3795b090723264c973d274eedc28da480e76fd;p=melted diff --git a/src/modules/core/filter_obscure.c b/src/modules/core/filter_obscure.c index e6e7c71..ccd108a 100644 --- a/src/modules/core/filter_obscure.c +++ b/src/modules/core/filter_obscure.c @@ -3,25 +3,24 @@ * 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_obscure.h" #include -#include #include #include @@ -44,7 +43,7 @@ struct geometry_s /** Parse a value from a geometry string. */ -static float parse_value( char **ptr, int normalisation, char delim, float defaults ) +static inline float parse_value( char **ptr, int normalisation, char delim, float defaults ) { float value = defaults; @@ -86,6 +85,10 @@ static void geometry_parse( struct geometry_s *geometry, struct geometry_s *defa } else { + geometry->x = 0; + geometry->y = 0; + geometry->w = nw; + geometry->h = nh; geometry->mask_w = 20; geometry->mask_h = 20; } @@ -148,36 +151,45 @@ static float position_calculate( mlt_filter this, mlt_frame frame ) /** The averaging function... */ -void obscure_average( uint8_t *start, int width, int height, int stride ) +static inline void obscure_average( uint8_t *start, int width, int height, int stride ) { - int y; - int x; - int Y = ( *start + *( start + 2 ) ) / 2; - int U = *( start + 1 ); - int V = *( start + 3 ); - - for ( y = 0; y < height; y ++ ) + register int y; + register int x; + register int Y = ( *start + *( start + 2 ) ) / 2; + register int U = *( start + 1 ); + register int V = *( start + 3 ); + register uint8_t *p; + register int components = width >> 1; + + y = height; + while( y -- ) { - uint8_t *p = start + y * stride; - for ( x = 0; x < width / 2; x ++ ) + p = start; + x = components; + while( x -- ) { - Y = ( Y + *p ++ ) / 2; - U = ( U + *p ++ ) / 2; - Y = ( Y + *p ++ ) / 2; - V = ( V + *p ++ ) / 2; + Y = ( Y + *p ++ ) >> 1; + U = ( U + *p ++ ) >> 1; + Y = ( Y + *p ++ ) >> 1; + V = ( V + *p ++ ) >> 1; } + start += stride; } - for ( y = 0; y < height; y ++ ) + start -= height * stride; + y = height; + while( y -- ) { - uint8_t *p = start + y * stride; - for ( x = 0; x < width / 2; x ++ ) + p = start; + x = components; + while( x -- ) { *p ++ = Y; *p ++ = U; *p ++ = Y; *p ++ = V; } + start += stride; } } @@ -196,6 +208,8 @@ static void obscure_render( uint8_t *image, int width, int height, struct geomet int mh = result.mask_h; int w; int h; + int aw; + int ah; uint8_t *p = image + area_y * width * 2 + area_x * 2; @@ -203,10 +217,10 @@ static void obscure_render( uint8_t *image, int width, int height, struct geomet { for ( h = 0; h < area_h; h += mh ) { - int aw = w + mw > area_w ? mw - ( w + mw - area_w ) : mw; - int ah = h + mh > area_h ? mh - ( h + mh - area_h ) : mh; - if ( aw > 1 && ah > 1 ); - obscure_average( p + h * width * 2 + w * 2, aw, ah, width * 2 ); + aw = w + mw > area_w ? mw - ( w + mw - area_w ) : mw; + ah = h + mh > area_h ? mh - ( h + mh - area_h ) : mh; + if ( aw > 1 && ah > 1 ) + obscure_average( p + h * ( width << 1 ) + ( w << 1 ), aw, ah, width << 1 ); } } } @@ -217,21 +231,21 @@ static void obscure_render( uint8_t *image, int width, int height, struct geomet static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable ) { // Get the frame properties - mlt_properties frame_properties = mlt_frame_properties( frame ); - - // Fetch the obscure stack for this frame - mlt_deque deque = mlt_properties_get_data( frame_properties, "filter_obscure", NULL ); + mlt_properties frame_properties = MLT_FRAME_PROPERTIES( frame ); // Pop the top of stack now - mlt_filter this = mlt_deque_pop_back( deque ); + mlt_filter this = mlt_frame_pop_service( frame ); + + // Get the image from the frame + int error = mlt_frame_get_image( frame, image, format, width, height, 1 ); // Get the image from the frame - if ( mlt_frame_get_image( frame, image, format, width, height, 1 ) == 0 ) + if ( error == 0 && *format == mlt_image_yuv422 ) { if ( this != NULL ) { // Get the filter properties - mlt_properties properties = mlt_filter_properties( this ); + mlt_properties properties = MLT_FILTER_PROPERTIES( this ); // Obtain the normalised width and height from the frame int normalised_width = mlt_properties_get_int( frame_properties, "normalised_width" ); @@ -242,8 +256,8 @@ static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format struct geometry_s start; struct geometry_s end; - // Calculate the position - float position = position_calculate( this, frame ); + // Retrieve the position + float position = mlt_properties_get_double(frame_properties, "filter_position"); // Now parse the geometries geometry_parse( &start, NULL, mlt_properties_get( properties, "start" ), normalised_width, normalised_height ); @@ -257,7 +271,7 @@ static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format } } - return 0; + return error; } /** Filter processing. @@ -265,25 +279,13 @@ static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format static mlt_frame filter_process( mlt_filter this, mlt_frame frame ) { - // Get the frame properties - mlt_properties frame_properties = mlt_frame_properties( frame ); - - // Fetch the obscure stack for this frame - mlt_deque deque = mlt_properties_get_data( frame_properties, "filter_obscure", NULL ); - - // Create stack if necessary - if ( deque == NULL ) - { - // Create the deque - deque = mlt_deque_init( ); - - // Assign to the frame - mlt_properties_set_data( frame_properties, "filter_obscure", deque, 0, ( mlt_destructor )mlt_deque_close, NULL ); - } - - // Push this on to the obscure stack - mlt_deque_push_back( deque, this ); + // Push this on to the service stack + mlt_frame_push_service( frame, this ); + // Calculate the position for the filter effect + float position = position_calculate( this, frame ); + mlt_properties_set_double( MLT_FRAME_PROPERTIES( frame ), "filter_position", position ); + // Push the get image call mlt_frame_push_get_image( frame, filter_get_image ); @@ -295,12 +297,14 @@ static mlt_frame filter_process( mlt_filter this, mlt_frame frame ) mlt_filter filter_obscure_init( void *arg ) { - mlt_filter this = calloc( 1, sizeof( struct mlt_filter_s ) ); - mlt_properties properties = mlt_filter_properties( this ); - mlt_filter_init( this, NULL ); - this->process = filter_process; - mlt_properties_set( properties, "start", arg != NULL ? arg : "0%,0%:100%x100%" ); - mlt_properties_set( properties, "end", "" ); + mlt_filter this = mlt_filter_new( ); + if ( this != NULL ) + { + mlt_properties properties = MLT_FILTER_PROPERTIES( this ); + this->process = filter_process; + mlt_properties_set( properties, "start", arg != NULL ? arg : "0%,0%:100%x100%" ); + mlt_properties_set( properties, "end", "" ); + } return this; }