X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fkdenlive%2Ffilter_freeze.c;h=ef85423d96608852c6ff5273d91799fdf01f2700;hb=7ecd47eeebf87332a4892d167baff959f0f6a11a;hp=a389e01dfb9708d49284faa5dd8655f8d837e2e8;hpb=9c7d043e0c13911fc12817e434363604cbd1d8c6;p=melted

diff --git a/src/modules/kdenlive/filter_freeze.c b/src/modules/kdenlive/filter_freeze.c
index a389e01..ef85423 100644
--- a/src/modules/kdenlive/filter_freeze.c
+++ b/src/modules/kdenlive/filter_freeze.c
@@ -27,10 +27,6 @@
 static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable )
 {
 	// Get the image
-
-
-	mlt_position currentpos = mlt_frame_get_position( this ); 
-
 	mlt_filter filter = mlt_frame_pop_service( this );
 	mlt_properties properties = MLT_FILTER_PROPERTIES( filter );
 
@@ -38,6 +34,7 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *
 	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 currentpos = mlt_properties_get_position( properties, "_seek_frame" );
 
 	int do_freeze = 0;
 	if (freeze_before == 0 && freeze_after == 0) {
@@ -51,7 +48,7 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *
 	if (do_freeze == 1) {
 		freeze_frame = mlt_properties_get_data( properties, "freeze_frame", NULL );
 
-		if( freeze_frame == NULL)
+		if( freeze_frame == NULL || mlt_properties_get_position( properties, "_frame" ) != pos )
 		{
 			// freeze_frame has not been fetched yet, so fetch it and cache it.
 			mlt_producer producer = mlt_frame_get_original_producer(this);
@@ -68,6 +65,7 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *
 			mlt_properties_set_int( freeze_properties, "progressive", mlt_properties_get_int( props, "progressive" ) );
 
 			mlt_properties_set_data( properties, "freeze_frame", freeze_frame, 0, NULL, NULL );
+			mlt_properties_set_position( properties, "_frame", pos );
 		}
 		int error = mlt_frame_get_image( freeze_frame, image, format, width, height, 1 );
 		return error;
@@ -86,6 +84,9 @@ static mlt_frame filter_process( mlt_filter this, mlt_frame frame )
 	// Push the filter on to the stack
 	mlt_frame_push_service( frame, this );
 
+	// Determine the time position of this frame
+	mlt_properties_set_position( MLT_FILTER_PROPERTIES( this ), "_seek_frame", mlt_frame_get_position( frame ) -  mlt_filter_get_in( this ) );
+
 	// Push the frame filter
 	mlt_frame_push_get_image( frame, filter_get_image );