X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=lift_gamma_gain_effect_test.cpp;h=f9163a8b32ea53188c831386512d78172828c58d;hp=00c96ca6b33efdcef06e8c000bfe0e422dda22db;hb=eff011224abc5dc81f801f3ea44572287a55bcac;hpb=6b890b1591c0f6f67c8ec223b32a8cfae11ba874

diff --git a/lift_gamma_gain_effect_test.cpp b/lift_gamma_gain_effect_test.cpp
index 00c96ca..f9163a8 100644
--- a/lift_gamma_gain_effect_test.cpp
+++ b/lift_gamma_gain_effect_test.cpp
@@ -1,8 +1,14 @@
 // Unit tests for LiftGammaGainEffect.
 
-#include "test_util.h"
+#include <epoxy/gl.h>
+
+#include "effect_chain.h"
 #include "gtest/gtest.h"
+#include "image_format.h"
 #include "lift_gamma_gain_effect.h"
+#include "test_util.h"
+
+namespace movit {
 
 TEST(LiftGammaGainEffectTest, DefaultIsNoop) {
 	float data[] = {
@@ -14,7 +20,7 @@ TEST(LiftGammaGainEffectTest, DefaultIsNoop) {
 	};
 
 	float out_data[5 * 4];
-	EffectChainTester tester(data, 1, 5, FORMAT_RGBA, COLORSPACE_sRGB, GAMMA_LINEAR);
+	EffectChainTester tester(data, 1, 5, FORMAT_RGBA_POSTMULTIPLIED_ALPHA, COLORSPACE_sRGB, GAMMA_LINEAR);
 	tester.get_chain()->add_effect(new LiftGammaGainEffect());
 	tester.run(out_data, GL_RGBA, COLORSPACE_sRGB, GAMMA_LINEAR);
 
@@ -39,7 +45,7 @@ TEST(LiftGammaGainEffectTest, Gain) {
 	};
 
 	float out_data[5 * 4];
-	EffectChainTester tester(data, 1, 5, FORMAT_RGBA, COLORSPACE_sRGB, GAMMA_LINEAR);
+	EffectChainTester tester(data, 1, 5, FORMAT_RGBA_POSTMULTIPLIED_ALPHA, COLORSPACE_sRGB, GAMMA_LINEAR);
 	Effect *lgg_effect = tester.get_chain()->add_effect(new LiftGammaGainEffect());
 	ASSERT_TRUE(lgg_effect->set_vec3("gain", gain));
 	tester.run(out_data, GL_RGBA, COLORSPACE_sRGB, GAMMA_LINEAR);
@@ -65,7 +71,7 @@ TEST(LiftGammaGainEffectTest, LiftIsDoneInApproximatelysRGB) {
 	};
 
 	float out_data[5 * 4];
-	EffectChainTester tester(data, 1, 5, FORMAT_RGBA, COLORSPACE_sRGB, GAMMA_sRGB);
+	EffectChainTester tester(data, 1, 5, FORMAT_RGBA_POSTMULTIPLIED_ALPHA, COLORSPACE_sRGB, GAMMA_sRGB);
 	Effect *lgg_effect = tester.get_chain()->add_effect(new LiftGammaGainEffect());
 	ASSERT_TRUE(lgg_effect->set_vec3("lift", lift));
 	tester.run(out_data, GL_RGBA, COLORSPACE_sRGB, GAMMA_sRGB);
@@ -85,10 +91,59 @@ TEST(LiftGammaGainEffectTest, Gamma22IsApproximatelysRGB) {
 	float gamma[3] = { 2.2f, 2.2f, 2.2f };
 
 	float out_data[5 * 4];
-	EffectChainTester tester(data, 1, 5, FORMAT_RGBA, COLORSPACE_sRGB, GAMMA_sRGB);
+	EffectChainTester tester(data, 1, 5, FORMAT_RGBA_POSTMULTIPLIED_ALPHA, COLORSPACE_sRGB, GAMMA_sRGB);
 	Effect *lgg_effect = tester.get_chain()->add_effect(new LiftGammaGainEffect());
 	ASSERT_TRUE(lgg_effect->set_vec3("gamma", gamma));
 	tester.run(out_data, GL_RGBA, COLORSPACE_sRGB, GAMMA_LINEAR);
 
 	expect_equal(data, out_data, 4, 5);
 }
+
+TEST(LiftGammaGainEffectTest, OutOfGamutColorsAreClipped) {
+	float data[] = {
+		-0.5f, 0.3f, 0.0f, 1.0f,
+		 0.5f, 0.0f, 0.0f, 1.0f,
+		 0.0f, 1.5f, 0.5f, 0.3f,
+	};
+	float expected_data[] = {
+		 0.0f, 0.3f, 0.0f, 1.0f,  // Clipped to zero.
+		 0.5f, 0.0f, 0.0f, 1.0f,
+		 0.0f, 1.5f, 0.5f, 0.3f,
+	};
+
+	float out_data[3 * 4];
+	EffectChainTester tester(data, 1, 3, FORMAT_RGBA_POSTMULTIPLIED_ALPHA, COLORSPACE_sRGB, GAMMA_LINEAR);
+	tester.get_chain()->add_effect(new LiftGammaGainEffect());
+	tester.run(out_data, GL_RGBA, COLORSPACE_sRGB, GAMMA_LINEAR);
+
+	expect_equal(expected_data, out_data, 4, 3);
+}
+
+TEST(LiftGammaGainEffectTest, NegativeLiftIsClamped) {
+	float data[] = {
+		0.0f, 0.0f, 0.0f, 1.0f,
+		0.5f, 0.5f, 0.5f, 0.3f,
+		1.0f, 0.0f, 0.0f, 1.0f,
+		0.0f, 1.0f, 0.0f, 0.7f,
+		0.0f, 0.0f, 1.0f, 1.0f,
+	};
+	float lift[3] = { 0.0f, -0.1f, -0.2f };
+	float expected_data[] = {
+		0.0f, 0.0f , 0.0f, 1.0f,  // Note: Clamped below zero.
+		0.5f, 0.45f, 0.4f, 0.3f,
+		1.0f, 0.0f,  0.0f, 1.0f,  // Unaffected.
+		0.0f, 1.0f,  0.0f, 0.7f,
+		0.0f, 0.0f,  1.0f, 1.0f,
+	};
+
+	float out_data[5 * 4];
+	EffectChainTester tester(data, 1, 5, FORMAT_RGBA_POSTMULTIPLIED_ALPHA, COLORSPACE_sRGB, GAMMA_sRGB);
+	Effect *lgg_effect = tester.get_chain()->add_effect(new LiftGammaGainEffect());
+	ASSERT_TRUE(lgg_effect->set_vec3("lift", lift));
+	tester.run(out_data, GL_RGBA, COLORSPACE_sRGB, GAMMA_sRGB);
+
+	// sRGB is only approximately gamma-2.2, so loosen up the limits a bit.
+	expect_equal(expected_data, out_data, 4, 5, 0.03, 0.003);
+}
+
+}  // namespace movit