X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=padding_effect_test.cpp;h=dd836ea066ee527dd6f5af3aaa6c4415eeebe28b;hp=f86df3aff4d7f178e01eb636b442982e4157480f;hb=67b2debafd624d3be66588171d6ec677b54247ba;hpb=37f56fcbe571b2322243f6de59494bf9e0cbb37a

diff --git a/padding_effect_test.cpp b/padding_effect_test.cpp
index f86df3a..dd836ea 100644
--- a/padding_effect_test.cpp
+++ b/padding_effect_test.cpp
@@ -1,5 +1,6 @@
 // Unit tests for AlphaMultiplicationEffect.
 
+#include <epoxy/gl.h>
 #include <stddef.h>
 
 #include "effect_chain.h"
@@ -10,6 +11,8 @@
 #include "test_util.h"
 #include "util.h"
 
+namespace movit {
+
 TEST(PaddingEffectTest, SimpleCenter) {
 	float data[2 * 2] = {
 		1.0f, 0.5f,
@@ -72,7 +75,7 @@ TEST(PaddingEffectTest, WhiteBorderColor) {
 	CHECK(effect->set_float("left", 1.0f));
 	CHECK(effect->set_float("top", 1.0f));
 
-	RGBATriplet border_color(1.0f, 1.0f, 1.0f, 1.0f);
+	RGBATuple border_color(1.0f, 1.0f, 1.0f, 1.0f);
 	CHECK(effect->set_vec4("border_color", (float *)&border_color));
 
 	tester.run(out_data, GL_RED, COLORSPACE_sRGB, GAMMA_LINEAR, OUTPUT_ALPHA_FORMAT_PREMULTIPLIED);
@@ -105,7 +108,7 @@ TEST(PaddingEffectTest, BorderColorIsInLinearGamma) {
 	CHECK(effect->set_float("left", 0.0f));
 	CHECK(effect->set_float("top", 0.0f));
 
-	RGBATriplet border_color(0.2f, 0.4f, 0.6f, 0.8f);  // Same as the pixel in data[].
+	RGBATuple border_color(0.2f, 0.4f, 0.6f, 0.8f);  // Same as the pixel in data[].
 	CHECK(effect->set_vec4("border_color", (float *)&border_color));
 
 	tester.run(out_data, GL_RGBA, COLORSPACE_REC_601_625, GAMMA_REC_601, OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED);
@@ -204,3 +207,41 @@ TEST(PaddingEffectTest, Crop) {
 	tester.run(out_data, GL_RED, COLORSPACE_sRGB, GAMMA_LINEAR, OUTPUT_ALPHA_FORMAT_PREMULTIPLIED);
 	expect_equal(expected_data, out_data, 1, 1);
 }
+
+TEST(PaddingEffectTest, AlphaIsCorrectEvenWithNonLinearInputsAndOutputs) {
+	float data[2 * 1] = {
+		1.0f,
+		0.8f,
+	};
+	float expected_data[4 * 4] = {
+		1.0f, 1.0f, 1.0f, 0.5f,
+		1.0f, 1.0f, 1.0f, 1.0f,
+		0.8f, 0.8f, 0.8f, 1.0f,
+		1.0f, 1.0f, 1.0f, 0.5f,
+	};
+	float out_data[4 * 4];
+
+	EffectChainTester tester(NULL, 1, 4);
+
+	ImageFormat format;
+	format.color_space = COLORSPACE_REC_601_625;
+	format.gamma_curve = GAMMA_REC_709;
+
+	FlatInput *input = new FlatInput(format, FORMAT_GRAYSCALE, GL_FLOAT, 1, 2);
+	input->set_pixel_data(data);
+	tester.get_chain()->add_input(input);
+
+	Effect *effect = tester.get_chain()->add_effect(new PaddingEffect());
+	CHECK(effect->set_int("width", 1));
+	CHECK(effect->set_int("height", 4));
+	CHECK(effect->set_float("left", 0.0f));
+	CHECK(effect->set_float("top", 1.0f));
+
+	RGBATuple border_color(1.0f, 1.0f, 1.0f, 0.5f);
+	CHECK(effect->set_vec4("border_color", (float *)&border_color));
+
+	tester.run(out_data, GL_RGBA, COLORSPACE_REC_601_625, GAMMA_REC_709, OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED);
+	expect_equal(expected_data, out_data, 4, 4);
+}
+
+}  // namespace movit