X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Ffilter_watermark.c;h=f23ac60bebddc46867cc97e09096d6746e0c4aef;hb=ff9da69f0b59e132d8dd28b796e7dc4e9ec8b1bd;hp=1e5d6843522d752acfd05b22d65d6418f34ef53e;hpb=02e99cb00ed4a03a8f98c7f570cc9526478bfdc1;p=melted

diff --git a/src/modules/core/filter_watermark.c b/src/modules/core/filter_watermark.c
index 1e5d684..f23ac60 100644
--- a/src/modules/core/filter_watermark.c
+++ b/src/modules/core/filter_watermark.c
@@ -27,6 +27,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 /** Do it :-).
 */
@@ -48,32 +49,36 @@ static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format
 	// Get the composite from the filter
 	mlt_transition composite = mlt_properties_get_data( properties, "composite", NULL );
 
+	// Get the resource to use
+	char *resource = mlt_properties_get( properties, "resource" );
+
+	// Get the old resource
+	char *old_resource = mlt_properties_get( properties, "old_resource" );
+
 	// Create a composite if we don't have one
 	if ( composite == NULL )
 	{
 		// Create composite via the factory
 		composite = mlt_factory_transition( "composite", NULL );
 
-		// If we have one
+		// Register the composite for reuse/destruction
 		if ( composite != NULL )
-		{
-			// Get the properties
-			mlt_properties composite_properties = mlt_transition_properties( composite );
+			mlt_properties_set_data( properties, "composite", composite, 0, ( mlt_destructor )mlt_transition_close, NULL );
+	}
 
-			// Pass all the composite. properties on the filter down
-			mlt_properties_pass( composite_properties, properties, "composite." );
+	// If we have one
+	if ( composite != NULL )
+	{
+		// Get the properties
+		mlt_properties composite_properties = mlt_transition_properties( composite );
 
-			// Register the composite for reuse/destruction
-			mlt_properties_set_data( properties, "composite", composite, 0, ( mlt_destructor )mlt_transition_close, NULL );
-		}
+		// Pass all the composite. properties on the filter down
+		mlt_properties_pass( composite_properties, properties, "composite." );
 	}
 
 	// Create a producer if don't have one
-	if ( producer == NULL )
+	if ( producer == NULL || ( old_resource != NULL && strcmp( resource, old_resource ) ) )
 	{
-		// Get the resource to use
-		char *resource = mlt_properties_get( properties, "resource" );
-
 		// Get the factory producer service
 		char *factory = mlt_properties_get( properties, "factory" );
 
@@ -83,20 +88,26 @@ static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format
 		// If we have one
 		if ( producer != NULL )
 		{
-			// Get the producer properties
-			mlt_properties producer_properties = mlt_producer_properties( producer );
+			// Register the producer for reuse/destruction
+			mlt_properties_set_data( properties, "producer", producer, 0, ( mlt_destructor )mlt_producer_close, NULL );
 
 			// Ensure that we loop
-			mlt_properties_set( producer_properties, "eof", "loop" );
-
-			// Now pass all producer. properties on the filter down
-			mlt_properties_pass( producer_properties, properties, "producer." );
+			mlt_properties_set( mlt_producer_properties( producer ), "eof", "loop" );
 
-			// Register the producer for reuse/destruction
-			mlt_properties_set_data( properties, "producer", producer, 0, ( mlt_destructor )mlt_producer_close, NULL );
+			// Set the old resource
+			mlt_properties_set( properties, "old_resource", resource );
 		}
 	}
 
+	if ( producer != NULL )
+	{
+		// Get the producer properties
+		mlt_properties producer_properties = mlt_producer_properties( producer );
+
+		// Now pass all producer. properties on the filter down
+		mlt_properties_pass( producer_properties, properties, "producer." );
+	}
+
 	// Only continue if we have both producer and composite
 	if ( composite != NULL && producer != NULL )
 	{
@@ -115,6 +126,9 @@ static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format
 		// Make sure the producer is in the correct position
 		mlt_producer_seek( producer, position );
 
+		// Resetting position to appease the composite transition
+		mlt_frame_set_position( frame, position );
+
 		// 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 );