X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=effect_chain_test.cpp;h=21cb2bec6538189d5cfd9bc7b009a014b9e271bf;hp=ca208da50cac7acaa54742357204e3c6b9fc6ec8;hb=29072985d0a00a53e5b578a1444cee61a0c9e1f2;hpb=279e7dc60df32e45c3a6da0aa55fb118c24a88a8

diff --git a/effect_chain_test.cpp b/effect_chain_test.cpp
index ca208da..21cb2be 100644
--- a/effect_chain_test.cpp
+++ b/effect_chain_test.cpp
@@ -2,11 +2,13 @@
 //
 // Note that this also contains the tests for some of the simpler effects.
 
+#include <GL/glew.h>
+
 #include "effect_chain.h"
 #include "flat_input.h"
 #include "gtest/gtest.h"
 #include "mirror_effect.h"
-#include "opengl.h"
+#include "resize_effect.h"
 #include "test_util.h"
 
 TEST(EffectChainTest, EmptyChain) {
@@ -134,8 +136,57 @@ TEST(EffectChainTest, RewritingWorksAndGammaConversionsAreInserted) {
 	expect_equal(expected_data, out_data, 3, 2);
 }
 
+TEST(EffectChainTest, RewritingWorksAndTexturesAreAskedForsRGB) {
+	unsigned char data[] = {
+		0, 64,
+		128, 255,
+	};
+	float expected_data[4] = {
+		1.0f, 0.9771f,
+		0.8983f, 0.0f,
+	};
+	float out_data[2];
+	EffectChainTester tester(NULL, 2, 2);
+	tester.add_input(data, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_sRGB);
+	RewritingToInvertEffect *effect = new RewritingToInvertEffect();
+	tester.get_chain()->add_effect(effect);
+	tester.run(out_data, GL_RED, COLORSPACE_sRGB, GAMMA_sRGB);
+
+	Node *node = effect->invert_node;
+	ASSERT_EQ(1, node->incoming_links.size());
+	ASSERT_EQ(1, node->outgoing_links.size());
+	EXPECT_EQ("FlatInput", node->incoming_links[0]->effect->effect_type_id());
+	EXPECT_EQ("GammaCompressionEffect", node->outgoing_links[0]->effect->effect_type_id());
+
+	expect_equal(expected_data, out_data, 2, 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 +227,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) {
@@ -191,6 +265,23 @@ TEST(EffectChainTest, IdentityThroughsRGBConversions) {
 	expect_equal(data, out_data, 256, 1);
 }
 
+// Same, but uses the forward sRGB table from the GPU.
+TEST(EffectChainTest, IdentityThroughGPUsRGBConversions) {
+	unsigned char data[256];
+	float expected_data[256];
+	for (unsigned i = 0; i < 256; ++i) {
+		data[i] = i;
+		expected_data[i] = i / 255.0;
+	};
+	float out_data[256];
+	EffectChainTester tester(NULL, 256, 1);
+	tester.add_input(data, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_sRGB);
+	tester.get_chain()->add_effect(new IdentityEffect());
+	tester.run(out_data, GL_RED, COLORSPACE_sRGB, GAMMA_sRGB);
+
+	expect_equal(expected_data, out_data, 256, 1);
+}
+
 // Same, for the Rec. 601/709 gamma curve.
 TEST(EffectChainTest, IdentityThroughRec709) {
 	float data[256];
@@ -267,10 +358,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];
+	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_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);
+}