Movit can hardly be said to be in alpha stage anymore.

[movit] / white_balance_effect.cpp

diff --git a/white_balance_effect.cpp b/white_balance_effect.cpp
index 8a495fb6f3616b45fb8c78b9988d028b1c8cfa1e..0aa85da66f0159ca7bfd94e8b7ff1e132c73746a 100644 (file)
--- a/white_balance_effect.cpp
+++ b/white_balance_effect.cpp
@@ -1,14 +1,19 @@
-#include <math.h>
-#include <assert.h>
-
+#include <Eigen/Core>
 #include <Eigen/LU>
+#include <GL/glew.h>
+#include <assert.h>
 
-#include "white_balance_effect.h"
-#include "util.h"
-#include "opengl.h"
+#include "colorspace_conversion_effect.h"
 #include "d65.h"
+#include "effect_util.h"
+#include "image_format.h"
+#include "util.h"
+#include "white_balance_effect.h"
 
 using namespace Eigen;
+using namespace std;
+
+namespace movit {
 
 namespace {
 
@@ -22,7 +27,7 @@ Vector3d convert_color_temperature_to_xyz(float T)
        assert(T <= 15000.0f);
 
        if (T <= 4000.0f) {
-               x = ((-0.2661239e9 * invT - 0.2343580e6) * invT + 0.8776956e3) * invT + 0.179910;
+               x = ((-0.2661239e9 * invT - 0.2343589e6) * invT + 0.8776956e3) * invT + 0.179910;
        } else {
                x = ((-3.0258469e9 * invT + 2.1070379e6) * invT + 0.2226347e3) * invT + 0.240390;
        }
@@ -38,13 +43,6 @@ Vector3d convert_color_temperature_to_xyz(float T)
        return Vector3d(x, y, 1.0 - x - y);
 }
 
-// Assuming sRGB primaries, from Wikipedia.
-double rgb_to_xyz_matrix[9] = {
-       0.4124, 0.2126, 0.0193, 
-       0.3576, 0.7152, 0.1192,
-       0.1805, 0.0722, 0.9505,
-};
-
 /*
  * There are several different perceptual color spaces with different intended
  * uses; for instance, CIECAM02 uses one space (CAT02) for purposes of computing
@@ -53,9 +51,9 @@ double rgb_to_xyz_matrix[9] = {
  * (Hunt-Pointer-Estevez, or HPE) for the actual perception post-adaptation. 
  *
  * CIECAM02 chromatic adaptation, while related to the transformation we want,
- * is a more complex phenomenon that depends on factors like the total luminance
- * (in cd/m²) of the illuminant, and can no longer be implemented by just scaling
- * each component in LMS space linearly. The simpler way out is to use the HPE matrix,
+ * is a more complex phenomenon that depends on factors like the viewing conditions
+ * (e.g. amount of surrounding light), and can no longer be implemented by just scaling
+ * each component in LMS space. The simpler way out is to use the HPE matrix,
  * which is intended to be close to the actual cone response; this results in
  * the “von Kries transformation” when we couple it with normalization in LMS space.
  *
@@ -109,15 +107,16 @@ WhiteBalanceEffect::WhiteBalanceEffect()
        register_float("output_color_temperature", &output_color_temperature);
 }
 
-std::string WhiteBalanceEffect::output_fragment_shader()
+string WhiteBalanceEffect::output_fragment_shader()
 {
        return read_file("white_balance_effect.frag");
 }
 
-void WhiteBalanceEffect::set_gl_state(GLuint glsl_program_num, const std::string &prefix, unsigned *sampler_num)
+void WhiteBalanceEffect::set_gl_state(GLuint glsl_program_num, const string &prefix, unsigned *sampler_num)
 {
+       Matrix3d rgb_to_xyz_matrix = ColorspaceConversionEffect::get_xyz_matrix(COLORSPACE_sRGB);
        Vector3d rgb(neutral_color.r, neutral_color.g, neutral_color.b);
-       Vector3d xyz = Map<const Matrix3d>(rgb_to_xyz_matrix) * rgb;
+       Vector3d xyz = rgb_to_xyz_matrix * rgb;
        Vector3d lms_scale = compute_lms_scaling_factors(xyz);
 
        /*
@@ -144,10 +143,12 @@ void WhiteBalanceEffect::set_gl_state(GLuint glsl_program_num, const std::string
         * has to be the opposite of the execution order.
         */
        Matrix3d corr_matrix =
-               Map<const Matrix3d>(rgb_to_xyz_matrix).inverse() *
+               rgb_to_xyz_matrix.inverse() *
                Map<const Matrix3d>(xyz_to_lms_matrix).inverse() *
                lms_scale.asDiagonal() *
                Map<const Matrix3d>(xyz_to_lms_matrix) *
-               Map<const Matrix3d>(rgb_to_xyz_matrix);
+               rgb_to_xyz_matrix;
        set_uniform_mat3(glsl_program_num, prefix, "correction_matrix", corr_matrix);
 }
+
+}  // namespace movit