Split the TESTS= line in the Makefile now, since it is becoming quite long.

[movit] / test_util.cpp

diff --git a/test_util.cpp b/test_util.cpp
index 8fa67149d3ba19e86d0b34b194fc035792ad49f0..aa9cf5651aced8ef9f29e99c2ba3a093d565d3d2 100644 (file)
--- a/test_util.cpp
+++ b/test_util.cpp
@@ -7,36 +7,57 @@
 
 #include <algorithm>
 
-EffectChainTester::EffectChainTester(const float *data, unsigned width, unsigned height, ColorSpace color_space, GammaCurve gamma_curve)
+EffectChainTester::EffectChainTester(const float *data, unsigned width, unsigned height, MovitPixelFormat pixel_format, ColorSpace color_space, GammaCurve gamma_curve)
        : chain(width, height), width(width), height(height)
 {
-       add_input(data, color_space, gamma_curve);
+       add_input(data, pixel_format, color_space, gamma_curve);
+
+       glGenTextures(1, &texnum);
+       check_error();
+       glBindTexture(GL_TEXTURE_2D, texnum);
+       check_error();
+       glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA16F_ARB, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
+       check_error();
+
+       glGenFramebuffers(1, &fbo);
+       check_error();
+       glBindFramebuffer(GL_FRAMEBUFFER, fbo);
+       check_error();
+       glFramebufferTexture2D(
+               GL_FRAMEBUFFER,
+               GL_COLOR_ATTACHMENT0,
+               GL_TEXTURE_2D,
+               texnum,
+               0);
+       check_error();
+       glBindFramebuffer(GL_FRAMEBUFFER, 0);
+       check_error();
 }
 
-Input *EffectChainTester::add_input(const float *data, ColorSpace color_space, GammaCurve gamma_curve)
+Input *EffectChainTester::add_input(const float *data, MovitPixelFormat pixel_format, ColorSpace color_space, GammaCurve gamma_curve)
 {
        ImageFormat format;
        format.color_space = color_space;
        format.gamma_curve = gamma_curve;
 
-       FlatInput *input = new FlatInput(format, FORMAT_GRAYSCALE, GL_FLOAT, width, height);
+       FlatInput *input = new FlatInput(format, pixel_format, GL_FLOAT, width, height);
        input->set_pixel_data(data);
        chain.add_input(input);
        return input;
 }
 
-void EffectChainTester::run(float *out_data, ColorSpace color_space, GammaCurve gamma_curve)
+void EffectChainTester::run(float *out_data, GLenum format, ColorSpace color_space, GammaCurve gamma_curve)
 {
-       ImageFormat format;
-       format.color_space = color_space;
-       format.gamma_curve = gamma_curve;
-       chain.add_output(format);
+       ImageFormat image_format;
+       image_format.color_space = color_space;
+       image_format.gamma_curve = gamma_curve;
+       chain.add_output(image_format);
        chain.finalize();
 
-       glViewport(0, 0, width, height);
-       chain.render_to_screen();
+       chain.render_to_fbo(fbo, width, height);
 
-       glReadPixels(0, 0, width, height, GL_RED, GL_FLOAT, out_data);
+       glBindFramebuffer(GL_FRAMEBUFFER, fbo);
+       glReadPixels(0, 0, width, height, format, GL_FLOAT, out_data);
 
        // Flip upside-down to compensate for different origin.
        for (unsigned y = 0; y < height / 2; ++y) {
@@ -47,7 +68,7 @@ void EffectChainTester::run(float *out_data, ColorSpace color_space, GammaCurve
        }
 }
 
-void expect_equal(const float *ref, const float *result, unsigned width, unsigned height)
+void expect_equal(const float *ref, const float *result, unsigned width, unsigned height, float largest_difference_limit, float rms_limit)
 {
        float largest_difference = -1.0f;
        float squared_difference = 0.0f;
@@ -60,9 +81,6 @@ void expect_equal(const float *ref, const float *result, unsigned width, unsigne
                }
        }
 
-       const float largest_difference_limit = 1.5 / 255.0;
-       const float rms_limit = 0.5 / 255.0;
-
        EXPECT_LT(largest_difference, largest_difference_limit);
 
        float rms = sqrt(squared_difference) / (width * height);