From: Steinar H. Gunderson Date: Thu, 28 Dec 2017 21:31:38 +0000 (+0100) Subject: Reduce the amount of duplication between overloads in test_util.h, by using a few... X-Git-Tag: 1.6.0~16 X-Git-Url: https://git.sesse.net/?p=movit;a=commitdiff_plain;h=9fe4726ad2c0c6282dcb53f4a8008b53febd9473 Reduce the amount of duplication between overloads in test_util.h, by using a few more C++11 features. --- diff --git a/test_util.cpp b/test_util.cpp index 30ba94a..0909263 100644 --- a/test_util.cpp +++ b/test_util.cpp @@ -129,130 +129,80 @@ 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, nullptr, nullptr, nullptr, format, color_space, gamma_curve, alpha_format); + internal_run({out_data}, 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) +void EffectChainTester::run(const std::vector &out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format) { - internal_run(out_data, out_data2, nullptr, nullptr, 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, nullptr, 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, format, color_space, gamma_curve, alpha_format); + internal_run(out_data, 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, nullptr, nullptr, nullptr, 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, nullptr, nullptr, format, color_space, gamma_curve, alpha_format); + internal_run({out_data}, 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) +void EffectChainTester::run(const std::vector &out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format) { - internal_run(out_data, out_data2, out_data3, nullptr, 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, format, color_space, gamma_curve, alpha_format); + internal_run(out_data, 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, format, color_space, gamma_curve, alpha_format); + internal_run({out_data}, 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, format, color_space, gamma_curve, alpha_format); + internal_run({out_data}, 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, 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, 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, format, color_space, gamma_curve, alpha_format, &state); + internal_run({out_data}, 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) +void EffectChainTester::benchmark(benchmark::State &state, const std::vector &out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format) { - internal_run(out_data, out_data2, out_data3, out_data4, format, color_space, gamma_curve, alpha_format, &state); + internal_run(out_data, format, color_space, gamma_curve, alpha_format, &state); } void EffectChainTester::benchmark(benchmark::State &state, fp16_int_t *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format) { - internal_run(out_data, nullptr, nullptr, nullptr, format, color_space, gamma_curve, alpha_format, &state); + internal_run({out_data}, format, color_space, gamma_curve, alpha_format, &state); } -void EffectChainTester::benchmark(benchmark::State &state, fp16_int_t *out_data, fp16_int_t *out_data2, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format) +void EffectChainTester::benchmark(benchmark::State &state, const std::vector &out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format) { - internal_run(out_data, out_data2, nullptr, nullptr, format, color_space, gamma_curve, alpha_format, &state); -} - -void EffectChainTester::benchmark(benchmark::State &state, fp16_int_t *out_data, fp16_int_t *out_data2, fp16_int_t *out_data3, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format) -{ - internal_run(out_data, out_data2, out_data3, nullptr, format, color_space, gamma_curve, alpha_format, &state); -} - -void EffectChainTester::benchmark(benchmark::State &state, fp16_int_t *out_data, fp16_int_t *out_data2, fp16_int_t *out_data3, fp16_int_t *out_data4, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format) -{ - internal_run(out_data, out_data2, out_data3, out_data4, format, color_space, gamma_curve, alpha_format, &state); + internal_run(out_data, 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, format, color_space, gamma_curve, alpha_format, &state); + internal_run({out_data}, 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) +void EffectChainTester::benchmark(benchmark::State &state, const std::vector &out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format) { - internal_run(out_data, out_data2, nullptr, nullptr, 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, 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, format, color_space, gamma_curve, alpha_format, &state); + internal_run(out_data, 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, format, color_space, gamma_curve, alpha_format, &state); + internal_run({out_data}, 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, format, color_space, gamma_curve, alpha_format, &state); + internal_run({out_data}, format, color_space, gamma_curve, alpha_format, &state); } #endif template -void EffectChainTester::internal_run(T *out_data, T *out_data2, T *out_data3, T *out_data4, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format +void EffectChainTester::internal_run(const std::vector &out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format #ifdef HAVE_BENCHMARK , benchmark::State *benchmark_state #endif @@ -278,22 +228,11 @@ void EffectChainTester::internal_run(T *out_data, T *out_data2, T *out_data3, T assert(false); } - unsigned num_outputs; - if (out_data4 != nullptr) { - num_outputs = 4; - } else if (out_data3 != nullptr) { - num_outputs = 3; - } else if (out_data2 != nullptr) { - num_outputs = 2; - } else { - num_outputs = 1; - } - glActiveTexture(GL_TEXTURE0); check_error(); vector textures; - for (unsigned i = 0; i < num_outputs; ++i) { + for (unsigned i = 0; i < out_data.size(); ++i) { GLuint texnum = chain.get_resource_pool()->create_2d_texture(framebuffer_format, width, height); textures.push_back(EffectChain::DestinationTexture{texnum, framebuffer_format}); @@ -322,31 +261,28 @@ void EffectChainTester::internal_run(T *out_data, T *out_data2, T *out_data3, T } #endif - T *data[4] = { out_data, out_data2, out_data3, out_data4 }; - - for (unsigned i = 0; i < num_outputs; ++i) { - T *ptr = data[i]; + for (unsigned i = 0; i < out_data.size(); ++i) { + T *ptr = out_data[i]; glBindTexture(GL_TEXTURE_2D, textures[i].texnum); 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]; - glGetTexImage(GL_TEXTURE_2D, 0, GL_RGBA, type, temp); + std::unique_ptr temp(new T[width * height * 4]); + glGetTexImage(GL_TEXTURE_2D, 0, GL_RGBA, type, temp.get()); check_error(); if (format == GL_ALPHA) { - for (unsigned i = 0; i < width * height; ++i) { - ptr[i] = temp[i * 4 + 3]; + for (unsigned j = 0; j < width * height; ++j) { + ptr[j] = temp[j * 4 + 3]; } } else if (format == GL_BLUE) { - for (unsigned i = 0; i < width * height; ++i) { - ptr[i] = temp[i * 4 + 2]; + for (unsigned j = 0; j < width * height; ++j) { + ptr[j] = temp[j * 4 + 2]; } } else { - for (unsigned i = 0; i < width * height; ++i) { - ptr[i] = temp[i * 4]; + for (unsigned j = 0; j < width * height; ++j) { + ptr[j] = temp[j * 4]; } } - delete[] temp; } else { glGetTexImage(GL_TEXTURE_2D, 0, format, type, ptr); check_error(); @@ -359,7 +295,7 @@ void EffectChainTester::internal_run(T *out_data, T *out_data2, T *out_data3, T } } - for (unsigned i = 0; i < num_outputs; ++i) { + for (unsigned i = 0; i < out_data.size(); ++i) { chain.get_resource_pool()->release_2d_texture(textures[i].texnum); } } diff --git a/test_util.h b/test_util.h index f50f579..6c15d8b 100644 --- a/test_util.h +++ b/test_util.h @@ -28,29 +28,19 @@ public: Input *add_input(const unsigned char *data, MovitPixelFormat pixel_format, Colorspace color_space, GammaCurve gamma_curve, int input_width = -1, int input_height = -1); void run(float *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format = OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED); - void run(float *out_data, float *out_data2, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format = OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED); - void run(float *out_data, float *out_data2, float *out_data3, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format = OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED); - void run(float *out_data, float *out_data2, float *out_data3, float *out_data4, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format = OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED); + void run(const std::vector &out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format = OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED); void run(unsigned char *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format = OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED); - void run(unsigned char *out_data, unsigned char *out_data2, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format = OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED); - void run(unsigned char *out_data, unsigned char *out_data2, unsigned char *out_data3, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format = OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED); - void 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 = OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED); + void run(const std::vector &out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format = OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED); void run(uint16_t *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format = OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED); void run_10_10_10_2(uint32_t *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format = OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED); #ifdef HAVE_BENCHMARK void benchmark(benchmark::State &state, float *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format = OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED); - void benchmark(benchmark::State &state, float *out_data, float *out_data2, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format = OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED); - void benchmark(benchmark::State &state, float *out_data, float *out_data2, float *out_data3, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format = OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED); - void 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 = OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED); + void benchmark(benchmark::State &state, const std::vector &out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format = OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED); void benchmark(benchmark::State &state, fp16_int_t *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format = OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED); - void benchmark(benchmark::State &state, fp16_int_t *out_data, fp16_int_t *out_data2, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format = OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED); - void benchmark(benchmark::State &state, fp16_int_t *out_data, fp16_int_t *out_data2, fp16_int_t *out_data3, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format = OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED); - void benchmark(benchmark::State &state, fp16_int_t *out_data, fp16_int_t *out_data2, fp16_int_t *out_data3, fp16_int_t *out_data4, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format = OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED); + void benchmark(benchmark::State &state, const std::vector &out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format = OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED); void benchmark(benchmark::State &state, unsigned char *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format = OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED); - void benchmark(benchmark::State &state, unsigned char *out_data, unsigned char *out_data2, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format = OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED); - void 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 = OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED); - void 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 = OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED); + void benchmark(benchmark::State &state, const std::vector &out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format = OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED); void benchmark(benchmark::State &state, uint16_t *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format = OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED); void benchmark_10_10_10_2(benchmark::State &state, uint32_t *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format = OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED); #endif @@ -62,7 +52,7 @@ private: void finalize_chain(Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format); template - void internal_run(T *out_data, T *out_data2, T *out_data3, T *out_data4, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format = OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED + void internal_run(const std::vector &out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format = OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED #ifdef HAVE_BENCHMARK , benchmark::State *state = nullptr #endif diff --git a/ycbcr_conversion_effect_test.cpp b/ycbcr_conversion_effect_test.cpp index 3eec271..6f7988c 100644 --- a/ycbcr_conversion_effect_test.cpp +++ b/ycbcr_conversion_effect_test.cpp @@ -234,7 +234,7 @@ TEST(YCbCrConversionEffectTest, PlanarOutput) { input->set_pixel_data(2, cr); tester.get_chain()->add_input(input); - tester.run(out_y, out_cb, out_cr, GL_RED, COLORSPACE_sRGB, GAMMA_sRGB); + tester.run({out_y, out_cb, out_cr}, GL_RED, COLORSPACE_sRGB, GAMMA_sRGB); expect_equal(y, out_y, width, height); expect_equal(cb, out_cb, width, height); expect_equal(cr, out_cr, width, height); @@ -304,7 +304,7 @@ TEST(YCbCrConversionEffectTest, SplitLumaAndChroma) { input->set_pixel_data(2, cr); tester.get_chain()->add_input(input); - tester.run(out_y, out_cbcr, GL_RGBA, COLORSPACE_sRGB, GAMMA_sRGB); + tester.run(std::vector{out_y, out_cbcr}, GL_RGBA, COLORSPACE_sRGB, GAMMA_sRGB); expect_equal(expected_y, out_y, width * 4, height); expect_equal(expected_cbcr, out_cbcr, width * 4, height); } @@ -373,7 +373,7 @@ TEST(YCbCrConversionEffectTest, OutputChunkyAndRGBA) { // just that the shader compiles and doesn't mess up badly. tester.get_chain()->set_dither_bits(8); - tester.run(out_ycbcr, out_rgba, GL_RGBA, COLORSPACE_sRGB, GAMMA_sRGB); + tester.run(std::vector{out_ycbcr, out_rgba}, GL_RGBA, COLORSPACE_sRGB, GAMMA_sRGB); expect_equal(expected_ycbcr, out_ycbcr, width * 4, height); // Y'CbCr isn't 100% accurate (the input values are rounded), @@ -448,7 +448,7 @@ TEST(YCbCrConversionEffectTest, MultipleOutputsAndRGBA) { // just that the shader compiles and doesn't mess up badly. tester.get_chain()->set_dither_bits(8); - tester.run(out_ycbcr, out_y, out_cbcr, out_rgba, GL_RGBA, COLORSPACE_sRGB, GAMMA_sRGB); + tester.run({out_ycbcr, out_y, out_cbcr, out_rgba}, GL_RGBA, COLORSPACE_sRGB, GAMMA_sRGB); expect_equal(expected_ycbcr, out_ycbcr, width * 4, height); // Check that the extra Y' and CbCr outputs also are fine. @@ -509,11 +509,11 @@ TEST(YCbCrConversionEffectTest, ChangeOutputFormat) { input->set_pixel_data(2, cr); tester.get_chain()->add_input(input); - tester.run(out_y, out_cb, out_cr, GL_RED, COLORSPACE_sRGB, GAMMA_sRGB); + tester.run({out_y, out_cb, out_cr}, GL_RED, COLORSPACE_sRGB, GAMMA_sRGB); // Now change the output format to match what we gave the input, and re-run. tester.get_chain()->change_ycbcr_output_format(ycbcr_format); - tester.run(out_y, out_cb, out_cr, GL_RED, COLORSPACE_sRGB, GAMMA_sRGB); + tester.run({out_y, out_cb, out_cr}, GL_RED, COLORSPACE_sRGB, GAMMA_sRGB); expect_equal(y, out_y, width, height); expect_equal(cb, out_cb, width, height);