X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=padding_effect_test.cpp;h=5fa0e42a77235bae2777476bbe34f928ef62408e;hp=a1a36b9c29e3f6ff22c9dcc3fbd0e40431cf9ef9;hb=81f33379cabb7cf8b47f2d2bd3892f853afc89ab;hpb=82071a94aaff95d2d29d077338085a8fb27e76d1

diff --git a/padding_effect_test.cpp b/padding_effect_test.cpp
index a1a36b9..5fa0e42 100644
--- a/padding_effect_test.cpp
+++ b/padding_effect_test.cpp
@@ -26,7 +26,7 @@ TEST(PaddingEffectTest, SimpleCenter) {
 	};
 	float out_data[4 * 4];
 
-        EffectChainTester tester(NULL, 4, 4);
+        EffectChainTester tester(nullptr, 4, 4);
 
 	ImageFormat format;
 	format.color_space = COLORSPACE_sRGB;
@@ -59,7 +59,7 @@ TEST(PaddingEffectTest, WhiteBorderColor) {
 	};
 	float out_data[4 * 4];
 
-        EffectChainTester tester(NULL, 4, 4);
+        EffectChainTester tester(nullptr, 4, 4);
 
 	ImageFormat format;
 	format.color_space = COLORSPACE_sRGB;
@@ -92,7 +92,7 @@ TEST(PaddingEffectTest, BorderColorIsInLinearGamma) {
 	};
 	float out_data[4 * 2];
 
-        EffectChainTester tester(NULL, 1, 2);
+        EffectChainTester tester(nullptr, 1, 2);
 
 	ImageFormat format;
 	format.color_space = COLORSPACE_sRGB;
@@ -126,7 +126,7 @@ TEST(PaddingEffectTest, DifferentXAndYOffset) {
 	};
 	float out_data[3 * 3];
 
-        EffectChainTester tester(NULL, 3, 3);
+        EffectChainTester tester(nullptr, 3, 3);
 
 	ImageFormat format;
 	format.color_space = COLORSPACE_sRGB;
@@ -156,7 +156,7 @@ TEST(PaddingEffectTest, NonIntegerOffset) {
 	};
 	float out_data[5 * 2];
 
-        EffectChainTester tester(NULL, 5, 2);
+        EffectChainTester tester(nullptr, 5, 2);
 
 	ImageFormat format;
 	format.color_space = COLORSPACE_sRGB;
@@ -186,7 +186,7 @@ TEST(PaddingEffectTest, Crop) {
 	};
 	float out_data[1 * 1];
 
-        EffectChainTester tester(NULL, 1, 1);
+        EffectChainTester tester(nullptr, 1, 1);
 
 	ImageFormat format;
 	format.color_space = COLORSPACE_sRGB;
@@ -219,7 +219,7 @@ TEST(PaddingEffectTest, AlphaIsCorrectEvenWithNonLinearInputsAndOutputs) {
 	};
 	float out_data[4 * 4];
 
-	EffectChainTester tester(NULL, 1, 4);
+	EffectChainTester tester(nullptr, 1, 4);
 
 	ImageFormat format;
 	format.color_space = COLORSPACE_REC_601_625;
@@ -242,6 +242,42 @@ TEST(PaddingEffectTest, AlphaIsCorrectEvenWithNonLinearInputsAndOutputs) {
 	expect_equal(expected_data, out_data, 4, 4);
 }
 
+TEST(PaddingEffectTest, RedBorder) {  // Not black nor white, but still a saturated primary.
+	float data[2 * 1] = {
+		1.0f,
+		0.8f,
+	};
+	float expected_data[4 * 4] = {
+		1.0f, 0.0f, 0.0f, 1.0f,
+		1.0f, 1.0f, 1.0f, 1.0f,
+		0.8f, 0.8f, 0.8f, 1.0f,
+		1.0f, 0.0f, 0.0f, 1.0f,
+	};
+	float out_data[4 * 4];
+
+	EffectChainTester tester(nullptr, 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, 0.0f, 0.0f, 1.0f);
+	CHECK(effect->set_vec4("border_color", (float *)&border_color));
+
+	tester.run(out_data, GL_RGBA, COLORSPACE_REC_709, GAMMA_REC_709, OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED);
+	expect_equal(expected_data, out_data, 4, 4);
+}
+
 TEST(PaddingEffectTest, BorderOffsetTopAndBottom) {
 	float data[2 * 2] = {
 		1.0f, 0.5f,
@@ -255,7 +291,7 @@ TEST(PaddingEffectTest, BorderOffsetTopAndBottom) {
 	};
 	float out_data[4 * 4];
 
-        EffectChainTester tester(NULL, 4, 4);
+        EffectChainTester tester(nullptr, 4, 4);
 
 	ImageFormat format;
 	format.color_space = COLORSPACE_sRGB;
@@ -288,7 +324,7 @@ TEST(PaddingEffectTest, BorderOffsetLeftAndRight) {
 	};
 	float out_data[4 * 2];
 
-        EffectChainTester tester(NULL, 4, 2);
+        EffectChainTester tester(nullptr, 4, 2);
 
 	ImageFormat format;
 	format.color_space = COLORSPACE_sRGB;