X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=test_util.cpp;h=78122ced00d5f30190a5a9d7edabc97f2acd5260;hp=b377309638114057f2d99a56c852ee010bebb18f;hb=7366e74b75fa1ac3267709c12417179819b86acb;hpb=9c6b86affb570a2e2d18c6da795c359da393f9a3 diff --git a/test_util.cpp b/test_util.cpp index b377309..78122ce 100644 --- a/test_util.cpp +++ b/test_util.cpp @@ -23,7 +23,7 @@ namespace { // Not thread-safe, but this isn't a big problem for testing. ResourcePool *get_static_pool() { - static ResourcePool *resource_pool = NULL; + static ResourcePool *resource_pool = nullptr; if (!resource_pool) { resource_pool = new ResourcePool(); } @@ -42,13 +42,17 @@ void vertical_flip(T *data, unsigned width, unsigned height) } } +void init_movit_for_test() +{ + CHECK(init_movit(".", MOVIT_DEBUG_OFF)); +} + } // namespace EffectChainTester::EffectChainTester(const float *data, unsigned width, unsigned height, MovitPixelFormat pixel_format, Colorspace color_space, GammaCurve gamma_curve, - GLenum framebuffer_format, - GLenum intermediate_format) - : chain(width, height, get_static_pool(), intermediate_format), + GLenum framebuffer_format) + : chain(width, height, get_static_pool()), width(width), height(height), framebuffer_format(framebuffer_format), @@ -57,7 +61,7 @@ EffectChainTester::EffectChainTester(const float *data, unsigned width, unsigned { CHECK(init_movit(".", MOVIT_DEBUG_OFF)); - if (data != NULL) { + if (data != nullptr) { add_input(data, pixel_format, color_space, gamma_curve); } } @@ -106,36 +110,114 @@ 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) { - internal_run(out_data, NULL, NULL, GL_FLOAT, format, color_space, gamma_curve, alpha_format); + internal_run(out_data, nullptr, nullptr, nullptr, GL_FLOAT, format, color_space, gamma_curve, alpha_format); } 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); + internal_run(out_data, out_data2, nullptr, nullptr, GL_FLOAT, format, color_space, gamma_curve, alpha_format); } 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); + internal_run(out_data, out_data2, out_data3, nullptr, GL_FLOAT, format, color_space, gamma_curve, alpha_format); +} + +void EffectChainTester::run(float *out_data, float *out_data2, float *out_data3, float *out_data4, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format) +{ + internal_run(out_data, out_data2, out_data3, out_data4, GL_FLOAT, 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) { - internal_run(out_data, NULL, NULL, GL_UNSIGNED_BYTE, format, color_space, gamma_curve, alpha_format); + internal_run(out_data, nullptr, nullptr, nullptr, GL_UNSIGNED_BYTE, format, color_space, gamma_curve, alpha_format); } 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); + internal_run(out_data, out_data2, nullptr, nullptr, GL_UNSIGNED_BYTE, format, color_space, gamma_curve, 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); + internal_run(out_data, out_data2, out_data3, nullptr, GL_UNSIGNED_BYTE, format, color_space, gamma_curve, alpha_format); +} + +void EffectChainTester::run(unsigned char *out_data, unsigned char *out_data2, unsigned char *out_data3, unsigned char *out_data4, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format) +{ + internal_run(out_data, out_data2, out_data3, out_data4, GL_UNSIGNED_BYTE, format, color_space, gamma_curve, alpha_format); +} + +void EffectChainTester::run(uint16_t *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format) +{ + internal_run(out_data, nullptr, nullptr, nullptr, GL_UNSIGNED_SHORT, format, color_space, gamma_curve, alpha_format); +} + +void EffectChainTester::run_10_10_10_2(uint32_t *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format) +{ + internal_run(out_data, nullptr, nullptr, nullptr, GL_UNSIGNED_INT_2_10_10_10_REV, format, color_space, gamma_curve, alpha_format); +} + +#ifdef HAVE_BENCHMARK + +void EffectChainTester::benchmark(benchmark::State &state, float *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format) +{ + internal_run(out_data, nullptr, nullptr, nullptr, GL_FLOAT, format, color_space, gamma_curve, alpha_format, &state); +} + +void EffectChainTester::benchmark(benchmark::State &state, float *out_data, float *out_data2, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format) +{ + internal_run(out_data, out_data2, nullptr, nullptr, GL_FLOAT, format, color_space, gamma_curve, alpha_format, &state); +} + +void EffectChainTester::benchmark(benchmark::State &state, 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, nullptr, GL_FLOAT, format, color_space, gamma_curve, alpha_format, &state); +} + +void EffectChainTester::benchmark(benchmark::State &state, float *out_data, float *out_data2, float *out_data3, float *out_data4, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format) +{ + internal_run(out_data, out_data2, out_data3, out_data4, GL_FLOAT, format, color_space, gamma_curve, alpha_format, &state); +} + +void EffectChainTester::benchmark(benchmark::State &state, unsigned char *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format) +{ + internal_run(out_data, nullptr, nullptr, nullptr, GL_UNSIGNED_BYTE, format, color_space, gamma_curve, alpha_format, &state); +} + +void EffectChainTester::benchmark(benchmark::State &state, 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, nullptr, nullptr, GL_UNSIGNED_BYTE, format, color_space, gamma_curve, alpha_format, &state); +} + +void EffectChainTester::benchmark(benchmark::State &state, 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, nullptr, GL_UNSIGNED_BYTE, format, color_space, gamma_curve, alpha_format, &state); +} + +void EffectChainTester::benchmark(benchmark::State &state, unsigned char *out_data, unsigned char *out_data2, unsigned char *out_data3, unsigned char *out_data4, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format) +{ + internal_run(out_data, out_data2, out_data3, out_data4, GL_UNSIGNED_BYTE, format, color_space, gamma_curve, alpha_format, &state); } +void EffectChainTester::benchmark(benchmark::State &state, uint16_t *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format) +{ + internal_run(out_data, nullptr, nullptr, nullptr, GL_UNSIGNED_SHORT, format, color_space, gamma_curve, alpha_format, &state); +} + +void EffectChainTester::benchmark_10_10_10_2(benchmark::State &state, uint32_t *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format) +{ + internal_run(out_data, nullptr, nullptr, nullptr, GL_UNSIGNED_INT_2_10_10_10_REV, format, color_space, gamma_curve, alpha_format, &state); +} + +#endif + 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) +void EffectChainTester::internal_run(T *out_data, T *out_data2, T *out_data3, T *out_data4, GLenum internal_format, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format +#ifdef HAVE_BENCHMARK +, benchmark::State *benchmark_state +#endif +) { if (!finalized) { finalize_chain(color_space, gamma_curve, alpha_format); @@ -144,63 +226,72 @@ void EffectChainTester::internal_run(T *out_data, T *out_data2, T *out_data3, GL GLuint type; if (framebuffer_format == GL_RGBA8) { type = GL_UNSIGNED_BYTE; + } else if (framebuffer_format == GL_RGBA16) { + type = GL_UNSIGNED_SHORT; } else if (framebuffer_format == GL_RGBA16F || framebuffer_format == GL_RGBA32F) { type = GL_FLOAT; + } else if (framebuffer_format == GL_RGB10_A2) { + type = GL_UNSIGNED_INT_2_10_10_10_REV; } else { // Add more here as needed. assert(false); } unsigned num_outputs; - if (out_data3 != NULL) { + if (out_data4 != nullptr) { + num_outputs = 4; + } else if (out_data3 != nullptr) { num_outputs = 3; - } else if (out_data2 != NULL) { + } else if (out_data2 != nullptr) { num_outputs = 2; } else { num_outputs = 1; } - GLuint fbo, texnum[3]; + GLuint texnum[4]; 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); + glTexImage2D(GL_TEXTURE_2D, 0, framebuffer_format, width, height, 0, GL_RGBA, type, nullptr); check_error(); } - glGenFramebuffers(1, &fbo); - check_error(); - glBindFramebuffer(GL_FRAMEBUFFER, fbo); - check_error(); + vector textures; for (unsigned i = 0; i < num_outputs; ++i) { - glFramebufferTexture2D( - GL_FRAMEBUFFER, - GL_COLOR_ATTACHMENT0 + i, - GL_TEXTURE_2D, - texnum[i], - 0); - check_error(); + textures.push_back(EffectChain::DestinationTexture{texnum[i], framebuffer_format}); } - GLenum bufs[] = { GL_COLOR_ATTACHMENT0, GL_COLOR_ATTACHMENT1, GL_COLOR_ATTACHMENT2 }; - glDrawBuffers(num_outputs, bufs); - - chain.render_to_fbo(fbo, width, height); + chain.render_to_texture(textures, width, height); + +#ifdef HAVE_BENCHMARK + // If running benchmarks: Now we've warmed up everything, so let's run the + // actual benchmark loop. + if (benchmark_state != nullptr) { + glFinish(); + size_t iters = benchmark_state->max_iterations; + for (auto _ : *benchmark_state) { + chain.render_to_texture(textures, width, height); + if (--iters == 0) { + glFinish(); + } + } + benchmark_state->SetItemsProcessed(benchmark_state->iterations() * width * height); + } +#endif - T *data[3] = { out_data, out_data2, out_data3 }; + T *data[4] = { out_data, out_data2, out_data3, out_data4 }; - glBindFramebuffer(GL_FRAMEBUFFER, fbo); - check_error(); for (unsigned i = 0; i < num_outputs; ++i) { T *ptr = data[i]; - glReadBuffer(GL_COLOR_ATTACHMENT0 + i); + glBindTexture(GL_TEXTURE_2D, texnum[i]); + check_error(); 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); + glGetTexImage(GL_TEXTURE_2D, 0, GL_RGBA, type, temp); check_error(); if (format == GL_ALPHA) { for (unsigned i = 0; i < width * height; ++i) { @@ -217,19 +308,17 @@ void EffectChainTester::internal_run(T *out_data, T *out_data2, T *out_data3, GL } delete[] temp; } else { - glReadPixels(0, 0, width, height, format, internal_format, ptr); + glGetTexImage(GL_TEXTURE_2D, 0, format, type, ptr); check_error(); } - if (format == GL_RGBA) { + if (format == GL_RGBA && (type == GL_UNSIGNED_BYTE || type == GL_UNSIGNED_SHORT || type == GL_FLOAT)) { vertical_flip(ptr, width * 4, height); } else { vertical_flip(ptr, width, height); } } - glDeleteFramebuffers(1, &fbo); - check_error(); glDeleteTextures(num_outputs, texnum); check_error(); } @@ -240,9 +329,9 @@ void EffectChainTester::add_output(const ImageFormat &format, OutputAlphaFormat output_added = true; } -void EffectChainTester::add_ycbcr_output(const ImageFormat &format, OutputAlphaFormat alpha_format, const YCbCrFormat &ycbcr_format, YCbCrOutputSplitting output_splitting) +void EffectChainTester::add_ycbcr_output(const ImageFormat &format, OutputAlphaFormat alpha_format, const YCbCrFormat &ycbcr_format, YCbCrOutputSplitting output_splitting, GLenum type) { - chain.add_ycbcr_output(format, alpha_format, ycbcr_format, output_splitting); + chain.add_ycbcr_output(format, alpha_format, ycbcr_format, output_splitting, type); output_added = true; } @@ -286,7 +375,7 @@ void expect_equal(const float *ref, const float *result, unsigned width, unsigne float rms = sqrt(squared_difference) / (width * height); EXPECT_LT(rms, rms_limit); - if (largest_difference >= largest_difference_limit || rms >= rms_limit) { + if (largest_difference >= largest_difference_limit || isnan(rms) || rms >= rms_limit) { fprintf(stderr, "Dumping matrices for easier debugging, since at least one test failed.\n"); fprintf(stderr, "Reference:\n"); @@ -328,6 +417,48 @@ void expect_equal(const unsigned char *ref, const unsigned char *result, unsigne delete[] result_float; } +void expect_equal(const uint16_t *ref, const uint16_t *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 expect_equal(const int *ref, const int *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; @@ -351,4 +482,67 @@ void test_accuracy(const float *expected, const float *result, unsigned num_valu 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; + } +} + +DisableComputeShadersTemporarily::DisableComputeShadersTemporarily(bool disable_compute_shaders) + : disable_compute_shaders(disable_compute_shaders) +{ + init_movit_for_test(); + saved_compute_shaders_supported = movit_compute_shaders_supported; + if (disable_compute_shaders) { + movit_compute_shaders_supported = false; + } +} + +DisableComputeShadersTemporarily::~DisableComputeShadersTemporarily() +{ + movit_compute_shaders_supported = saved_compute_shaders_supported; +} + +bool DisableComputeShadersTemporarily::should_skip() +{ + if (disable_compute_shaders) { + return false; + } + + if (!movit_compute_shaders_supported) { + fprintf(stderr, "Compute shaders not supported; skipping.\n"); + return true; + } + return false; +} + +#ifdef HAVE_BENCHMARK +bool DisableComputeShadersTemporarily::should_skip(benchmark::State *benchmark_state) +{ + if (disable_compute_shaders) { + return false; + } + + if (!movit_compute_shaders_supported) { + benchmark_state->SkipWithError("Compute shaders not supported"); + return true; + } + return false; +} +#endif + } // namespace movit