X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Ffilter_region.c;h=392faecaefef2e18eb4da338df1f39b395d28ba8;hb=bf3264b9e340ba5c11cbf59835a8af3db94e0cc2;hp=d45d6215c812a0c846b46f33786cc390cee1ae2f;hpb=02e99cb00ed4a03a8f98c7f570cc9526478bfdc1;p=melted diff --git a/src/modules/core/filter_region.c b/src/modules/core/filter_region.c index d45d621..392faec 100644 --- a/src/modules/core/filter_region.c +++ b/src/modules/core/filter_region.c @@ -3,23 +3,23 @@ * 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_region.h" -#include "transition_composite.h" +#include "transition_region.h" #include @@ -27,190 +27,35 @@ #include #include -static int create_instance( mlt_filter this, char *name, char *value, int count ) -{ - // Return from this function - int error = 0; - - // Duplicate the value - char *type = strdup( value ); - - // Pointer to filter argument - char *arg = type == NULL ? NULL : strchr( type, ':' ); - - // New filter being created - mlt_filter filter = NULL; - - // Cleanup type and arg - if ( arg != NULL ) - *arg ++ = '\0'; - - // Create the filter - filter = mlt_factory_filter( type, arg ); - - // If we have a filter, then initialise and store it - if ( filter != NULL ) - { - // Properties of this - mlt_properties properties = mlt_filter_properties( this ); - - // String to hold the property name - char id[ 256 ]; - - // String to hold the passdown key - char key[ 256 ]; - - // Construct id - sprintf( id, "_filter_%d", count ); - - // Counstruct key - sprintf( key, "%s.", name ); - - // Pass all the key properties on the filter down - mlt_properties_pass( mlt_filter_properties( filter ), properties, key ); - - // Ensure that filter is assigned - mlt_properties_set_data( properties, id, filter, 0, ( mlt_destructor )mlt_filter_close, NULL ); - } - else - { - // Indicate that an error has occurred - error = 1; - } - - // Cleanup - free( type ); - - // Return error condition - return error; -} - -/** Do it :-). +/** Filter processing. */ -static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable ) +static mlt_frame filter_process( mlt_filter this, mlt_frame frame ) { - // Error we will return - int error = 0; - - // Get the watermark filter object - mlt_filter this = mlt_frame_pop_service( frame ); - // Get the properties of the filter - mlt_properties properties = mlt_filter_properties( this ); - - // Get the composite from the filter - mlt_transition composite = mlt_properties_get_data( properties, "composite", NULL ); + mlt_properties properties = MLT_FILTER_PROPERTIES( this ); - // Look for the first filter - mlt_filter filter = mlt_properties_get_data( properties, "_filter_0", NULL ); + // Get the region transition + mlt_transition transition = mlt_properties_get_data( properties, "_transition", NULL ); - // Create a composite if we don't have one - if ( composite == NULL ) + // Create the transition if not available + if ( transition == NULL ) { - // Create composite via the factory - composite = mlt_factory_transition( "composite", NULL ); + // Create the transition + transition = mlt_factory_transition( "region", NULL ); - // If we have one - if ( composite != NULL ) - { - // Get the properties - mlt_properties composite_properties = mlt_transition_properties( composite ); + // Register with the filter + mlt_properties_set_data( properties, "_transition", transition, 0, ( mlt_destructor )mlt_transition_close, NULL ); - // We want to ensure that we don't get a wobble... - mlt_properties_set( composite_properties, "distort", "true" ); - mlt_properties_set( composite_properties, "progressive", "1" ); - - // Pass all the composite. properties on the filter down - mlt_properties_pass( composite_properties, properties, "composite." ); - - // Register the composite for reuse/destruction - mlt_properties_set_data( properties, "composite", composite, 0, ( mlt_destructor )mlt_transition_close, NULL ); - } - } - - // Create filters - if ( filter == NULL ) - { - // Loop Variable - int i = 0; - - // Number of filters created - int count = 0; - - // Loop for all properties - for ( i = 0; i < mlt_properties_count( properties ); i ++ ) - { - // Get the name of this property - char *name = mlt_properties_get_name( properties, i ); - - // If the name does not contain a . and matches filter - if ( strchr( name, '.' ) == NULL && !strncmp( name, "filter", 6 ) ) - { - // Get the filter constructor - char *value = mlt_properties_get_value( properties, i ); - - // Create an instance - if ( create_instance( this, name, value, count ) == 0 ) - count ++; - } - } - } - - // Get the image - error = mlt_frame_get_image( frame, image, format, width, height, 1 ); - - // Only continue if we have both filter and composite - if ( composite != NULL && filter != NULL ) - { - // String to hold the filter to query on - char id[ 256 ]; - - // Index to hold the count - int i = 0; - - // We will get the 'b frame' from the composite - mlt_frame b_frame = composite_copy_region( composite, frame ); - - // Make sure the filter is in the correct position - while ( filter != NULL ) - { - // Stack this filter - mlt_filter_process( filter, b_frame ); - - // Generate the key for the next - sprintf( id, "_filter_%d", ++ i ); - - // Get the next filter - filter = mlt_properties_get_data( properties, id, NULL ); - } - - // Get the b frame and process with composite if successful - mlt_transition_process( composite, frame, b_frame ); - - // Get the image - error = mlt_frame_get_image( frame, image, format, width, height, 0 ); - - // Close the b frame - mlt_frame_close( b_frame ); + // Pass a reference to this filter down + mlt_properties_set_data( MLT_TRANSITION_PROPERTIES( transition ), "_region_filter", this, 0, NULL, NULL ); } - return error; -} + // Pass all properties down + mlt_properties_pass( MLT_TRANSITION_PROPERTIES( transition ), properties, "" ); -/** Filter processing. -*/ - -static mlt_frame filter_process( mlt_filter this, mlt_frame frame ) -{ - // Push the filter on to the frame - mlt_frame_push_service( frame, this ); - - // Push the filter method - mlt_frame_push_get_image( frame, filter_get_image ); - - // Return the frame - return frame; + // Process the frame + return mlt_transition_process( transition, frame, NULL ); } /** Constructor for the filter. @@ -225,13 +70,16 @@ mlt_filter filter_region_init( void *arg ) if ( this != NULL ) { // Get the properties from the filter - mlt_properties properties = mlt_filter_properties( this ); + mlt_properties properties = MLT_FILTER_PROPERTIES( this ); // Assign the filter process method this->process = filter_process; // Resource defines the shape of the region mlt_properties_set( properties, "resource", arg == NULL ? "rectangle" : arg ); + + // Ensure that attached filters are handled privately + mlt_properties_set_int( properties, "_filter_private", 1 ); } // Return the filter