X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Ffilter_watermark.c;h=2e88e082adc7ff6a82ce11cfbc8568acf234ed72;hb=42eea21bf0c71036397cac39f19d537c9344081c;hp=1ca0b8be1e040bde51fbd8c64c1e3daa7dc84d74;hpb=991fd89e3398352f63eb9c9a7c82486e2654ed2f;p=melted

diff --git a/src/modules/core/filter_watermark.c b/src/modules/core/filter_watermark.c
index 1ca0b8b..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 <charles.yates@pandora.be>
  *
- * 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 <framework/mlt_filter.h>
 #include <framework/mlt_factory.h>
 #include <framework/mlt_frame.h>
 #include <framework/mlt_producer.h>
@@ -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 )
@@ -89,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 )
@@ -145,7 +146,8 @@ 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 )
@@ -179,7 +181,7 @@ static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format
 				char temp[ 132 ];
 				int count = 0;
 				uint8_t *alpha = NULL;
-				char *rescale = mlt_properties_get( a_props, "rescale.interp" );
+				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 );
@@ -244,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 )