X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=gamma_expansion_effect_test.cpp;h=ed124c4f31c7a9d750c91bcf4269e4398fd7839c;hp=0fd9a71dd57518e8b28fba15268a7690fa2754b6;hb=9e62fbe2ac764479c449472d8bda52ac4df0de91;hpb=b76bbc2fce2c56aa65bb8827a3e488c5726a4a9f

diff --git a/gamma_expansion_effect_test.cpp b/gamma_expansion_effect_test.cpp
index 0fd9a71..ed124c4 100644
--- a/gamma_expansion_effect_test.cpp
+++ b/gamma_expansion_effect_test.cpp
@@ -14,8 +14,8 @@ TEST(GammaExpansionEffectTest, sRGB_KeyValues) {
 		0.00309f, 0.00317f, 
 	};
 	float out_data[4];
-	EffectChainTester tester(data, 2, 2, COLORSPACE_sRGB, GAMMA_sRGB);
-	tester.run(out_data, COLORSPACE_sRGB, GAMMA_LINEAR);
+	EffectChainTester tester(data, 2, 2, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_sRGB);
+	tester.run(out_data, GL_RED, COLORSPACE_sRGB, GAMMA_LINEAR);
 
 	expect_equal(expected_data, out_data, 2, 2);
 }
@@ -25,8 +25,38 @@ TEST(GammaExpansionEffectTest, sRGB_RampAlwaysIncreases) {
 	for (unsigned i = 0; i < 256; ++i) {
 		data[i] = i / 255.0f;
 	}
-	EffectChainTester tester(data, 256, 1, COLORSPACE_sRGB, GAMMA_sRGB);
-	tester.run(out_data, COLORSPACE_sRGB, GAMMA_LINEAR);
+	EffectChainTester tester(data, 256, 1, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_sRGB);
+	tester.run(out_data, GL_RED, COLORSPACE_sRGB, GAMMA_LINEAR);
+
+	for (unsigned i = 1; i < 256; ++i) {
+		EXPECT_GT(out_data[i], out_data[i - 1])
+		   << "No increase between " << i-1 << " and " << i;
+	}
+}
+
+TEST(GammaExpansionEffectTest, Rec709_KeyValues) {
+	float data[] = {
+		0.0f, 1.0f,
+		0.080f, 0.082f,  // On either side of the discontinuity.
+	};
+	float expected_data[] = {
+		0.0f, 1.0f,
+		0.017778f, 0.018167f,
+	};
+	float out_data[4];
+	EffectChainTester tester(data, 2, 2, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_REC_709);
+	tester.run(out_data, GL_RED, COLORSPACE_sRGB, GAMMA_LINEAR);
+
+	expect_equal(expected_data, out_data, 2, 2);
+}
+
+TEST(GammaExpansionEffectTest, Rec709_RampAlwaysIncreases) {
+	float data[256], out_data[256];
+	for (unsigned i = 0; i < 256; ++i) {
+		data[i] = i / 255.0f;
+	}
+	EffectChainTester tester(data, 256, 1, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_REC_709);
+	tester.run(out_data, GL_RED, COLORSPACE_sRGB, GAMMA_LINEAR);
 
 	for (unsigned i = 1; i < 256; ++i) {
 		EXPECT_GT(out_data[i], out_data[i - 1])