X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=overlay_effect_test.cpp;h=3f7ffd3e97229b15aa42cf85ba774593b2e6c422;hp=009a757e1bbaabf6e639af39a6a517c1ee2cf907;hb=f216b7bef5a968c89f6fc78e83cc26a91e504a8a;hpb=5e05605a85a15944b95d7000745446756cdcbfa8

diff --git a/overlay_effect_test.cpp b/overlay_effect_test.cpp
index 009a757..3f7ffd3 100644
--- a/overlay_effect_test.cpp
+++ b/overlay_effect_test.cpp
@@ -1,27 +1,43 @@
 // Unit tests for OverlayEffect.
 
-#include "test_util.h"
+#include <epoxy/gl.h>
+
+#include "effect_chain.h"
 #include "gtest/gtest.h"
+#include "image_format.h"
+#include "input.h"
 #include "overlay_effect.h"
+#include "test_util.h"
+#include "util.h"
+
+namespace movit {
 
 TEST(OverlayEffectTest, TopDominatesBottomWhenNoAlpha) {
-	float data_a[] = {
-		0.0f, 0.25f,
-		0.75f, 1.0f,
-	};
-	float data_b[] = {
-		1.0f, 0.5f,
-		0.75f, 0.6f,
-	};
-	float out_data[4];
-	EffectChainTester tester(data_a, 2, 2, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_LINEAR);
-	Effect *input1 = tester.get_chain()->last_added_effect();
-	Effect *input2 = tester.add_input(data_b, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_LINEAR);
+	for (int swap_inputs = 0; swap_inputs < 2; ++swap_inputs) {  // false, true.
+		float data_a[] = {
+			0.0f, 0.25f,
+			0.75f, 1.0f,
+		};
+		float data_b[] = {
+			1.0f, 0.5f,
+			0.75f, 0.6f,
+		};
+		float out_data[4];
+		EffectChainTester tester(data_a, 2, 2, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_LINEAR);
+		Effect *input1 = tester.get_chain()->last_added_effect();
+		Effect *input2 = tester.add_input(data_b, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_LINEAR);
 
-	tester.get_chain()->add_effect(new OverlayEffect(), input1, input2);
-	tester.run(out_data, GL_RED, COLORSPACE_sRGB, GAMMA_LINEAR);
+		OverlayEffect *effect = new OverlayEffect();
+		CHECK(effect->set_int("swap_inputs", swap_inputs));
+		tester.get_chain()->add_effect(effect, input1, input2);
+		tester.run(out_data, GL_RED, COLORSPACE_sRGB, GAMMA_LINEAR);
 
-	expect_equal(data_b, out_data, 2, 2);
+		if (swap_inputs) {
+			expect_equal(data_a, out_data, 2, 2);
+		} else {
+			expect_equal(data_b, out_data, 2, 2);
+		}
+	}
 }
 
 TEST(OverlayEffectTest, BottomDominatesTopWhenTopIsTransparent) {
@@ -32,17 +48,17 @@ TEST(OverlayEffectTest, BottomDominatesTopWhenTopIsTransparent) {
 		0.5f, 0.5f, 0.5f, 0.0f,
 	};
 	float out_data[4];
-	EffectChainTester tester(data_a, 1, 1, FORMAT_BGRA, COLORSPACE_sRGB, GAMMA_LINEAR);
+	EffectChainTester tester(data_a, 1, 1, FORMAT_RGBA_POSTMULTIPLIED_ALPHA, COLORSPACE_sRGB, GAMMA_LINEAR);
 	Effect *input1 = tester.get_chain()->last_added_effect();
-	Effect *input2 = tester.add_input(data_b, FORMAT_BGRA, COLORSPACE_sRGB, GAMMA_LINEAR);
+	Effect *input2 = tester.add_input(data_b, FORMAT_RGBA_POSTMULTIPLIED_ALPHA, COLORSPACE_sRGB, GAMMA_LINEAR);
 
 	tester.get_chain()->add_effect(new OverlayEffect(), input1, input2);
-	tester.run(out_data, GL_BGRA, COLORSPACE_sRGB, GAMMA_LINEAR);
+	tester.run(out_data, GL_RGBA, COLORSPACE_sRGB, GAMMA_LINEAR);
 
 	expect_equal(data_a, out_data, 4, 1);
 }
 
-TEST(OverlayEffectTest, ZeroAlphaBecomesAllZero) {
+TEST(OverlayEffectTest, ZeroAlphaRemainsZeroAlpha) {
 	float data_a[] = {
 		0.0f, 0.25f, 0.5f, 0.0f
 	};
@@ -53,14 +69,14 @@ TEST(OverlayEffectTest, ZeroAlphaBecomesAllZero) {
 		0.0f, 0.0f, 0.0f, 0.0f
 	};
 	float out_data[4];
-	EffectChainTester tester(data_a, 1, 1, FORMAT_BGRA, COLORSPACE_sRGB, GAMMA_LINEAR);
+	EffectChainTester tester(data_a, 1, 1, FORMAT_RGBA_POSTMULTIPLIED_ALPHA, COLORSPACE_sRGB, GAMMA_LINEAR);
 	Effect *input1 = tester.get_chain()->last_added_effect();
-	Effect *input2 = tester.add_input(data_b, FORMAT_BGRA, COLORSPACE_sRGB, GAMMA_LINEAR);
+	Effect *input2 = tester.add_input(data_b, FORMAT_RGBA_POSTMULTIPLIED_ALPHA, COLORSPACE_sRGB, GAMMA_LINEAR);
 
 	tester.get_chain()->add_effect(new OverlayEffect(), input1, input2);
-	tester.run(out_data, GL_BGRA, COLORSPACE_sRGB, GAMMA_LINEAR);
+	tester.run(out_data, GL_RGBA, COLORSPACE_sRGB, GAMMA_LINEAR);
 
-	expect_equal(expected_data, out_data, 4, 1);
+	EXPECT_FLOAT_EQ(0.0f, expected_data[3]);
 }
 
 // This is tested against what Photoshop does: (255,0,128, 0.25) over (128,255,0, 0.5)
@@ -77,12 +93,14 @@ TEST(OverlayEffectTest, PhotoshopReferenceTest) {
 		179.0f/255.0f, 153.0f/255.0f, 51.0f/255.0f, 0.625f
 	};
 	float out_data[4];
-	EffectChainTester tester(data_a, 1, 1, FORMAT_BGRA, COLORSPACE_sRGB, GAMMA_LINEAR);
+	EffectChainTester tester(data_a, 1, 1, FORMAT_RGBA_POSTMULTIPLIED_ALPHA, COLORSPACE_sRGB, GAMMA_LINEAR);
 	Effect *input1 = tester.get_chain()->last_added_effect();
-	Effect *input2 = tester.add_input(data_b, FORMAT_BGRA, COLORSPACE_sRGB, GAMMA_LINEAR);
+	Effect *input2 = tester.add_input(data_b, FORMAT_RGBA_POSTMULTIPLIED_ALPHA, COLORSPACE_sRGB, GAMMA_LINEAR);
 
 	tester.get_chain()->add_effect(new OverlayEffect(), input1, input2);
-	tester.run(out_data, GL_BGRA, COLORSPACE_sRGB, GAMMA_LINEAR);
+	tester.run(out_data, GL_RGBA, COLORSPACE_sRGB, GAMMA_LINEAR);
 
 	expect_equal(expected_data, out_data, 4, 1);
 }
+
+}  // namespace movit