X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=resample_effect_test.cpp;h=e4b9439ffffad9211c9b1c99d91e544e5e1a1fe0;hb=8a7bc428c1af91981bf8dfd73495acb2ebfaab6b;hp=474a866a4e5415a1dd99bed864c5879e21f2b4d4;hpb=8ea03db1932e4a76f457e0ecdfe31a4c8be0e0eb;p=movit

diff --git a/resample_effect_test.cpp b/resample_effect_test.cpp
index 474a866..e4b9439 100644
--- a/resample_effect_test.cpp
+++ b/resample_effect_test.cpp
@@ -202,12 +202,106 @@ TEST(ResampleEffectTest, HeavyResampleGetsSumRight) {
 	ASSERT_TRUE(resample_effect->set_int("height", dheight));
 	tester.run(out_data, GL_RED, COLORSPACE_sRGB, GAMMA_LINEAR);
 
-	// Require that we are within 10-bit accuracy. Note that this is for
-	// one pass only; some cards that don't have correct fp32 -> fp16
-	// rounding in the intermediate framebuffers will go outside this after
-	// a 2D resize. This limit is tight enough that it will be good enough
-	// for 8-bit accuracy, though.
-	expect_equal(expected_data, out_data, dwidth, dheight, 0.5 / 1023.0);
+	// Require that we are within 10-bit accuracy. Note that this limit is for
+	// one pass only, but the limit is tight enough that it should be good enough
+	// for 10-bit accuracy even after two passes.
+	expect_equal(expected_data, out_data, dwidth, dheight, 0.1 / 1023.0);
+}
+
+TEST(ResampleEffectTest, ReadWholePixelFromLeft) {
+	const int size = 5;
+
+	float data[size * size] = {
+		0.0, 0.0, 0.0, 0.0, 0.0,
+		0.0, 0.0, 0.0, 0.0, 0.0,
+		0.0, 0.0, 1.0, 0.0, 0.0,
+		0.0, 0.0, 0.0, 0.0, 0.0,
+		0.0, 0.0, 0.0, 0.0, 0.0,
+	};
+	float expected_data[size * size] = {
+		0.0, 0.0, 0.0, 0.0, 0.0,
+		0.0, 0.0, 0.0, 0.0, 0.0,
+		0.0, 1.0, 0.0, 0.0, 0.0,
+		0.0, 0.0, 0.0, 0.0, 0.0,
+		0.0, 0.0, 0.0, 0.0, 0.0,
+	};
+	float out_data[size * size];
+
+	EffectChainTester tester(data, size, size, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_LINEAR);
+	Effect *resample_effect = tester.get_chain()->add_effect(new ResampleEffect());
+	ASSERT_TRUE(resample_effect->set_int("width", size));
+	ASSERT_TRUE(resample_effect->set_int("height", size));
+	ASSERT_TRUE(resample_effect->set_float("left", 1.0f));
+	tester.run(out_data, GL_RED, COLORSPACE_sRGB, GAMMA_LINEAR);
+
+	expect_equal(expected_data, out_data, size, size);
+}
+
+TEST(ResampleEffectTest, ReadQuarterPixelFromLeft) {
+	const int size = 5;
+
+	float data[size * size] = {
+		0.0, 0.0, 0.0, 0.0, 0.0,
+		0.0, 0.0, 0.0, 0.0, 0.0,
+		0.0, 0.0, 1.0, 0.0, 0.0,
+		0.0, 0.0, 0.0, 0.0, 0.0,
+		0.0, 0.0, 0.0, 0.0, 0.0,
+	};
+
+	float expected_data[size * size] = {
+		0.0, 0.0, 0.0, 0.0, 0.0,
+		0.0, 0.0, 0.0, 0.0, 0.0,
+
+		// sin(x*pi)/(x*pi) * sin(x*pi/3)/(x*pi/3) for
+		// x = -1.75, -0.75, 0.25, 1.25, 2.25.
+		// Note that the weight is mostly on the left side.
+		-0.06779, 0.27019, 0.89007, -0.13287, 0.03002,
+
+		0.0, 0.0, 0.0, 0.0, 0.0,
+		0.0, 0.0, 0.0, 0.0, 0.0,
+	};
+	float out_data[size * size];
+
+	EffectChainTester tester(data, size, size, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_LINEAR);
+	Effect *resample_effect = tester.get_chain()->add_effect(new ResampleEffect());
+	ASSERT_TRUE(resample_effect->set_int("width", size));
+	ASSERT_TRUE(resample_effect->set_int("height", size));
+	ASSERT_TRUE(resample_effect->set_float("left", 0.25f));
+	tester.run(out_data, GL_RED, COLORSPACE_sRGB, GAMMA_LINEAR);
+
+	expect_equal(expected_data, out_data, size, size);
+}
+
+TEST(ResampleEffectTest, ReadQuarterPixelFromTop) {
+	const int width = 3;
+	const int height = 5;
+
+	float data[width * height] = {
+		0.0, 0.0, 0.0,
+		0.0, 0.0, 0.0,
+		1.0, 0.0, 0.0,
+		0.0, 0.0, 0.0,
+		0.0, 0.0, 0.0,
+	};
+
+	// See ReadQuarterPixelFromLeft for explanation of the data.
+	float expected_data[width * height] = {
+		-0.06779, 0.0, 0.0,
+		 0.27019, 0.0, 0.0,
+		 0.89007, 0.0, 0.0,
+		-0.13287, 0.0, 0.0,
+		 0.03002, 0.0, 0.0,
+	};
+	float out_data[width * height];
+
+	EffectChainTester tester(data, width, height, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_LINEAR);
+	Effect *resample_effect = tester.get_chain()->add_effect(new ResampleEffect());
+	ASSERT_TRUE(resample_effect->set_int("width", width));
+	ASSERT_TRUE(resample_effect->set_int("height", height));
+	ASSERT_TRUE(resample_effect->set_float("top", 0.25f));
+	tester.run(out_data, GL_RED, COLORSPACE_sRGB, GAMMA_LINEAR);
+
+	expect_equal(expected_data, out_data, width, height);
 }
 
 }  // namespace movit