Add a refresh property to videostab2 filter.

[mlt] / src / modules / kdenlive / filter_freeze.c

diff --git a/src/modules/kdenlive/filter_freeze.c b/src/modules/kdenlive/filter_freeze.c
index 72e4261b6e28f0aa010f40bffd62e40bbba65a64..9c0b489893602f09232af071bddad40c2710436d 100755 (executable)
--- a/src/modules/kdenlive/filter_freeze.c
+++ b/src/modules/kdenlive/filter_freeze.c
@@ -37,7 +37,7 @@ static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format
        mlt_frame freeze_frame = NULL;;
        int freeze_before = mlt_properties_get_int( properties, "freeze_before" );
        int freeze_after = mlt_properties_get_int( properties, "freeze_after" );
-       mlt_position pos = mlt_properties_get_position( properties, "frame" );
+       mlt_position pos = mlt_properties_get_position( properties, "frame" ) + mlt_producer_get_in( mlt_frame_get_original_producer( frame ) );
        mlt_position currentpos = mlt_filter_get_position( filter, frame );
 
        int do_freeze = 0;
@@ -52,22 +52,21 @@ static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format
        if (do_freeze == 1) {
                mlt_service_lock( MLT_FILTER_SERVICE( filter ) );
                freeze_frame = mlt_properties_get_data( properties, "freeze_frame", NULL );
-               if ( freeze_frame == NULL || mlt_properties_get_position( properties, "_frame" ) != pos )
+               if ( !freeze_frame || mlt_properties_get_position( properties, "_frame" ) != pos )
                {
                        // freeze_frame has not been fetched yet or is not useful, so fetch it and cache it.
-                       mlt_producer producer = mlt_frame_get_original_producer(frame);
+                       // get parent producer
+                       mlt_producer producer = mlt_producer_cut_parent( mlt_frame_get_original_producer( frame ) );
                        mlt_producer_seek( producer, pos );
 
                        // Get the frame
                        mlt_service_get_frame( mlt_producer_service(producer), &freeze_frame, 0 );
 
                        mlt_properties freeze_properties = MLT_FRAME_PROPERTIES( freeze_frame );
-                       mlt_properties_set_double( freeze_properties, "consumer_aspect_ratio", mlt_properties_get_double( props, "consumer_aspect_ratio" ) );
                        mlt_properties_set( freeze_properties, "rescale.interp", mlt_properties_get( props, "rescale.interp" ) );
                        mlt_properties_set_double( freeze_properties, "aspect_ratio", mlt_frame_get_aspect_ratio( frame ) );
                        mlt_properties_set_int( freeze_properties, "progressive", mlt_properties_get_int( props, "progressive" ) );
                        mlt_properties_set_int( freeze_properties, "consumer_deinterlace", mlt_properties_get_int( props, "consumer_deinterlace" ) || mlt_properties_get_int( properties, "deinterlace" ) );
-                       mlt_properties_set_double( freeze_properties, "output_ratio", mlt_properties_get_double( props, "output_ratio" ) );
                        mlt_properties_set_data( properties, "freeze_frame", freeze_frame, 0, ( mlt_destructor )mlt_frame_close, NULL );
                        mlt_properties_set_position( properties, "_frame", pos );
                }
@@ -84,6 +83,12 @@ static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format
                *image = image_copy;
                mlt_frame_set_image( frame, *image, size, mlt_pool_release );
 
+                uint8_t *alpha_buffer = mlt_frame_get_alpha_mask( freeze_frame );
+                int alphasize = *width * *height;
+                uint8_t *alpha_copy = mlt_pool_alloc( alphasize );
+                memcpy( alpha_copy, alpha_buffer, alphasize );
+                mlt_frame_set_alpha( frame, alpha_copy, alphasize, mlt_pool_release );
+
                return error;
        }
 
@@ -121,7 +126,7 @@ mlt_filter filter_freeze_init( mlt_profile profile, mlt_service_type type, const
                // If freeze_after = 1, only frames after the "frame" value will be frozen
                mlt_properties_set( MLT_FILTER_PROPERTIES( filter ), "freeze_after", "0" );
 
-               // If freeze_before = 1, only frames after the "frame" value will be frozen
+               // If freeze_before = 1, only frames before the "frame" value will be frozen
                mlt_properties_set( MLT_FILTER_PROPERTIES( filter ), "freeze_before", "0" );
        }
        return filter;