X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmodules%2Fopengl%2Ffilter_movit_vignette.cpp;h=7259d9bf0be0c566c3e1d507b52152c375ab0cc3;hb=05337089b5dba33c2dee26caba81bfacb9cd37e8;hp=b0e33f7eb69f65ab44fbdc844efe8fc405be49d7;hpb=cd87c4c715c1c3373cec5baded108ec5bd353fa2;p=mlt

diff --git a/src/modules/opengl/filter_movit_vignette.cpp b/src/modules/opengl/filter_movit_vignette.cpp
index b0e33f7e..7259d9bf 100644
--- a/src/modules/opengl/filter_movit_vignette.cpp
+++ b/src/modules/opengl/filter_movit_vignette.cpp
@@ -24,20 +24,34 @@
 #include "glsl_manager.h"
 #include <movit/vignette_effect.h>
 
+static int get_image( mlt_frame frame, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable )
+{
+	mlt_filter filter = (mlt_filter) mlt_frame_pop_service( frame );
+	mlt_properties properties = MLT_FILTER_PROPERTIES( filter );
+	GlslManager::get_instance()->lock_service( frame );
+	Effect* effect = GlslManager::get_effect( filter, frame );
+	if ( effect ) {
+		mlt_position position = mlt_filter_get_position( filter, frame );
+		mlt_position length = mlt_filter_get_length2( filter, frame );
+		bool ok = effect->set_float( "radius",
+			mlt_properties_anim_get_double( properties, "radius", position, length ) );
+		ok |= effect->set_float( "inner_radius",
+			mlt_properties_anim_get_double( properties, "inner_radius", position, length ) );
+		assert(ok);
+	}
+	GlslManager::get_instance()->unlock_service( frame );
+	*format = mlt_image_glsl;
+	return mlt_frame_get_image( frame, image, format, width, height, writable );
+}
+
 static mlt_frame process( mlt_filter filter, mlt_frame frame )
 {
 	if ( !mlt_frame_is_test_card( frame ) ) {
-		Effect* effect = GlslManager::get_effect( filter, frame );
-		if ( !effect ) {
-			effect = GlslManager::add_effect( filter, frame, new VignetteEffect() );
-		}
-		if ( effect ) {
-			mlt_properties filter_props = MLT_FILTER_PROPERTIES( filter );
-			bool ok = effect->set_float( "radius", mlt_properties_get_double( filter_props, "radius" ) );
-			ok |= effect->set_float( "inner_radius", mlt_properties_get_double( filter_props, "inner_radius" ) );
-			assert(ok);
-		}
+		if ( !GlslManager::get_effect( filter, frame ) )
+			GlslManager::add_effect( filter, frame, new VignetteEffect() );
 	}
+	mlt_frame_push_service( frame, filter );
+	mlt_frame_push_get_image( frame, get_image );
 	return frame;
 }