src/framework/mlt_frame.c

[melted] / src / modules / core / filter_watermark.c

diff --git a/src/modules/core/filter_watermark.c b/src/modules/core/filter_watermark.c
index f834c12..51181d7 100644 (file)
--- a/src/modules/core/filter_watermark.c
+++ b/src/modules/core/filter_watermark.c
@@ -144,14 +144,20 @@ static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format
                        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" ) );
 
+                       // 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 +176,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;
+                               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 );