Be better at cleaning up at destruction time. Still stuff to do.

[movit] / test_util.cpp

diff --git a/test_util.cpp b/test_util.cpp
index bcfc97a644146837ba50b1e7cb8de05756a8c0dd..ab10f7b82be0fd3a4528d54eb406cdd6ce09f733 100644 (file)
--- a/test_util.cpp
+++ b/test_util.cpp
@@ -34,6 +34,12 @@ EffectChainTester::EffectChainTester(const float *data, unsigned width, unsigned
        check_error();
 }
 
        check_error();
 }
 

+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;
 Input *EffectChainTester::add_input(const float *data, MovitPixelFormat pixel_format, ColorSpace color_space, GammaCurve gamma_curve)
 {
        ImageFormat format;


@@ -68,23 +74,28 @@ void EffectChainTester::run(float *out_data, GLenum format, ColorSpace color_spa
        }
 }
 
        }
 }
 

-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;
 {
        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];
 
        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;
                }
        }
 
                        squared_difference += diff * diff;
                }
        }
 

-       const float largest_difference_limit = 1.5 / 255.0;
-       const float rms_limit = 0.2 / 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);
 
        float rms = sqrt(squared_difference) / (width * height);
        EXPECT_LT(rms, rms_limit);