Rename glsl_manager.h to filter_glsl_manager.h, to be consistent with the .cpp file.

[mlt] / src / modules / opengl / filter_lift_gamma_gain.cpp

diff --git a/src/modules/opengl/filter_lift_gamma_gain.cpp b/src/modules/opengl/filter_lift_gamma_gain.cpp
index 8129063ab824e9ba0cd2e57bf5a43828fb6b45ef..7f1e0f685bdb528253efed7fccf031b5fc904d9e 100644 (file)
--- a/src/modules/opengl/filter_lift_gamma_gain.cpp
+++ b/src/modules/opengl/filter_lift_gamma_gain.cpp
@@ -21,34 +21,47 @@
 #include <string.h>
 #include <assert.h>
 
-#include "glsl_manager.h"
+#include "filter_glsl_manager.h"
 #include <movit/lift_gamma_gain_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 );
+               RGBTriplet triplet(
+                       mlt_properties_anim_get_double( properties, "lift_r", position, length ),
+                       mlt_properties_anim_get_double( properties, "lift_g", position, length ),
+                       mlt_properties_anim_get_double( properties, "lift_b", position, length )
+               );
+               bool ok = effect->set_vec3( "lift", (float*) &triplet );
+               triplet.r = mlt_properties_anim_get_double( properties, "gamma_r", position, length );
+               triplet.g = mlt_properties_anim_get_double( properties, "gamma_g", position, length );
+               triplet.b = mlt_properties_anim_get_double( properties, "gamma_b", position, length );
+               ok |= effect->set_vec3( "gamma", (float*) &triplet );
+               triplet.r = mlt_properties_anim_get_double( properties, "gain_r", position, length );
+               triplet.g = mlt_properties_anim_get_double( properties, "gain_g", position, length );
+               triplet.b = mlt_properties_anim_get_double( properties, "gain_b", position, length );
+               ok |= effect->set_vec3( "gain", (float*) &triplet );
+               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 LiftGammaGainEffect );
-               if ( effect ) {
-                       mlt_properties filter_props = MLT_FILTER_PROPERTIES( filter );
-                       RGBTriplet triplet(
-                               mlt_properties_get_double( filter_props, "lift_r" ),
-                               mlt_properties_get_double( filter_props, "lift_g" ),
-                               mlt_properties_get_double( filter_props, "lift_b" )
-                       );
-                       bool ok = effect->set_vec3( "lift", (float*) &triplet );
-                       triplet.r = mlt_properties_get_double( filter_props, "gamma_r" );
-                       triplet.g = mlt_properties_get_double( filter_props, "gamma_g" );
-                       triplet.b = mlt_properties_get_double( filter_props, "gamma_b" );
-                       ok |= effect->set_vec3( "gamma", (float*) &triplet );
-                       triplet.r = mlt_properties_get_double( filter_props, "gain_r" );
-                       triplet.g = mlt_properties_get_double( filter_props, "gain_g" );
-                       triplet.b = mlt_properties_get_double( filter_props, "gain_b" );
-                       ok |= effect->set_vec3( "gain", (float*) &triplet );
-                       assert(ok);
-               }
+               if ( !GlslManager::get_effect( filter, frame ) )
+                       GlslManager::add_effect( filter, frame, new LiftGammaGainEffect );
        }
+       mlt_frame_push_service( frame, filter );
+       mlt_frame_push_get_image( frame, get_image );
        return frame;
 }