X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=effect_chain_test.cpp;h=778259f7da5ca7961510a9739d9915e491e21698;hp=0a5a93e6e59c18c8c432f821bdc87b8dadabb7f3;hb=1ca4785183b5af9a2a255bba0a28dfdae156470a;hpb=a18d86cb6ccfabb8acc03fbdf6970c7c1932a22b

diff --git a/effect_chain_test.cpp b/effect_chain_test.cpp
index 0a5a93e..778259f 100644
--- a/effect_chain_test.cpp
+++ b/effect_chain_test.cpp
@@ -6,6 +6,7 @@
 #include "flat_input.h"
 #include "gtest/gtest.h"
 #include "mirror_effect.h"
+#include "resize_effect.h"
 #include "opengl.h"
 #include "test_util.h"
 
@@ -134,8 +135,32 @@ TEST(EffectChainTest, RewritingWorksAndGammaConversionsAreInserted) {
 	expect_equal(expected_data, out_data, 3, 2);
 }
 
+TEST(EffectChainTest, RewritingWorksAndColorspaceConversionsAreInserted) {
+	float data[] = {
+		0.0f, 0.25f, 0.3f,
+		0.75f, 1.0f, 1.0f,
+	};
+	float expected_data[6] = {
+		1.0f, 0.75f, 0.7f,
+		0.25f, 0.0f, 0.0f,
+	};
+	float out_data[6];
+	EffectChainTester tester(data, 3, 2, FORMAT_GRAYSCALE, COLORSPACE_REC_601_525, GAMMA_LINEAR);
+	RewritingToInvertEffect *effect = new RewritingToInvertEffect();
+	tester.get_chain()->add_effect(effect);
+	tester.run(out_data, GL_RED, COLORSPACE_REC_601_525, GAMMA_LINEAR);
+
+	Node *node = effect->invert_node;
+	ASSERT_EQ(1, node->incoming_links.size());
+	ASSERT_EQ(1, node->outgoing_links.size());
+	EXPECT_EQ("ColorspaceConversionEffect", node->incoming_links[0]->effect->effect_type_id());
+	EXPECT_EQ("ColorspaceConversionEffect", node->outgoing_links[0]->effect->effect_type_id());
+
+	expect_equal(expected_data, out_data, 3, 2);
+}
+
 // Like RewritingToInvertEffect, but splicing in a MirrorEffect instead,
