Be better at cleaning up at destruction time. Still stuff to do.
[movit] / test_util.cpp
index 4e37cec..ab10f7b 100644 (file)
@@ -7,10 +7,10 @@
 
 #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();
@@ -34,30 +34,36 @@ EffectChainTester::EffectChainTester(const float *data, unsigned width, unsigned
        check_error();
 }
 
-Input *EffectChainTester::add_input(const float *data, ColorSpace color_space, GammaCurve gamma_curve)
+EffectChainTester::~EffectChainTester()
+{
+       glDeleteFramebuffers(1, &fbo);
+       glDeleteTextures(1, &texnum);
+}
+
+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();
 
        chain.render_to_fbo(fbo, width, height);
 
        glBindFramebuffer(GL_FRAMEBUFFER, fbo);
-       glReadPixels(0, 0, width, height, GL_RED, GL_FLOAT, out_data);
+       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) {
@@ -68,23 +74,28 @@ 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;
+       int largest_diff_x = -1, largest_diff_y = -1;
 
        for (unsigned y = 0; y < height; ++y) {
                for (unsigned x = 0; x < width; ++x) {
                        float diff = ref[y * width + x] - result[y * width + x];
-                       largest_difference = std::max(largest_difference, fabsf(diff));
+                       if (fabs(diff) > largest_difference) {
+                               largest_difference = fabs(diff);
+                               largest_diff_x = x;
+                               largest_diff_y = y;
+                       }
                        squared_difference += diff * diff;
                }
        }
 
-       const float largest_difference_limit = 1.5 / 255.0;
-       const float rms_limit = 0.5 / 255.0;
-
-       EXPECT_LT(largest_difference, largest_difference_limit);
+       EXPECT_LT(largest_difference, largest_difference_limit)
+               << "Largest difference is in x=" << largest_diff_x << ", y=" << largest_diff_y << ":\n"
+               << "Reference: " << ref[largest_diff_y * width + largest_diff_x] << "\n"
+               << "Result:    " << result[largest_diff_y * width + largest_diff_x];
 
        float rms = sqrt(squared_difference) / (width * height);
        EXPECT_LT(rms, rms_limit);