Add a variant of expect_equal() for uint8s.

[movit] / test_util.cpp

diff --git a/test_util.cpp b/test_util.cpp
index afeb8486041487878ac666b6916db9efc12d30fd..cc0280119aaab6c2c7984f91cb8cdf169aad4b99 100644 (file)
--- a/test_util.cpp
+++ b/test_util.cpp
@@ -8,6 +8,22 @@
 
 #include <algorithm>
 
+namespace {
+
+// Flip upside-down to compensate for different origin.
+template<class T>
+void vertical_flip(T *data, unsigned width, unsigned height)
+{
+       for (unsigned y = 0; y < height / 2; ++y) {
+               unsigned flip_y = height - y - 1;
+               for (unsigned x = 0; x < width; ++x) {
+                       std::swap(data[y * width + x], data[flip_y * width + x]);
+               }
+       }
+}
+
+}  // namespace
+
 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), finalized(false)
@@ -75,12 +91,7 @@ Input *EffectChainTester::add_input(const unsigned char *data, MovitPixelFormat
 void EffectChainTester::run(float *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve)
 {
        if (!finalized) {
-               ImageFormat image_format;
-               image_format.color_space = color_space;
-               image_format.gamma_curve = gamma_curve;
-               chain.add_output(image_format);
-               chain.finalize();
-               finalized = true;
+               finalize_chain(color_space, gamma_curve);
        }
 
        chain.render_to_fbo(fbo, width, height);
@@ -92,13 +103,36 @@ void EffectChainTester::run(float *out_data, GLenum format, Colorspace color_spa
                width *= 4;
        }
 
-       // Flip upside-down to compensate for different origin.
-       for (unsigned y = 0; y < height / 2; ++y) {
-               unsigned flip_y = height - y - 1;
-               for (unsigned x = 0; x < width; ++x) {
-                       std::swap(out_data[y * width + x], out_data[flip_y * width + x]);
-               }
+       vertical_flip(out_data, width, height);
+}
+
+void EffectChainTester::run(unsigned char *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve)
+{
+       if (!finalized) {
+               finalize_chain(color_space, gamma_curve);
        }
+
+       chain.render_to_fbo(fbo, width, height);
+
+       glBindFramebuffer(GL_FRAMEBUFFER, fbo);
+       glReadPixels(0, 0, width, height, format, GL_UNSIGNED_BYTE, out_data);
+
+       if (format == GL_RGBA) {
+               width *= 4;
+       }
+
+       vertical_flip(out_data, width, height);
+}
+
+void EffectChainTester::finalize_chain(Colorspace color_space, GammaCurve gamma_curve)
+{
+       assert(!finalized);
+       ImageFormat image_format;
+       image_format.color_space = color_space;
+       image_format.gamma_curve = gamma_curve;
+       chain.add_output(image_format);
+       chain.finalize();
+       finalized = true;
 }
 
 void expect_equal(const float *ref, const float *result, unsigned width, unsigned height, float largest_difference_limit, float rms_limit)
@@ -147,3 +181,18 @@ void expect_equal(const float *ref, const float *result, unsigned width, unsigne
                }
        }
 }
+
+void expect_equal(const unsigned char *ref, const unsigned char *result, unsigned width, unsigned height, unsigned largest_difference_limit, float rms_limit)
+{
+       float *ref_float = new float[width * height];
+       float *result_float = new float[width * height];
+
+       for (unsigned y = 0; y < height; ++y) {
+               for (unsigned x = 0; x < width; ++x) {
+                       ref_float[y * width + x] = ref[y * width + x];
+                       result_float[y * width + x] = result[y * width + x];
+               }
+       }
+
+       expect_equal(ref_float, result_float, width, height, largest_difference_limit, rms_limit);
+}