X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Ffilter_watermark.c;h=4908d441073e7eca174d0f8412cd690676326c9a;hb=1da06dddd4f117c21c07b3682fab5abab014d995;hp=f4a87ea6277eb360b9c560fe96bdec517146b031;hpb=8cf0f77981284b7549c811b67283eb73d0c520d6;p=melted

diff --git a/src/modules/core/filter_watermark.c b/src/modules/core/filter_watermark.c
index f4a87ea..4908d44 100644
--- a/src/modules/core/filter_watermark.c
+++ b/src/modules/core/filter_watermark.c
@@ -74,6 +74,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." );
+
+		// Force a refresh
+		mlt_properties_set_int( composite_properties, "refresh", 1 );
 	}
 
 	// Create a producer if don't have one
@@ -132,6 +135,15 @@ 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 )
 		{
+			// 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_progressive", mlt_properties_get_double( a_props, "consumer_progressive" ) );
+
 			if ( mlt_properties_get_int( properties, "reverse" ) == 0 )
 			{
 				// Apply all filters that are attached to this filter to the b frame
@@ -145,12 +157,9 @@ static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format
 			}
 			else
 			{
-				mlt_properties a_props = mlt_frame_properties( frame );
-				mlt_properties b_props = mlt_frame_properties( b_frame );
 				mlt_transition_process( composite, b_frame, frame );
 				mlt_properties_set( a_props, "rescale.interp", "nearest" );
 				mlt_properties_set( b_props, "rescale.interp", "nearest" );
-				mlt_properties_set_int( b_props, "consumer_aspect_ratio", 1 );
 				mlt_service_apply_filters( mlt_filter_service( this ), frame, 0 );
 				error = mlt_frame_get_image( b_frame, image, format, width, height, 1 );
 				mlt_properties_set_data( b_props, "image", *image, 0, NULL, NULL );