Do our own fp16 conversion in ResampleEffect.

[movit] / resample_effect_test.cpp

diff --git a/resample_effect_test.cpp b/resample_effect_test.cpp
index e4c23b10782c09e96fa91cd2a4cb030a7faf9c6c..211e6d123e65d93dbcc075f60ea8371b1eaa5736 100644 (file)
--- a/resample_effect_test.cpp
+++ b/resample_effect_test.cpp
@@ -11,6 +11,8 @@
 #include "resample_effect.h"
 #include "test_util.h"
 
+namespace movit {
+
 namespace {
 
 float sinc(float x)
@@ -168,22 +170,25 @@ TEST(ResampleEffectTest, UpscaleByThreeGetsCorrectPixelCenters) {
 }
 
 TEST(ResampleEffectTest, HeavyResampleGetsSumRight) {
-       const int swidth = 1280, sheight = 720;
-       const int dwidth = 36, dheight = 20;
+       // 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] = 0.5f;
+                       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] = 0.5f;
+                       expected_data[y * dwidth + x] = 1.0f;
                }
        }
 
-       EffectChainTester tester(NULL, dwidth, dheight, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_LINEAR);
+       EffectChainTester tester(NULL, dwidth, dheight, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_LINEAR, GL_RGBA32F);
 
        ImageFormat format;
        format.color_space = COLORSPACE_sRGB;
@@ -198,6 +203,10 @@ TEST(ResampleEffectTest, HeavyResampleGetsSumRight) {
        ASSERT_TRUE(resample_effect->set_int("height", dheight));
        tester.run(out_data, GL_RED, COLORSPACE_sRGB, GAMMA_LINEAR);
 
-       expect_equal(expected_data, out_data, dwidth, dheight, 0.001);
+       // 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