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 bfd491e..d9506e4 100644 (file)
--- a/src/modules/core/filter_watermark.c
+++ b/src/modules/core/filter_watermark.c
@@ -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 );
        }
@@ -143,6 +146,13 @@ static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format
                        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, "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" ) );
@@ -217,6 +227,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 ) );