Merge branch 'master' into epoxy

[movit] / resample_effect_test.cpp

diff --git a/resample_effect_test.cpp b/resample_effect_test.cpp
index f05bb8a35c1376be7b9430320b22cea950c019a0..95c2bcfb9aec95693653ea65572cfdca76f79699 100644 (file)
--- a/resample_effect_test.cpp
+++ b/resample_effect_test.cpp
@@ -1,9 +1,16 @@
 // Unit tests for ResampleEffect.
 
-#include "test_util.h"
-#include "gtest/gtest.h"
-#include "resample_effect.h"
+#include <epoxy/gl.h>
+#include <gtest/gtest.h>
+#include <math.h>
+
+#include "effect_chain.h"
 #include "flat_input.h"
+#include "image_format.h"
+#include "resample_effect.h"
+#include "test_util.h"
+
+namespace movit {
 
 namespace {
 
@@ -91,7 +98,7 @@ TEST(ResampleEffectTest, DownscaleByTwoGetsCorrectPixelCenters) {
        float expected_data[size * size] = {
                 0.0045, -0.0067, -0.0598, -0.0067,  0.0045, 
                -0.0067,  0.0099,  0.0886,  0.0099, -0.0067, 
-               -0.0598,  0.0886,  0.7871,  0.0886, -0.0598, 
+               -0.0598,  0.0886,  0.7930,  0.0886, -0.0598, 
                -0.0067,  0.0099,  0.0886,  0.0099, -0.0067, 
                 0.0045, -0.0067, -0.0598, -0.0067,  0.0045, 
        };
@@ -160,3 +167,45 @@ TEST(ResampleEffectTest, UpscaleByThreeGetsCorrectPixelCenters) {
                }
        }
 }
+
+TEST(ResampleEffectTest, HeavyResampleGetsSumRight) {
+       // Do only one resample pass, more specifically the last one, which goes to
+       // our fp32 output. This allows us to analyze the precision without intermediate
+       // fp16 rounding.
+       const int swidth = 1, sheight = 1280;
+       const int dwidth = 1, dheight = 64;
+
+       float data[swidth * sheight], out_data[dwidth * dheight], expected_data[dwidth * dheight];
+       for (int y = 0; y < sheight; ++y) {
+               for (int x = 0; x < swidth; ++x) {
+                       data[y * swidth + x] = 1.0f;
+               }
+       }
+       for (int y = 0; y < dheight; ++y) {
+               for (int x = 0; x < dwidth; ++x) {
+                       expected_data[y * dwidth + x] = 1.0f;
+               }
+       }
+
+       EffectChainTester tester(NULL, dwidth, dheight, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_LINEAR, GL_RGBA32F);
+
+       ImageFormat format;
+       format.color_space = COLORSPACE_sRGB;
+       format.gamma_curve = GAMMA_LINEAR;
+
+       FlatInput *input = new FlatInput(format, FORMAT_GRAYSCALE, GL_FLOAT, swidth, sheight);
+       input->set_pixel_data(data);
+
+       tester.get_chain()->add_input(input);
+       Effect *resample_effect = tester.get_chain()->add_effect(new ResampleEffect());
+       ASSERT_TRUE(resample_effect->set_int("width", dwidth));
+       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 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);
+}
+
+}  // namespace movit