X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=test_util.cpp;h=05eac31451f833687eff9b552abd098dbfcbbcc6;hp=b89b3ffb9ec64364768140b475ca53018b09a0a5;hb=34776d3ed2565ee834405e575bf3bfc7f7933e36;hpb=616432c0732b8e7780457a1b6320acb46daa9663 diff --git a/test_util.cpp b/test_util.cpp index b89b3ff..05eac31 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]); } } } @@ -26,64 +46,59 @@ void vertical_flip(T *data, unsigned width, unsigned height) EffectChainTester::EffectChainTester(const float *data, unsigned width, unsigned height, MovitPixelFormat pixel_format, Colorspace color_space, GammaCurve gamma_curve, - GLenum framebuffer_format) - : chain(width, height), width(width), height(height), finalized(false) + GLenum framebuffer_format, + GLenum intermediate_format) + : chain(width, height, get_static_pool(), intermediate_format), + width(width), + height(height), + framebuffer_format(framebuffer_format), + output_added(false), + finalized(false) { - init_movit(".", MOVIT_DEBUG_ON); + 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, framebuffer_format, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL); - check_error(); - - glGenFramebuffers(1, &fbo); - check_error(); - glBindFramebuffer(GL_FRAMEBUFFER, fbo); - check_error(); - glFramebufferTexture2D( - GL_FRAMEBUFFER, - GL_COLOR_ATTACHMENT0, - GL_TEXTURE_2D, - texnum, - 0); - check_error(); - glBindFramebuffer(GL_FRAMEBUFFER, 0); - check_error(); } 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) +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; @@ -91,47 +106,156 @@ Input *EffectChainTester::add_input(const unsigned char *data, MovitPixelFormat 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); - } + internal_run(out_data, NULL, NULL, GL_FLOAT, format, color_space, gamma_curve, alpha_format); +} - chain.render_to_fbo(fbo, width, height); +void EffectChainTester::run(float *out_data, float *out_data2, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format) +{ + internal_run(out_data, out_data2, NULL, GL_FLOAT, format, color_space, gamma_curve, alpha_format); +} - glBindFramebuffer(GL_FRAMEBUFFER, fbo); - glReadPixels(0, 0, width, height, format, GL_FLOAT, out_data); +void EffectChainTester::run(float *out_data, float *out_data2, float *out_data3, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format) +{ + internal_run(out_data, out_data2, out_data3, GL_FLOAT, format, color_space, gamma_curve, alpha_format); +} - if (format == GL_RGBA) { - width *= 4; - } +void EffectChainTester::run(unsigned char *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format) +{ + internal_run(out_data, NULL, NULL, GL_UNSIGNED_BYTE, format, color_space, gamma_curve, alpha_format); +} - vertical_flip(out_data, width, height); +void EffectChainTester::run(unsigned char *out_data, unsigned char *out_data2, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format) +{ + internal_run(out_data, out_data2, NULL, GL_UNSIGNED_BYTE, format, color_space, gamma_curve, alpha_format); } -void EffectChainTester::run(unsigned char *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format) +void EffectChainTester::run(unsigned char *out_data, unsigned char *out_data2, unsigned char *out_data3, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format) +{ + internal_run(out_data, out_data2, out_data3, GL_UNSIGNED_BYTE, format, color_space, gamma_curve, alpha_format); +} + +template +void EffectChainTester::internal_run(T *out_data, T *out_data2, T *out_data3, GLenum internal_format, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format) { if (!finalized) { finalize_chain(color_space, gamma_curve, alpha_format); } + 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); + } + + unsigned num_outputs; + if (out_data3 != NULL) { + num_outputs = 3; + } else if (out_data2 != NULL) { + num_outputs = 2; + } else { + num_outputs = 1; + } + + GLuint fbo, texnum[3]; + + glGenTextures(num_outputs, texnum); + check_error(); + for (unsigned i = 0; i < num_outputs; ++i) { + glBindTexture(GL_TEXTURE_2D, texnum[i]); + check_error(); + glTexImage2D(GL_TEXTURE_2D, 0, framebuffer_format, width, height, 0, GL_RGBA, type, NULL); + check_error(); + } + + glGenFramebuffers(1, &fbo); + check_error(); + glBindFramebuffer(GL_FRAMEBUFFER, fbo); + check_error(); + for (unsigned i = 0; i < num_outputs; ++i) { + glFramebufferTexture2D( + GL_FRAMEBUFFER, + GL_COLOR_ATTACHMENT0 + i, + GL_TEXTURE_2D, + texnum[i], + 0); + check_error(); + } + + GLenum bufs[] = { GL_COLOR_ATTACHMENT0, GL_COLOR_ATTACHMENT1, GL_COLOR_ATTACHMENT2 }; + glDrawBuffers(num_outputs, bufs); + chain.render_to_fbo(fbo, width, height); + T *data[3] = { out_data, out_data2, out_data3 }; + glBindFramebuffer(GL_FRAMEBUFFER, fbo); - glReadPixels(0, 0, width, height, format, GL_UNSIGNED_BYTE, out_data); + check_error(); + for (unsigned i = 0; i < num_outputs; ++i) { + T *ptr = data[i]; + glReadBuffer(GL_COLOR_ATTACHMENT0 + i); + if (!epoxy_is_desktop_gl() && (format == GL_RED || format == GL_BLUE || format == GL_ALPHA)) { + // GLES will only read GL_RGBA. + T *temp = new T[width * height * 4]; + glReadPixels(0, 0, width, height, GL_RGBA, internal_format, temp); + check_error(); + if (format == GL_ALPHA) { + for (unsigned i = 0; i < width * height; ++i) { + ptr[i] = temp[i * 4 + 3]; + } + } else if (format == GL_BLUE) { + for (unsigned i = 0; i < width * height; ++i) { + ptr[i] = temp[i * 4 + 2]; + } + } else { + for (unsigned i = 0; i < width * height; ++i) { + ptr[i] = temp[i * 4]; + } + } + delete[] temp; + } else { + glReadPixels(0, 0, width, height, format, internal_format, ptr); + check_error(); + } - if (format == GL_RGBA) { - width *= 4; + if (format == GL_RGBA) { + vertical_flip(ptr, width * 4, height); + } else { + vertical_flip(ptr, width, height); + } } - vertical_flip(out_data, width, height); + glDeleteFramebuffers(1, &fbo); + check_error(); + glDeleteTextures(num_outputs, texnum); + check_error(); +} + +void EffectChainTester::add_output(const ImageFormat &format, OutputAlphaFormat alpha_format) +{ + chain.add_output(format, alpha_format); + output_added = true; +} + +void EffectChainTester::add_ycbcr_output(const ImageFormat &format, OutputAlphaFormat alpha_format, const YCbCrFormat &ycbcr_format, YCbCrOutputSplitting output_splitting) +{ + chain.add_ycbcr_output(format, alpha_format, ycbcr_format, output_splitting); + output_added = true; } 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); + if (!output_added) { + ImageFormat image_format; + image_format.color_space = color_space; + image_format.gamma_curve = gamma_curve; + chain.add_output(image_format, alpha_format); + output_added = true; + } chain.finalize(); finalized = true; } @@ -203,3 +327,48 @@ void expect_equal(const unsigned char *ref, const unsigned char *result, unsigne 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); +} + +double srgb_to_linear(double x) +{ + // From the Wikipedia article on sRGB. + if (x < 0.04045) { + return x / 12.92; + } else { + return pow((x + 0.055) / 1.055, 2.4); + } +} + +double linear_to_srgb(double x) +{ + // From the Wikipedia article on sRGB. + if (x < 0.0031308) { + return 12.92 * x; + } else { + return 1.055 * pow(x, 1.0 / 2.4) - 0.055; + } +} + +} // namespace movit