X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Ffilter_watermark.c;h=2e88e082adc7ff6a82ce11cfbc8568acf234ed72;hb=42eea21bf0c71036397cac39f19d537c9344081c;hp=afe036e4c7540925c917e345cfb368b671e9d8c8;hpb=fd3aef837f5389623f29fee989c74f056723aa4c;p=melted diff --git a/src/modules/core/filter_watermark.c b/src/modules/core/filter_watermark.c index afe036e..2e88e08 100644 --- a/src/modules/core/filter_watermark.c +++ b/src/modules/core/filter_watermark.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_watermark.h" - +#include #include #include #include @@ -41,7 +40,7 @@ static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format mlt_filter this = mlt_frame_pop_service( frame ); // Get the properties of the filter - mlt_properties properties = mlt_filter_properties( this ); + mlt_properties properties = MLT_FILTER_PROPERTIES( this ); // Get the producer from the filter mlt_producer producer = mlt_properties_get_data( properties, "producer", NULL ); @@ -59,7 +58,8 @@ static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format if ( composite == NULL ) { // Create composite via the factory - composite = mlt_factory_transition( "composite", NULL ); + mlt_profile profile = mlt_service_profile( MLT_FILTER_SERVICE( this ) ); + composite = mlt_factory_transition( profile, "composite", NULL ); // Register the composite for reuse/destruction if ( composite != NULL ) @@ -70,10 +70,16 @@ static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format if ( composite != NULL ) { // Get the properties - mlt_properties composite_properties = mlt_transition_properties( composite ); + mlt_properties composite_properties = MLT_TRANSITION_PROPERTIES( composite ); // Pass all the composite. properties on the filter down mlt_properties_pass( composite_properties, properties, "composite." ); + + if ( mlt_properties_get( properties, "composite.out" ) == NULL ) + mlt_properties_set_int( composite_properties, "out", mlt_properties_get_int( properties, "_out" ) ); + + // Force a refresh + mlt_properties_set_int( composite_properties, "refresh", 1 ); } // Create a producer if don't have one @@ -83,7 +89,8 @@ static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format char *factory = mlt_properties_get( properties, "factory" ); // Create the producer - producer = mlt_factory_producer( factory, resource ); + mlt_profile profile = mlt_service_profile( MLT_FILTER_SERVICE( this ) ); + producer = mlt_factory_producer( profile, factory, resource ); // If we have one if ( producer != NULL ) @@ -92,7 +99,7 @@ static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format mlt_properties_set_data( properties, "producer", producer, 0, ( mlt_destructor )mlt_producer_close, NULL ); // Ensure that we loop - mlt_properties_set( mlt_producer_properties( producer ), "eof", "loop" ); + mlt_properties_set( MLT_PRODUCER_PROPERTIES( producer ), "eof", "loop" ); // Set the old resource mlt_properties_set( properties, "_old_resource", resource ); @@ -102,7 +109,7 @@ static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format if ( producer != NULL ) { // Get the producer properties - mlt_properties producer_properties = mlt_producer_properties( producer ); + mlt_properties producer_properties = MLT_PRODUCER_PROPERTIES( producer ); // Now pass all producer. properties on the filter down mlt_properties_pass( producer_properties, properties, "producer." ); @@ -112,7 +119,7 @@ static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format if ( composite != NULL && producer != NULL ) { // Get the service of the producer - mlt_service service = mlt_producer_service( producer ); + mlt_service service = MLT_PRODUCER_SERVICE( producer ); // We will get the 'b frame' from the producer mlt_frame b_frame = NULL; @@ -121,7 +128,7 @@ static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format char *name = mlt_properties_get( properties, "_unique_id" ); // Get the original producer position - mlt_position position = mlt_properties_get_position( mlt_frame_properties( frame ), name ); + mlt_position position = mlt_properties_get_position( MLT_FRAME_PROPERTIES( frame ), name ); // Make sure the producer is in the correct position mlt_producer_seek( producer, position ); @@ -131,10 +138,72 @@ static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format // Get the b frame and process with composite if successful if ( mlt_service_get_frame( service, &b_frame, 0 ) == 0 ) - mlt_transition_process( composite, frame, b_frame ); - - // Get the image - error = mlt_frame_get_image( frame, image, format, width, height, 1 ); + { + // Get the a and b frame properties + mlt_properties a_props = MLT_FRAME_PROPERTIES( frame ); + mlt_properties b_props = MLT_FRAME_PROPERTIES( b_frame ); + + // Set the b frame to be in the same position and have same consumer requirements + mlt_frame_set_position( b_frame, position ); + mlt_properties_set_double( b_props, "consumer_aspect_ratio", mlt_properties_get_double( a_props, "consumer_aspect_ratio" ) ); + mlt_properties_set_int( b_props, "consumer_deinterlace", mlt_properties_get_int( a_props, "consumer_deinterlace" ) || mlt_properties_get_int( properties, "deinterlace" ) ); + mlt_properties_set_double( b_props, "output_ratio", mlt_properties_get_double( a_props, "output_ratio" ) ); + + // Check for the special case - no aspect ratio means no problem :-) + if ( mlt_frame_get_aspect_ratio( b_frame ) == 0 ) + mlt_properties_set_double( b_props, "aspect_ratio", mlt_properties_get_double( a_props, "consumer_aspect_ratio" ) ); + if ( mlt_frame_get_aspect_ratio( frame ) == 0 ) + mlt_properties_set_double( a_props, "aspect_ratio", mlt_properties_get_double( a_props, "consumer_aspect_ratio" ) ); + + mlt_properties_set_int( b_props, "normalised_width", mlt_properties_get_int( a_props, "normalised_width" ) ); + mlt_properties_set_int( b_props, "normalised_height", mlt_properties_get_int( a_props, "normalised_height" ) ); + + if ( mlt_properties_get_int( properties, "distort" ) ) + { + mlt_properties_set_int( MLT_TRANSITION_PROPERTIES( composite ), "distort", 1 ); + mlt_properties_set_int( a_props, "distort", 1 ); + mlt_properties_set_int( b_props, "distort", 1 ); + } + + if ( mlt_properties_get_int( properties, "reverse" ) == 0 ) + { + // Apply all filters that are attached to this filter to the b frame + mlt_service_apply_filters( MLT_FILTER_SERVICE( this ), b_frame, 0 ); + + // Process the frame + mlt_transition_process( composite, frame, b_frame ); + + // Get the image + error = mlt_frame_get_image( frame, image, format, width, height, 1 ); + } + else + { + char temp[ 132 ]; + int count = 0; + uint8_t *alpha = NULL; + const char *rescale = mlt_properties_get( a_props, "rescale.interp" ); + if ( rescale == NULL || !strcmp( rescale, "none" ) ) + rescale = "hyper"; + mlt_transition_process( composite, b_frame, frame ); + mlt_properties_set_int( a_props, "consumer_deinterlace", 1 ); + mlt_properties_set_int( b_props, "consumer_deinterlace", 1 ); + mlt_properties_set( a_props, "rescale.interp", rescale ); + mlt_properties_set( b_props, "rescale.interp", rescale ); + mlt_service_apply_filters( MLT_FILTER_SERVICE( this ), b_frame, 0 ); + error = mlt_frame_get_image( b_frame, image, format, width, height, 1 ); + alpha = mlt_frame_get_alpha_mask( b_frame ); + mlt_properties_set_data( a_props, "image", *image, *width * *height * 2, NULL, NULL ); + mlt_properties_set_data( a_props, "alpha", alpha, *width * *height, NULL, NULL ); + mlt_properties_set_int( a_props, "width", *width ); + mlt_properties_set_int( a_props, "height", *height ); + mlt_properties_set_int( a_props, "progressive", 1 ); + mlt_properties_inc_ref( b_props ); + strcpy( temp, "_b_frame" ); + while( mlt_properties_get_data( a_props, temp, NULL ) != NULL ) + sprintf( temp, "_b_frame%d", count ++ ); + mlt_properties_set_data( a_props, temp, b_frame, 0, ( mlt_destructor )mlt_frame_close, NULL ); + } + } // Close the b frame mlt_frame_close( b_frame ); @@ -154,13 +223,16 @@ 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 properties of the frame - mlt_properties properties = mlt_frame_properties( frame ); + mlt_properties properties = MLT_FRAME_PROPERTIES( frame ); // Get a unique name to store the frame position - char *name = mlt_properties_get( mlt_filter_properties( this ), "_unique_id" ); + char *name = mlt_properties_get( MLT_FILTER_PROPERTIES( this ), "_unique_id" ); + + // Assign the frame out point to the filter (just in case we need it later) + mlt_properties_set_int( MLT_FILTER_PROPERTIES( this ), "_out", mlt_properties_get_int( properties, "out" ) ); // Assign the current position to the name - mlt_properties_set_position( properties, name, mlt_frame_get_position( frame ) ); + mlt_properties_set_position( properties, name, mlt_frame_get_position( frame ) - mlt_filter_get_in( this ) ); // Push the filter on to the stack mlt_frame_push_service( frame, this ); @@ -174,16 +246,18 @@ static mlt_frame filter_process( mlt_filter this, mlt_frame frame ) /** Constructor for the filter. */ -mlt_filter filter_watermark_init( void *arg ) +mlt_filter filter_watermark_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg ) { mlt_filter this = mlt_filter_new( ); if ( this != NULL ) { - mlt_properties properties = mlt_filter_properties( this ); + mlt_properties properties = MLT_FILTER_PROPERTIES( this ); this->process = filter_process; mlt_properties_set( properties, "factory", "fezzik" ); if ( arg != NULL ) mlt_properties_set( properties, "resource", arg ); + // Ensure that attached filters are handled privately + mlt_properties_set_int( properties, "_filter_private", 1 ); } return this; }