-// which does not need linear light.
+// which does not need linear light or sRGB primaries.
 class RewritingToMirrorEffect : public Effect {
 public:
 	RewritingToMirrorEffect() {}
@@ -176,6 +201,29 @@ TEST(EffectChainTest, NoGammaConversionsWhenLinearLightNotNeeded) {
 	expect_equal(expected_data, out_data, 3, 2);
 }
 
+TEST(EffectChainTest, NoColorspaceConversionsWhensRGBPrimariesNotNeeded) {
+	float data[] = {
+		0.0f, 0.25f, 0.3f,
+		0.75f, 1.0f, 1.0f,
+	};
+	float expected_data[6] = {
+		0.3f, 0.25f, 0.0f,
+		1.0f, 1.0f, 0.75f,
+	};
+	float out_data[6];
+	EffectChainTester tester(data, 3, 2, FORMAT_GRAYSCALE, COLORSPACE_REC_601_525, GAMMA_LINEAR);
+	RewritingToMirrorEffect *effect = new RewritingToMirrorEffect();
+	tester.get_chain()->add_effect(effect);
+	tester.run(out_data, GL_RED, COLORSPACE_REC_601_525, GAMMA_LINEAR);
+
+	Node *node = effect->mirror_node;
+	ASSERT_EQ(1, node->incoming_links.size());
+	EXPECT_EQ(0, node->outgoing_links.size());
+	EXPECT_EQ("FlatInput", node->incoming_links[0]->effect->effect_type_id());
+
+	expect_equal(expected_data, out_data, 3, 2);
+}
+
 // The identity effect needs linear light, and thus will get conversions on both sides.
 // Verify that sRGB data is properly converted to and from linear light for the entire ramp.
 TEST(EffectChainTest, IdentityThroughsRGBConversions) {
@@ -267,10 +315,68 @@ TEST(EffectChainTest, MipmapGenerationWorks) {
 		1.0f,     1.0f,     1.0f,     1.0f,
 		0.25f,    0.25f,    0.25f,    0.25f,
 	};
-	float out_data[16 * 4];
-	EffectChainTester tester(data, 4, 16, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_REC_709);
+	float out_data[4 * 16];
+	EffectChainTester tester(data, 4, 16, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_LINEAR);
 	tester.get_chain()->add_effect(new MipmapNeedingEffect());
-	tester.run(out_data, GL_RED, COLORSPACE_sRGB, GAMMA_REC_709);
+	tester.run(out_data, GL_RED, COLORSPACE_sRGB, GAMMA_LINEAR);
+
+	expect_equal(expected_data, out_data, 4, 16);
+}
+
+TEST(EffectChainTest, ResizeDownByFourThenUpByFour) {
+	float data[] = {  // In 4x4 blocks.
+		1.0f, 0.0f, 0.0f, 0.0f,
+		0.0f, 0.0f, 0.0f, 0.0f,
+		0.0f, 0.0f, 0.0f, 0.0f,
+		0.0f, 0.0f, 0.0f, 1.0f,
+
+		0.0f, 0.0f, 0.0f, 0.0f,
+		0.0f, 0.5f, 0.0f, 0.0f,
+		0.0f, 0.0f, 1.0f, 0.0f,
+		0.0f, 0.0f, 0.0f, 0.0f,
+
+		1.0f, 1.0f, 1.0f, 1.0f,
+		1.0f, 1.0f, 1.0f, 1.0f,
+		1.0f, 1.0f, 1.0f, 1.0f,
+		1.0f, 1.0f, 1.0f, 1.0f,
+
+		0.0f, 0.0f, 0.0f, 0.0f,
+		0.0f, 1.0f, 1.0f, 0.0f,
+		0.0f, 1.0f, 1.0f, 0.0f,
+		0.0f, 0.0f, 0.0f, 0.0f,
+	};
+	float expected_data[] = {  // Repeated four times horizontaly, interpolated vertically.
+		0.1250f, 0.1250f, 0.1250f, 0.1250f,
+		0.1250f, 0.1250f, 0.1250f, 0.1250f,
+		0.1211f, 0.1211f, 0.1211f, 0.1211f,
+		0.1133f, 0.1133f, 0.1133f, 0.1133f,
+		0.1055f, 0.1055f, 0.1055f, 0.1055f,
+		0.0977f, 0.0977f, 0.0977f, 0.0977f,
+		0.2070f, 0.2070f, 0.2070f, 0.2070f,
+		0.4336f, 0.4336f, 0.4336f, 0.4336f,
+		0.6602f, 0.6602f, 0.6602f, 0.6602f,
+		0.8867f, 0.8867f, 0.8867f, 0.8867f,
+		0.9062f, 0.9062f, 0.9062f, 0.9062f,
+		0.7188f, 0.7188f, 0.7188f, 0.7188f,
+		0.5312f, 0.5312f, 0.5312f, 0.5312f,
+		0.3438f, 0.3438f, 0.3438f, 0.3438f,
+		0.2500f, 0.2500f, 0.2500f, 0.2500f,
+		0.2500f, 0.2500f, 0.2500f, 0.2500f,
+	};
+	float out_data[4 * 16];
+
+	ResizeEffect *downscale = new ResizeEffect();
+	ASSERT_TRUE(downscale->set_int("width", 1));
+	ASSERT_TRUE(downscale->set_int("height", 4));
+
+	ResizeEffect *upscale = new ResizeEffect();
+	ASSERT_TRUE(upscale->set_int("width", 4));
+	ASSERT_TRUE(upscale->set_int("height", 16));
+
+	EffectChainTester tester(data, 4, 16, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_LINEAR);
+	tester.get_chain()->add_effect(downscale);
+	tester.get_chain()->add_effect(upscale);
+	tester.run(out_data, GL_RED, COLORSPACE_sRGB, GAMMA_LINEAR);
 
 	expect_equal(expected_data, out_data, 4, 16);
 }