X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=padding_effect_test.cpp;h=dd836ea066ee527dd6f5af3aaa6c4415eeebe28b;hp=1d2be797eb93a38bfb59fd13b8b6716cd56a703d;hb=refs%2Fheads%2Fepoxy;hpb=5d4c0425579de66b3e2dd7d0095e890278f8efcf

diff --git a/padding_effect_test.cpp b/padding_effect_test.cpp
index 1d2be79..dd836ea 100644
--- a/padding_effect_test.cpp
+++ b/padding_effect_test.cpp
@@ -1,9 +1,17 @@
 // Unit tests for AlphaMultiplicationEffect.
 
-#include "test_util.h"
+#include <epoxy/gl.h>
+#include <stddef.h>
+
+#include "effect_chain.h"
 #include "flat_input.h"
-#include "padding_effect.h"
 #include "gtest/gtest.h"
+#include "image_format.h"
+#include "padding_effect.h"
+#include "test_util.h"
+#include "util.h"
+
+namespace movit {
 
 TEST(PaddingEffectTest, SimpleCenter) {
 	float data[2 * 2] = {
@@ -34,7 +42,7 @@ TEST(PaddingEffectTest, SimpleCenter) {
 	CHECK(effect->set_float("left", 1.0f));
 	CHECK(effect->set_float("top", 1.0f));
 
-	tester.run(out_data, GL_RED, COLORSPACE_sRGB, GAMMA_LINEAR, OUTPUT_ALPHA_PREMULTIPLIED);
+	tester.run(out_data, GL_RED, COLORSPACE_sRGB, GAMMA_LINEAR, OUTPUT_ALPHA_FORMAT_PREMULTIPLIED);
 	expect_equal(expected_data, out_data, 4, 4);
 }
 
@@ -67,10 +75,10 @@ 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_PREMULTIPLIED);
+	tester.run(out_data, GL_RED, COLORSPACE_sRGB, GAMMA_LINEAR, OUTPUT_ALPHA_FORMAT_PREMULTIPLIED);
 	expect_equal(expected_data, out_data, 4, 4);
 }
 
@@ -100,10 +108,10 @@ 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_POSTMULTIPLIED_ALPHA);
+	tester.run(out_data, GL_RGBA, COLORSPACE_REC_601_625, GAMMA_REC_601, OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED);
 	expect_equal(expected_data, out_data, 4, 2);
 }
 
@@ -134,7 +142,7 @@ TEST(PaddingEffectTest, DifferentXAndYOffset) {
 	CHECK(effect->set_float("left", 2.0f));
 	CHECK(effect->set_float("top", 1.0f));
 
-	tester.run(out_data, GL_RED, COLORSPACE_sRGB, GAMMA_LINEAR, OUTPUT_ALPHA_PREMULTIPLIED);
+	tester.run(out_data, GL_RED, COLORSPACE_sRGB, GAMMA_LINEAR, OUTPUT_ALPHA_FORMAT_PREMULTIPLIED);
 	expect_equal(expected_data, out_data, 3, 3);
 }
 
@@ -166,7 +174,7 @@ TEST(PaddingEffectTest, NonIntegerOffset) {
 	CHECK(effect->set_float("left", 0.25f));
 	CHECK(effect->set_float("top", 0.0f));
 
-	tester.run(out_data, GL_RED, COLORSPACE_sRGB, GAMMA_LINEAR, OUTPUT_ALPHA_PREMULTIPLIED);
+	tester.run(out_data, GL_RED, COLORSPACE_sRGB, GAMMA_LINEAR, OUTPUT_ALPHA_FORMAT_PREMULTIPLIED);
 	expect_equal(expected_data, out_data, 5, 2);
 }
 
@@ -196,6 +204,44 @@ TEST(PaddingEffectTest, Crop) {
 	CHECK(effect->set_float("left", -1.0f));
 	CHECK(effect->set_float("top", -1.0f));
 
-	tester.run(out_data, GL_RED, COLORSPACE_sRGB, GAMMA_LINEAR, OUTPUT_ALPHA_PREMULTIPLIED);
+	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