Add a variant of expect_equal() for uint8s.

[movit] / test_util.cpp

diff --git a/test_util.cpp b/test_util.cpp
index cd79bd7c5adc973c1c29ea58449a8d5434878292..cc0280119aaab6c2c7984f91cb8cdf169aad4b99 100644 (file)
--- a/test_util.cpp
+++ b/test_util.cpp
@@ -106,6 +106,24 @@ void EffectChainTester::run(float *out_data, GLenum format, Colorspace color_spa
        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);
@@ -163,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);
+}