Factorize out some stuff from EffectChainTester::run().

[movit] / colorspace_conversion_effect.cpp

diff --git a/colorspace_conversion_effect.cpp b/colorspace_conversion_effect.cpp
index 3f075d2b721141ef6c13428c24b93c854d4879f3..3a8ad95c578c4626b190b7c04ce14b5c9c6e7770 100644 (file)
--- a/colorspace_conversion_effect.cpp
+++ b/colorspace_conversion_effect.cpp
@@ -4,21 +4,19 @@
 
 #include "colorspace_conversion_effect.h"
 #include "util.h"
+#include "d65.h"
 
 using namespace Eigen;
 
 // Color coordinates from Rec. 709; sRGB uses the same primaries.
-double rec709_x_R = 0.640,  rec709_x_G = 0.300,  rec709_x_B = 0.150;
-double rec709_y_R = 0.330,  rec709_y_G = 0.600,  rec709_y_B = 0.060;
+static const double rec709_x_R = 0.640, rec709_x_G = 0.300, rec709_x_B = 0.150;
+static const double rec709_y_R = 0.330, rec709_y_G = 0.600, rec709_y_B = 0.060;
 
 // Color coordinates from Rec. 601. (Separate for 525- and 625-line systems.)
-double rec601_525_x_R = 0.630, rec601_525_x_G = 0.310, rec601_525_x_B = 0.155;
-double rec601_525_y_R = 0.340, rec601_525_y_G = 0.595, rec601_525_y_B = 0.070;
-double rec601_625_x_R = 0.640, rec601_625_x_G = 0.290, rec601_625_x_B = 0.150;
-double rec601_625_y_R = 0.330, rec601_625_y_G = 0.600, rec601_625_y_B = 0.060;
-
-// The D65 white point. Given in both Rec. 601 and 709.
-double d65_x = 0.3127, d65_y = 0.3290;
+static const double rec601_525_x_R = 0.630, rec601_525_x_G = 0.310, rec601_525_x_B = 0.155;
+static const double rec601_525_y_R = 0.340, rec601_525_y_G = 0.595, rec601_525_y_B = 0.070;
+static const double rec601_625_x_R = 0.640, rec601_625_x_G = 0.290, rec601_625_x_B = 0.150;
+static const double rec601_625_y_R = 0.330, rec601_625_y_G = 0.600, rec601_625_y_B = 0.060;
 
 ColorspaceConversionEffect::ColorspaceConversionEffect()
        : source_space(COLORSPACE_sRGB),
@@ -59,14 +57,6 @@ Matrix3d get_xyz_matrix(Colorspace space)
        double z_G = 1.0 - x_G - y_G;
        double z_B = 1.0 - x_B - y_B;
 
-       // Find the XYZ coordinates of D65 (white point for both Rec. 601 and 709),
-       // normalized so that Y=1.
-       Vector3d d65_XYZ(
-               d65_x / d65_y,
-               1.0,
-               (1.0 - d65_x - d65_y) / d65_y
-       );
-
        // We have, for each primary (example is with red):
        //
        //   X_R / (X_R + Y_R + Z_R) = x_R
@@ -107,6 +97,7 @@ Matrix3d get_xyz_matrix(Colorspace space)
        temp(2,1) = z_G / y_G;
        temp(2,2) = z_B / y_B;
 
+       Vector3d d65_XYZ(d65_X, d65_Y, d65_Z);
        Vector3d Y_RGB = temp.inverse() * d65_XYZ;
 
        // Now convert xyY -> XYZ.