X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmodules%2Fopengl%2Ffilter_movit_saturation.cpp;h=fa8a7e7d5c83ed7de1f017e9eb9484ee8214929c;hb=3a0830989b99178eec0ab334ea8dea36c4cc429c;hp=04d1d0a05095df1e935201a65a3a79976140e988;hpb=4b425d84e9afc3cbcee587344a7852f1b36f152f;p=mlt

diff --git a/src/modules/opengl/filter_movit_saturation.cpp b/src/modules/opengl/filter_movit_saturation.cpp
index 04d1d0a0..fa8a7e7d 100644
--- a/src/modules/opengl/filter_movit_saturation.cpp
+++ b/src/modules/opengl/filter_movit_saturation.cpp
@@ -29,25 +29,21 @@ static int get_image( mlt_frame frame, uint8_t **image, mlt_image_format *format
 	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( MLT_FILTER_SERVICE( 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( "saturation",
-			mlt_properties_anim_get_double( properties, "saturation", position, length ) );
-		assert(ok);
-	}
+	mlt_position position = mlt_filter_get_position( filter, frame );
+	mlt_position length = mlt_filter_get_length2( filter, frame );
+	mlt_properties_set_double( properties, "movit.parms.float.saturation",
+		mlt_properties_anim_get_double( properties, "saturation", position, length ) );
 	GlslManager::get_instance()->unlock_service( frame );
 	*format = mlt_image_glsl;
-	return mlt_frame_get_image( frame, image, format, width, height, writable );
+	int error = mlt_frame_get_image( frame, image, format, width, height, writable );
+	GlslManager::set_effect_input( MLT_FILTER_SERVICE( filter ), frame, (mlt_service) *image );
+	GlslManager::set_effect( MLT_FILTER_SERVICE( filter ), frame, new SaturationEffect() );
+	*image = (uint8_t *) MLT_FILTER_SERVICE( filter );
+	return error;
 }
 
 static mlt_frame process( mlt_filter filter, mlt_frame frame )
 {
-	if ( !mlt_frame_is_test_card( frame ) ) {
-		if ( !GlslManager::get_effect( MLT_FILTER_SERVICE( filter ), frame ) )
-			GlslManager::add_effect( MLT_FILTER_SERVICE( filter ), frame, new SaturationEffect() );
-	}
 	mlt_frame_push_service( frame, filter );
 	mlt_frame_push_get_image( frame, get_image );
 	return frame;
@@ -62,6 +58,7 @@ mlt_filter filter_movit_saturation_init( mlt_profile profile, mlt_service_type t
 
 	if ( glsl && ( filter = mlt_filter_new() ) ) {
 		mlt_properties properties = MLT_FILTER_PROPERTIES( filter );
+		glsl->add_ref( properties );
 		mlt_properties_set( properties, "saturation", arg? arg : "1.0" );
 		filter->process = process;
 	}