X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Ffilter_watermark.c;h=2e88e082adc7ff6a82ce11cfbc8568acf234ed72;hb=42eea21bf0c71036397cac39f19d537c9344081c;hp=f834c121dbe5e86c1252492306957076d05ce432;hpb=f00476101550ec7d8e863f6516aa83bc1b524570;p=melted diff --git a/src/modules/core/filter_watermark.c b/src/modules/core/filter_watermark.c index f834c12..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 @@ -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 ) @@ -75,6 +75,9 @@ static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format // 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 ); } @@ -86,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 ) @@ -142,16 +146,23 @@ static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format // 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_double( a_props, "consumer_deinterlace" ) ); + 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( MLT_TRANSITION_PROPERTIES( composite ), "distort", "true" ); - mlt_properties_set( a_props, "distort", "true" ); - mlt_properties_set( b_props, "distort", "true" ); + 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 ) @@ -170,12 +181,14 @@ static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format 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_double( b_props, "consumer_aspect_ratio", mlt_properties_get_int( a_props, "consumer_aspect_ratio" ) ); 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", "nearest" ); - mlt_properties_set( b_props, "rescale.interp", "nearest" ); + 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 ); @@ -215,6 +228,9 @@ 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 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_filter_get_in( this ) ); @@ -230,7 +246,7 @@ 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 )