ColorSpace -> Colorspace. I kept typing it wrong, so even though I usually say color...

[movit] / test_util.cpp

diff --git a/test_util.cpp b/test_util.cpp
index aa9cf5651aced8ef9f29e99c2ba3a093d565d3d2..4fba7bb02fe2a58e94dea62f10cb62474eb9b4cd 100644 (file)
--- a/test_util.cpp
+++ b/test_util.cpp
@@ -7,7 +7,7 @@
 
 #include <algorithm>
 
-EffectChainTester::EffectChainTester(const float *data, unsigned width, unsigned height, MovitPixelFormat pixel_format, 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, pixel_format, color_space, gamma_curve);
@@ -34,7 +34,15 @@ EffectChainTester::EffectChainTester(const float *data, unsigned width, unsigned
        check_error();
 }
 
-Input *EffectChainTester::add_input(const float *data, MovitPixelFormat pixel_format, ColorSpace color_space, GammaCurve gamma_curve)
+EffectChainTester::~EffectChainTester()
+{
+       glDeleteFramebuffers(1, &fbo);
+       check_error();
+       glDeleteTextures(1, &texnum);
+       check_error();
+}
+
+Input *EffectChainTester::add_input(const float *data, MovitPixelFormat pixel_format, Colorspace color_space, GammaCurve gamma_curve)
 {
        ImageFormat format;
        format.color_space = color_space;
@@ -46,7 +54,7 @@ Input *EffectChainTester::add_input(const float *data, MovitPixelFormat pixel_fo
        return input;
 }
 
-void EffectChainTester::run(float *out_data, GLenum format, ColorSpace color_space, GammaCurve gamma_curve)
+void EffectChainTester::run(float *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve)
 {
        ImageFormat image_format;
        image_format.color_space = color_space;
@@ -59,6 +67,10 @@ void EffectChainTester::run(float *out_data, GLenum format, ColorSpace color_spa
        glBindFramebuffer(GL_FRAMEBUFFER, fbo);
        glReadPixels(0, 0, width, height, format, GL_FLOAT, out_data);
 
+       if (format == GL_RGBA) {
+               width *= 4;
+       }
+
        // Flip upside-down to compensate for different origin.
        for (unsigned y = 0; y < height / 2; ++y) {
                unsigned flip_y = height - y - 1;
@@ -72,16 +84,24 @@ void expect_equal(const float *ref, const float *result, unsigned width, unsigne
 {
        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;
                }
        }
 
-       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);