Reduce the clutter in instantiating benchmarks a little bit.

[movit] / ycbcr_422interleaved_input_test.cpp

diff --git a/ycbcr_422interleaved_input_test.cpp b/ycbcr_422interleaved_input_test.cpp
index 290885e10156de4cf5f739a1700781a44f17fe6c..668793ae7f6dd2e60aba5a6eb3844edfbf8ed5b4 100644 (file)
--- a/ycbcr_422interleaved_input_test.cpp
+++ b/ycbcr_422interleaved_input_test.cpp
@@ -36,7 +36,7 @@ TEST(YCbCr422InterleavedInputTest, Simple422) {
        };
        float out_data[4 * width * height];
 
-       EffectChainTester tester(NULL, width, height);
+       EffectChainTester tester(nullptr, width, height);
 
        ImageFormat format;
        format.color_space = COLORSPACE_sRGB;
@@ -45,6 +45,7 @@ TEST(YCbCr422InterleavedInputTest, Simple422) {
        YCbCrFormat ycbcr_format;
        ycbcr_format.luma_coefficients = YCBCR_REC_601;
        ycbcr_format.full_range = false;
+       ycbcr_format.num_levels = 256;
        ycbcr_format.chroma_subsampling_x = 2;
        ycbcr_format.chroma_subsampling_y = 1;
        ycbcr_format.cb_x_position = 0.0f;  // Doesn't really matter here, since Y is constant.
@@ -81,7 +82,7 @@ TEST(YCbCr422InterleavedInputTest, LumaLinearInterpolation) {
        };
        float out_data[out_width * height];
 
-       EffectChainTester tester(NULL, out_width, height);
+       EffectChainTester tester(nullptr, out_width, height);
 
        ImageFormat format;
        format.color_space = COLORSPACE_sRGB;
@@ -90,6 +91,7 @@ TEST(YCbCr422InterleavedInputTest, LumaLinearInterpolation) {
        YCbCrFormat ycbcr_format;
        ycbcr_format.luma_coefficients = YCBCR_REC_601;
        ycbcr_format.full_range = false;
+       ycbcr_format.num_levels = 256;
        ycbcr_format.chroma_subsampling_x = 2;
        ycbcr_format.chroma_subsampling_y = 1;
        ycbcr_format.cb_x_position = 0.0f;  // Doesn't really matter here, since U/V are constant.
@@ -141,7 +143,7 @@ TEST(YCbCr422InterleavedInputTest, DifferentCbAndCrPositioning) {
        };
        float out_data[width * height];
 
-       EffectChainTester tester(NULL, width, height);
+       EffectChainTester tester(nullptr, width, height);
 
        ImageFormat format;
        format.color_space = COLORSPACE_sRGB;
@@ -150,6 +152,7 @@ TEST(YCbCr422InterleavedInputTest, DifferentCbAndCrPositioning) {
        YCbCrFormat ycbcr_format;
        ycbcr_format.luma_coefficients = YCBCR_REC_601;
        ycbcr_format.full_range = false;
+       ycbcr_format.num_levels = 256;
        ycbcr_format.chroma_subsampling_x = 2;
        ycbcr_format.chroma_subsampling_y = 1;
        ycbcr_format.cb_x_position = 0.0f;
@@ -199,7 +202,7 @@ TEST(YCbCr422InterleavedInputTest, PBO) {
        glBufferData(GL_PIXEL_UNPACK_BUFFER_ARB, width * height * 2, uyvy, GL_STREAM_DRAW);
        glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, 0);
 
-       EffectChainTester tester(NULL, width, height);
+       EffectChainTester tester(nullptr, width, height);
 
        ImageFormat format;
        format.color_space = COLORSPACE_sRGB;
@@ -208,6 +211,7 @@ TEST(YCbCr422InterleavedInputTest, PBO) {
        YCbCrFormat ycbcr_format;
        ycbcr_format.luma_coefficients = YCBCR_REC_601;
        ycbcr_format.full_range = false;
+       ycbcr_format.num_levels = 256;
        ycbcr_format.chroma_subsampling_x = 2;
        ycbcr_format.chroma_subsampling_y = 1;
        ycbcr_format.cb_x_position = 0.0f;  // Doesn't really matter here, since Y is constant.