X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=test_util.cpp;h=a3ccb5c5f04cebcd3c804c294e95e93d7b886a59;hp=cc0280119aaab6c2c7984f91cb8cdf169aad4b99;hb=refs%2Fheads%2Fepoxy;hpb=85526f893719c3267cbfe653cf0095fc1288f49d diff --git a/test_util.cpp b/test_util.cpp index cc02801..a3ccb5c 100644 --- a/test_util.cpp +++ b/test_util.cpp @@ -1,15 +1,35 @@ +#include +#include +#include +#include +#include +#include +#include + +#include "flat_input.h" #include "init.h" +#include "resource_pool.h" #include "test_util.h" -#include "flat_input.h" -#include "gtest/gtest.h" +#include "util.h" -#include -#include +using namespace std; -#include +namespace movit { + +class Input; namespace { +// Not thread-safe, but this isn't a big problem for testing. +ResourcePool *get_static_pool() +{ + static ResourcePool *resource_pool = NULL; + if (!resource_pool) { + resource_pool = new ResourcePool(); + } + return resource_pool; +} + // Flip upside-down to compensate for different origin. template void vertical_flip(T *data, unsigned width, unsigned height) @@ -17,7 +37,7 @@ 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]); + swap(data[y * width + x], data[flip_y * width + x]); } } } @@ -25,20 +45,31 @@ void vertical_flip(T *data, unsigned width, unsigned height) } // 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) + MovitPixelFormat pixel_format, Colorspace color_space, GammaCurve gamma_curve, + GLenum framebuffer_format) + : chain(width, height, get_static_pool()), width(width), height(height), finalized(false) { - init_movit(); + CHECK(init_movit(".", MOVIT_DEBUG_OFF)); if (data != NULL) { add_input(data, pixel_format, color_space, gamma_curve); } + GLuint type; + if (framebuffer_format == GL_RGBA8) { + type = GL_UNSIGNED_BYTE; + } else if (framebuffer_format == GL_RGBA16F || framebuffer_format == GL_RGBA32F) { + type = GL_FLOAT; + } else { + // Add more here as needed. + assert(false); + } + 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, type, NULL); check_error(); glGenFramebuffers(1, &fbo); @@ -64,40 +95,77 @@ EffectChainTester::~EffectChainTester() check_error(); } -Input *EffectChainTester::add_input(const float *data, MovitPixelFormat pixel_format, Colorspace color_space, GammaCurve gamma_curve) +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, pixel_format, 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; } -Input *EffectChainTester::add_input(const unsigned char *data, MovitPixelFormat pixel_format, 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; - FlatInput *input = new FlatInput(format, pixel_format, GL_UNSIGNED_BYTE, width, height); + 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) +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); + 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_FLOAT, out_data); + check_error(); + if (!epoxy_is_desktop_gl() && (format == GL_RED || format == GL_BLUE || format == GL_ALPHA)) { + // GLES will only read GL_RGBA. + float *temp = new float[width * height * 4]; + glReadPixels(0, 0, width, height, GL_RGBA, GL_FLOAT, temp); + check_error(); + if (format == GL_ALPHA) { + for (unsigned i = 0; i < width * height; ++i) { + out_data[i] = temp[i * 4 + 3]; + } + } else if (format == GL_BLUE) { + for (unsigned i = 0; i < width * height; ++i) { + out_data[i] = temp[i * 4 + 2]; + } + } else { + for (unsigned i = 0; i < width * height; ++i) { + out_data[i] = temp[i * 4]; + } + } + delete[] temp; + } else { + glReadPixels(0, 0, width, height, format, GL_FLOAT, out_data); + check_error(); + } if (format == GL_RGBA) { width *= 4; @@ -106,16 +174,39 @@ 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) +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); + 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); + check_error(); + if (!epoxy_is_desktop_gl() && (format == GL_RED || format == GL_BLUE || format == GL_ALPHA)) { + // GLES will only read GL_RGBA. + unsigned char *temp = new unsigned char[width * height * 4]; + glReadPixels(0, 0, width, height, GL_RGBA, GL_UNSIGNED_BYTE, temp); + check_error(); + if (format == GL_ALPHA) { + for (unsigned i = 0; i < width * height; ++i) { + out_data[i] = temp[i * 4 + 3]; + } + } else if (format == GL_BLUE) { + for (unsigned i = 0; i < width * height; ++i) { + out_data[i] = temp[i * 4 + 2]; + } + } else { + for (unsigned i = 0; i < width * height; ++i) { + out_data[i] = temp[i * 4]; + } + } + delete[] temp; + } else { + glReadPixels(0, 0, width, height, format, GL_UNSIGNED_BYTE, out_data); + check_error(); + } if (format == GL_RGBA) { width *= 4; @@ -124,13 +215,13 @@ void EffectChainTester::run(unsigned char *out_data, GLenum format, Colorspace c vertical_flip(out_data, width, height); } -void EffectChainTester::finalize_chain(Colorspace color_space, GammaCurve gamma_curve) +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); + chain.add_output(image_format, alpha_format); chain.finalize(); finalized = true; } @@ -184,6 +275,9 @@ 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]; @@ -195,4 +289,32 @@ void expect_equal(const unsigned char *ref, const unsigned char *result, unsigne } 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