]> git.sesse.net Git - movit/blobdiff - effect_chain_test.cpp
projects / movit / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Another benchmarking data set fix.
[movit] / effect_chain_test.cpp
diff --git a/effect_chain_test.cpp b/effect_chain_test.cpp
index b7877f5686fa706d662d53d9002d1336fe3dd22f..3a3811da156539c25b853756efa76b5c6d6d30ff 100644 (file)
--- a/effect_chain_test.cpp
+++ b/effect_chain_test.cpp
@@ -99,7 +99,22 @@ TEST(MirrorTest, BasicTest) {
        expect_equal(expected_data, out_data, 3, 2);
 }
 
-TEST(EffectChainTest, TopLeftOrigin) {
+class WithAndWithoutComputeShaderTest : public testing::TestWithParam<string> {
+};
+INSTANTIATE_TEST_CASE_P(WithAndWithoutComputeShaderTest,
+                        WithAndWithoutComputeShaderTest,
+                        testing::Values("fragment", "compute"));
+
+// An effect that does nothing, but as a compute shader.
+class IdentityComputeEffect : public Effect {
+public:
+       IdentityComputeEffect() {}
+       virtual string effect_type_id() const { return "IdentityComputeEffect"; }
+       virtual bool is_compute_shader() const { return true; }
+       string output_fragment_shader() { return read_file("identity.comp"); }
+};
+
+TEST_P(WithAndWithoutComputeShaderTest, TopLeftOrigin) {
        float data[] = {
                0.0f, 0.25f, 0.3f,
                0.75f, 1.0f, 1.0f,
@@ -113,6 +128,9 @@ TEST(EffectChainTest, TopLeftOrigin) {
        float out_data[6];
        EffectChainTester tester(data, 3, 2, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_LINEAR);
        tester.get_chain()->set_output_origin(OUTPUT_ORIGIN_TOP_LEFT);
+       if (GetParam() == "compute") {
+               tester.get_chain()->add_effect(new IdentityComputeEffect());
+       }
        tester.run(out_data, GL_RED, COLORSPACE_sRGB, GAMMA_LINEAR);
 
        expect_equal(expected_data, out_data, 3, 2);
@@ -166,8 +184,8 @@ TEST(EffectChainTest, RewritingWorksAndGammaConversionsAreInserted) {
        tester.run(out_data, GL_RED, COLORSPACE_sRGB, GAMMA_sRGB);
 
        Node *node = effect->replaced_node;
-       ASSERT_EQ(1, node->incoming_links.size());
-       ASSERT_EQ(1, node->outgoing_links.size());
+       ASSERT_EQ(1u, node->incoming_links.size());
+       ASSERT_EQ(1u, node->outgoing_links.size());
        EXPECT_EQ("GammaExpansionEffect", node->incoming_links[0]->effect->effect_type_id());
        EXPECT_EQ("GammaCompressionEffect", node->outgoing_links[0]->effect->effect_type_id());
 
@@ -195,8 +213,8 @@ TEST(EffectChainTest, RewritingWorksAndTexturesAreAskedForsRGB) {
        tester.run(out_data, GL_RGBA, COLORSPACE_sRGB, GAMMA_sRGB);
 
        Node *node = effect->replaced_node;
-       ASSERT_EQ(1, node->incoming_links.size());
-       ASSERT_EQ(1, node->outgoing_links.size());
+       ASSERT_EQ(1u, node->incoming_links.size());
+       ASSERT_EQ(1u, 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());
 
@@ -219,8 +237,8 @@ TEST(EffectChainTest, RewritingWorksAndColorspaceConversionsAreInserted) {
        tester.run(out_data, GL_RED, COLORSPACE_REC_601_525, GAMMA_LINEAR);
 
        Node *node = effect->replaced_node;
-       ASSERT_EQ(1, node->incoming_links.size());
-       ASSERT_EQ(1, node->outgoing_links.size());
+       ASSERT_EQ(1u, node->incoming_links.size());
+       ASSERT_EQ(1u, 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());
 
@@ -298,8 +316,8 @@ TEST(EffectChainTest, NoGammaConversionsWhenLinearLightNotNeeded) {
        tester.run(out_data, GL_RED, COLORSPACE_sRGB, GAMMA_sRGB);
 
        Node *node = effect->replaced_node;
-       ASSERT_EQ(1, node->incoming_links.size());
-       EXPECT_EQ(0, node->outgoing_links.size());
+       ASSERT_EQ(1u, node->incoming_links.size());
+       EXPECT_EQ(0u, node->outgoing_links.size());
        EXPECT_EQ("FlatInput", node->incoming_links[0]->effect->effect_type_id());
 
        expect_equal(expected_data, out_data, 3, 2);
@@ -321,8 +339,8 @@ TEST(EffectChainTest, NoColorspaceConversionsWhensRGBPrimariesNotNeeded) {
        tester.run(out_data, GL_RED, COLORSPACE_REC_601_525, GAMMA_LINEAR);
 
        Node *node = effect->replaced_node;
-       ASSERT_EQ(1, node->incoming_links.size());
-       EXPECT_EQ(0, node->outgoing_links.size());
+       ASSERT_EQ(1u, node->incoming_links.size());
+       EXPECT_EQ(0u, node->outgoing_links.size());
        EXPECT_EQ("FlatInput", node->incoming_links[0]->effect->effect_type_id());
 
        expect_equal(expected_data, out_data, 3, 2);
@@ -409,8 +427,8 @@ TEST(EffectChainTest, NoAlphaConversionsWhenPremultipliedAlphaNotNeeded) {
        tester.run(out_data, GL_RGBA, COLORSPACE_sRGB, GAMMA_LINEAR);
 
        Node *node = effect->replaced_node;
-       ASSERT_EQ(1, node->incoming_links.size());
-       EXPECT_EQ(0, node->outgoing_links.size());
+       ASSERT_EQ(1u, node->incoming_links.size());
+       EXPECT_EQ(0u, node->outgoing_links.size());
        EXPECT_EQ("FlatInput", node->incoming_links[0]->effect->effect_type_id());
 
        expect_equal(expected_data, out_data, 4, size);
@@ -478,8 +496,8 @@ TEST(EffectChainTest, NoAlphaConversionsWithBlankAlpha) {
        tester.run(out_data, GL_RGBA, COLORSPACE_sRGB, GAMMA_LINEAR, OUTPUT_ALPHA_FORMAT_PREMULTIPLIED);
 
        Node *node = input->blue_node;
-       EXPECT_EQ(0, node->incoming_links.size());
-       EXPECT_EQ(0, node->outgoing_links.size());
+       EXPECT_EQ(0u, node->incoming_links.size());
+       EXPECT_EQ(0u, node->outgoing_links.size());
 
        expect_equal(data, out_data, 4, size);
 }
@@ -509,8 +527,8 @@ TEST(EffectChainTest, NoAlphaConversionsWithBlankAlphaPreservingEffect) {
        tester.run(out_data, GL_RGBA, COLORSPACE_sRGB, GAMMA_LINEAR, OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED);
 
        Node *node = effect->replaced_node;
-       EXPECT_EQ(1, node->incoming_links.size());
-       EXPECT_EQ(0, node->outgoing_links.size());
+       EXPECT_EQ(1u, node->incoming_links.size());
+       EXPECT_EQ(0u, node->outgoing_links.size());
 
        expect_equal(data, out_data, 4, size);
 }
@@ -535,8 +553,8 @@ TEST(EffectChainTest, AlphaConversionsWithNonBlankAlphaPreservingEffect) {
        tester.run(out_data, GL_RGBA, COLORSPACE_sRGB, GAMMA_LINEAR, OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED);
 
        Node *node = effect->replaced_node;
-       EXPECT_EQ(1, node->incoming_links.size());
-       EXPECT_EQ(1, node->outgoing_links.size());
+       EXPECT_EQ(1u, node->incoming_links.size());
+       EXPECT_EQ(1u, node->outgoing_links.size());
        EXPECT_EQ("AlphaDivisionEffect", node->outgoing_links[0]->effect->effect_type_id());
 
        expect_equal(data, out_data, 4, size);
@@ -891,8 +909,8 @@ TEST(EffectChainTest, EffectUsedTwiceOnlyGetsOneGammaConversion) {
        expect_equal(expected_data, out_data, 2, 2);
 
        Node *node = effect->replaced_node;
-       ASSERT_EQ(1, node->incoming_links.size());
-       ASSERT_EQ(1, node->outgoing_links.size());
+       ASSERT_EQ(1u, node->incoming_links.size());
+       ASSERT_EQ(1u, node->outgoing_links.size());
        EXPECT_EQ("FlatInput", node->incoming_links[0]->effect->effect_type_id());
        EXPECT_EQ("GammaExpansionEffect", node->outgoing_links[0]->effect->effect_type_id());
 }
@@ -924,8 +942,8 @@ TEST(EffectChainTest, EffectUsedTwiceOnlyGetsOneColorspaceConversion) {
        expect_equal(expected_data, out_data, 2, 2);
 
        Node *node = effect->replaced_node;
-       ASSERT_EQ(1, node->incoming_links.size());
-       ASSERT_EQ(1, node->outgoing_links.size());
+       ASSERT_EQ(1u, node->incoming_links.size());
+       ASSERT_EQ(1u, node->outgoing_links.size());
        EXPECT_EQ("FlatInput", node->incoming_links[0]->effect->effect_type_id());
        EXPECT_EQ("ColorspaceConversionEffect", node->outgoing_links[0]->effect->effect_type_id());
 }
@@ -1113,21 +1131,6 @@ public:
        bool sets_virtual_output_size() const override { return false; }
 };
 
-class WithAndWithoutComputeShaderTest : public testing::TestWithParam<string> {
-};
-INSTANTIATE_TEST_CASE_P(WithAndWithoutComputeShaderTest,
-                        WithAndWithoutComputeShaderTest,
-                        testing::Values("fragment", "compute"));
-
-// An effect that does nothing, but as a compute shader.
-class IdentityComputeEffect : public Effect {
-public:
-       IdentityComputeEffect() {}
-       virtual string effect_type_id() const { return "IdentityComputeEffect"; }
-       virtual bool is_compute_shader() const { return true; }
-       string output_fragment_shader() { return read_file("identity.comp"); }
-};
-
 // An effect that promises one-to-one sampling (unlike IdentityEffect).
 class OneToOneEffect : public Effect {
 public:
@@ -1162,7 +1165,7 @@ TEST_P(WithAndWithoutComputeShaderTest, NoBounceWithOneToOneSampling) {
        expect_equal(data, out_data, size, size);
 
        // The first OneToOneEffect should be in the same phase as its input.
-       ASSERT_EQ(1, effect1->replaced_node->incoming_links.size());
+       ASSERT_EQ(1u, effect1->replaced_node->incoming_links.size());
        EXPECT_EQ(effect1->replaced_node->incoming_links[0]->containing_phase,
                  effect1->replaced_node->containing_phase);
 
@@ -1199,7 +1202,7 @@ TEST(EffectChainTest, BounceWhenOneToOneIsBroken) {
        // the IdentityEffect (since the latter is not one-to-one),
        // ie., the chain should be broken somewhere between them, but exactly
        // where doesn't matter.
-       ASSERT_EQ(1, effect1->replaced_node->incoming_links.size());
+       ASSERT_EQ(1u, effect1->replaced_node->incoming_links.size());
        EXPECT_NE(effect1->replaced_node->incoming_links[0]->containing_phase,
                  effect3->replaced_node->containing_phase);
 
@@ -1225,6 +1228,7 @@ TEST(EffectChainTest, IdentityWithOwnPool) {
        float out_data[6], temp[6 * 4];
 
        EffectChain chain(width, height);
+       MovitDebugLevel old_movit_debug_level = movit_debug_level;
        movit_debug_level = MOVIT_DEBUG_ON;
 
        ImageFormat format;
@@ -1273,7 +1277,7 @@ TEST(EffectChainTest, IdentityWithOwnPool) {
        expect_equal(expected_data, out_data, width, height);
 
        // Reset the debug status again.
-       movit_debug_level = MOVIT_DEBUG_OFF;
+       movit_debug_level = old_movit_debug_level;
 }
 
 // A dummy effect whose only purpose is to test sprintf decimal behavior.
@@ -1468,7 +1472,7 @@ TEST(EffectChainTest, ProgramsAreClonedForMultipleThreads) {
 
        expect_equal(data, out_data, 3, 2);
 
-       ASSERT_NE(0, effect->last_glsl_program_num);
+       ASSERT_NE(0u, effect->last_glsl_program_num);
 
        // Now pretend some other effect is using this program number;
        // ResourcePool will then need to clone it.
@@ -1562,7 +1566,7 @@ public:
        }
 };
 
-TEST(ComputeShaderTest, Mirror) {
+TEST(ComputeShaderTest, ComputeThenOneToOne) {
        float data[] = {
                0.0f, 0.25f, 0.3f, 0.8f,
                0.75f, 1.0f, 1.0f, 0.2f,
@@ -1580,4 +1584,55 @@ TEST(ComputeShaderTest, Mirror) {
        expect_equal(expected_data, out_data, 4, 2);
 }
 
+// A compute shader that also resizes its input, taking the upper-left pixel
+// of every 2x2 group. (The shader is hard-coded to 4x2 input for simplicity.)
+class Downscale2xComputeEffect : public Effect {
+public:
+       Downscale2xComputeEffect() {}
+       string effect_type_id() const override { return "Downscale2xComputeEffect"; }
+       bool is_compute_shader() const override { return true; }
+       string output_fragment_shader() override { return read_file("downscale2x.comp"); }
+       bool changes_output_size() const override { return true; }
+       void inform_input_size(unsigned input_num, unsigned width, unsigned height) override
+       {
+               this->width = width;
+               this->height = height;
+       }
+       void get_output_size(unsigned *width, unsigned *height,
+                            unsigned *virtual_width, unsigned *virtual_height) const override {
+                *width = *virtual_width = this->width / 2;
+                *height = *virtual_height = this->height / 2;
+        }
+
+private:
+       unsigned width, height;
+};
+
+// Even if the compute shader is not the last effect, it's the one that should decide
+// the output size of the phase.
+TEST(ComputeShaderTest, ResizingComputeThenOneToOne) {
+       float data[] = {
+               0.0f, 0.25f, 0.3f, 0.8f,
+               0.75f, 1.0f, 1.0f, 0.2f,
+       };
+       float expected_data[] = {
+               0.0f, 0.3f,
+       };
+       float out_data[2];
+       EffectChainTester tester(nullptr, 2, 1);
+       tester.add_input(data, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_LINEAR, 4, 2);
+
+       RewritingEffect<Downscale2xComputeEffect> *downscale_effect = new RewritingEffect<Downscale2xComputeEffect>();
+       tester.get_chain()->add_effect(downscale_effect);
+       tester.get_chain()->add_effect(new OneToOneEffect());
+       tester.get_chain()->add_effect(new BouncingIdentityEffect());
+       tester.run(out_data, GL_RED, COLORSPACE_sRGB, GAMMA_LINEAR);
+
+       expect_equal(expected_data, out_data, 2, 1);
+
+       Phase *phase = downscale_effect->replaced_node->containing_phase;
+       EXPECT_EQ(2u, phase->output_width);
+       EXPECT_EQ(1u, phase->output_height);
+}
+
 }  // namespace movit
A library for high-quality, high-performance video filters.