Change get_effect/add_effect to take in mlt_service.

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

diff --git a/src/modules/opengl/filter_white_balance.cpp b/src/modules/opengl/filter_white_balance.cpp
index 1b458e7dab6ef12b6d04aba3093decd43166308b..fa04776148ee53f80a2791d0172489626c237fd7 100644 (file)
--- a/src/modules/opengl/filter_white_balance.cpp
+++ b/src/modules/opengl/filter_white_balance.cpp
@@ -19,25 +19,36 @@
 
 #include <framework/mlt.h>
 #include <string.h>
+#include <math.h>
 #include <assert.h>
 
-#include "glsl_manager.h"
+#include "filter_glsl_manager.h"
 #include <movit/white_balance_effect.h>
 
+static double srgb8_to_linear(int c)
+{
+       double x = c / 255.0f;
+       if (x < 0.04045f) {
+               return (1.0/12.92f) * x;
+       } else {
+               return pow((x + 0.055) * (1.0/1.055f), 2.4);
+       }
+}
+
 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 );
+       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 );
                int color_int = mlt_properties_anim_get_int( properties, "neutral_color", position, length );
                RGBTriplet color(
-                       float((color_int >> 24) & 0xff) / 255.0f,
-                       float((color_int >> 16) & 0xff) / 255.0f,
-                       float((color_int >> 8) & 0xff) / 255.0f
+                       srgb8_to_linear((color_int >> 24) & 0xff),
+                       srgb8_to_linear((color_int >> 16) & 0xff),
+                       srgb8_to_linear((color_int >> 8) & 0xff)
                );
                bool ok = effect->set_vec3( "neutral_color", (float*) &color );
                ok |= effect->set_float( "output_color_temperature",
@@ -52,8 +63,8 @@ static int get_image( mlt_frame frame, uint8_t **image, mlt_image_format *format
 static mlt_frame process( mlt_filter filter, mlt_frame frame )
 {
        if ( !mlt_frame_is_test_card( frame ) ) {
-               if ( !GlslManager::get_effect( filter, frame ) )
-                       GlslManager::add_effect( filter, frame, new WhiteBalanceEffect );
+               if ( !GlslManager::get_effect( MLT_FILTER_SERVICE( filter ), frame ) )
+                       GlslManager::add_effect( MLT_FILTER_SERVICE( filter ), frame, new WhiteBalanceEffect );
        }
        mlt_frame_push_service( frame, filter );
        mlt_frame_push_get_image( frame, get_image );