]> git.sesse.net Git - movit/blobdiff - test_util.cpp
Don't use GL_RGBA32F/GL_RGBA16F with GL_UNSIGNED_BYTE.
[movit] / test_util.cpp
index 4e37cec3fdd82900831f5b55fa34d905b80bb4c1..27fac8fc4fa2582f6c27c5dc7b8331827d672250 100644 (file)
@@ -1,22 +1,65 @@
-#include "test_util.h"
+#include <assert.h>
+#include <math.h>
+#include <stdio.h>
+#include <algorithm>
+
 #include "flat_input.h"
+#include "glew.h"
 #include "gtest/gtest.h"
+#include "gtest/gtest-message.h"
+#include "init.h"
+#include "resource_pool.h"
+#include "test_util.h"
+#include "util.h"
 
-#include <stdio.h>
-#include <math.h>
+using namespace std;
 
-#include <algorithm>
+namespace movit {
 
-EffectChainTester::EffectChainTester(const float *data, unsigned width, unsigned height, ColorSpace color_space, GammaCurve gamma_curve)
-       : chain(width, height), width(width), height(height)
+class Input;
+
+namespace {
+
+// Not thread-safe, but this isn't a big problem for testing.
+ResourcePool *get_static_pool()
 {
-       add_input(data, color_space, gamma_curve);
+       static ResourcePool *resource_pool = NULL;
+       if (!resource_pool) {
+               resource_pool = new ResourcePool();
+       }
+       return resource_pool;
+}
+
+// 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) {
+                       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,
+                                     GLenum framebuffer_format)
+       : chain(width, height, get_static_pool()), width(width), height(height), finalized(false)
+{
+       CHECK(init_movit(".", MOVIT_DEBUG_OFF));
+
+       if (data != NULL) {
+               add_input(data, pixel_format, color_space, gamma_curve);
+       }
 
        glGenTextures(1, &texnum);
        check_error();
        glBindTexture(GL_TEXTURE_2D, texnum);
        check_error();
-       glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA16F_ARB, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
+       glTexImage2D(GL_TEXTURE_2D, 0, framebuffer_format, width, height, 0, GL_RGBA, GL_FLOAT, NULL);
        check_error();
 
        glGenFramebuffers(1, &fbo);
@@ -34,57 +77,121 @@ 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);
+       check_error();
+       glDeleteTextures(1, &texnum);
+       check_error();
+}
+
+Input *EffectChainTester::add_input(const float *data, MovitPixelFormat pixel_format, Colorspace color_space, GammaCurve gamma_curve, int input_width, int input_height)
 {
        ImageFormat format;
        format.color_space = color_space;
        format.gamma_curve = gamma_curve;
 
-       FlatInput *input = new FlatInput(format, FORMAT_GRAYSCALE, GL_FLOAT, width, height);
+       if (input_width == -1) {
+               input_width = width;
+       }
+       if (input_height == -1) {
+               input_height = height;
+       }
+
+       FlatInput *input = new FlatInput(format, pixel_format, GL_FLOAT, input_width, input_height);
        input->set_pixel_data(data);
        chain.add_input(input);
        return input;
 }
 
-void EffectChainTester::run(float *out_data, ColorSpace color_space, GammaCurve gamma_curve)
+Input *EffectChainTester::add_input(const unsigned char *data, MovitPixelFormat pixel_format, Colorspace color_space, GammaCurve gamma_curve, int input_width, int input_height)
 {
        ImageFormat format;
        format.color_space = color_space;
        format.gamma_curve = gamma_curve;
-       chain.add_output(format);
-       chain.finalize();
+
+       if (input_width == -1) {
+               input_width = width;
+       }
+       if (input_height == -1) {
+               input_height = height;
+       }
+
+       FlatInput *input = new FlatInput(format, pixel_format, GL_UNSIGNED_BYTE, input_width, input_height);
+       input->set_pixel_data(data);
+       chain.add_input(input);
+       return input;
+}
+
+void EffectChainTester::run(float *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format)
+{
+       if (!finalized) {
+               finalize_chain(color_space, gamma_curve, alpha_format);
+       }
 
        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) {
-               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]);
-               }
+       if (format == GL_RGBA) {
+               width *= 4;
+       }
+
+       vertical_flip(out_data, width, height);
+}
+
+void EffectChainTester::run(unsigned char *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format)
+{
+       if (!finalized) {
+               finalize_chain(color_space, gamma_curve, alpha_format);
+       }
+
+       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 expect_equal(const float *ref, const float *result, unsigned width, unsigned height)
+void EffectChainTester::finalize_chain(Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format)
+{
+       assert(!finalized);
+       ImageFormat image_format;
+       image_format.color_space = color_space;
+       image_format.gamma_curve = gamma_curve;
+       chain.add_output(image_format, alpha_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)
 {
        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);
@@ -109,3 +216,49 @@ 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)
+{
+       assert(width > 0);
+       assert(height > 0);
+
+       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);
+
+       delete[] ref_float;
+       delete[] result_float;
+}
+
+void test_accuracy(const float *expected, const float *result, unsigned num_values, double absolute_error_limit, double relative_error_limit, double local_relative_error_limit, double rms_limit)
+{
+       double squared_difference = 0.0;
+       for (unsigned i = 0; i < num_values; ++i) {
+               double absolute_error = fabs(expected[i] - result[i]);
+               squared_difference += absolute_error * absolute_error;
+               EXPECT_LT(absolute_error, absolute_error_limit);
+
+               if (expected[i] > 0.0) {
+                       double relative_error = fabs(absolute_error / expected[i]);
+
+                       EXPECT_LT(relative_error, relative_error_limit);
+               }
+               if (i < num_values - 1) {
+                       double delta = expected[i + 1] - expected[i];
+                       double local_relative_error = fabs(absolute_error / delta);
+                       EXPECT_LT(local_relative_error, local_relative_error_limit);
+               }
+       }
+       double rms = sqrt(squared_difference) / num_values;
+       EXPECT_LT(rms, rms_limit);
+}
+
+}  // namespace movit