Typo fixes.

[movit] / ycbcr_input_test.cpp

diff --git a/ycbcr_input_test.cpp b/ycbcr_input_test.cpp
index 33ec74c6b2a1f5fac6fffba2e9d417e5ee62133a..a1415c98eacd184a1f43faa7ff384122288ef16e 100644 (file)
--- a/ycbcr_input_test.cpp
+++ b/ycbcr_input_test.cpp
@@ -41,7 +41,7 @@ TEST(YCbCrInputTest, Simple444) {
        };
        float out_data[4 * width * height];
 
-       EffectChainTester tester(NULL, width, height);
+       EffectChainTester tester(nullptr, width, height);
 
        ImageFormat format;
        format.color_space = COLORSPACE_sRGB;
@@ -92,7 +92,7 @@ TEST(YCbCrInputTest, Interleaved444) {
        };
        float out_data[4 * width * height];
 
-       EffectChainTester tester(NULL, width, height);
+       EffectChainTester tester(nullptr, width, height);
 
        ImageFormat format;
        format.color_space = COLORSPACE_sRGB;
@@ -145,7 +145,7 @@ TEST(YCbCrInputTest, FullRangeRec601) {
        };
        float out_data[4 * width * height];
 
-       EffectChainTester tester(NULL, width, height);
+       EffectChainTester tester(nullptr, width, height);
 
        ImageFormat format;
        format.color_space = COLORSPACE_sRGB;
@@ -199,7 +199,7 @@ TEST(YCbCrInputTest, Rec709) {
        };
        float out_data[4 * width * height];
 
-       EffectChainTester tester(NULL, width, height);
+       EffectChainTester tester(nullptr, width, height);
 
        ImageFormat format;
        format.color_space = COLORSPACE_sRGB;
@@ -255,7 +255,7 @@ TEST(YCbCrInputTest, Rec2020) {
        };
        float out_data[4 * width * height];
 
-       EffectChainTester tester(NULL, width, height);
+       EffectChainTester tester(nullptr, width, height);
 
        ImageFormat format;
        format.color_space = COLORSPACE_sRGB;
@@ -285,6 +285,80 @@ TEST(YCbCrInputTest, Rec2020) {
        expect_equal(expected_data, out_data, 4 * width, height, 0.025, 0.002);
 }
 
+// Very similar to Rec709.
+TEST(YCbCrInputTest, ChangeFormat) {
+       const int width = 1;
+       const int height = 5;
+
+       // Pure-color test inputs, calculated with the formulas in Rec. 709
+       // page 19, items 3.4 and 3.5.
+       unsigned char y[width * height] = {
+               16, 235, 63, 173, 32,
+       };
+       unsigned char cb[width * height] = {
+               128, 128, 102, 42, 240,
+       };
+       unsigned char cr[width * height] = {
+               128, 128, 240, 26, 118,
+       };
+       float expected_data[4 * width * height] = {
+               0.0, 0.0, 0.0, 1.0,
+               1.0, 1.0, 1.0, 1.0,
+               1.0, 0.0, 0.0, 1.0,
+               0.0, 1.0, 0.0, 1.0,
+               0.0, 0.0, 1.0, 1.0,
+       };
+       float out_data[4 * width * height];
+
+       EffectChainTester tester(nullptr, width, height);
+
+       ImageFormat format;
+       format.color_space = COLORSPACE_sRGB;
+       format.gamma_curve = GAMMA_sRGB;
+
+       // Basically all of these values will be changed after finalize.
+       YCbCrFormat initial_ycbcr_format;
+       initial_ycbcr_format.luma_coefficients = YCBCR_REC_601;
+       initial_ycbcr_format.full_range = true;
+       initial_ycbcr_format.num_levels = 1024;
+       initial_ycbcr_format.chroma_subsampling_x = 1;
+       initial_ycbcr_format.chroma_subsampling_y = 5;
+       initial_ycbcr_format.cb_x_position = 0.0f;
+       initial_ycbcr_format.cb_y_position = 0.5f;
+       initial_ycbcr_format.cr_x_position = 0.0f;
+       initial_ycbcr_format.cr_y_position = 0.5f;
+
+       YCbCrInput *input = new YCbCrInput(format, initial_ycbcr_format, width, height);
+       input->set_pixel_data(0, y);
+       input->set_pixel_data(1, cb);
+       input->set_pixel_data(2, cr);
+       tester.get_chain()->add_input(input);
+
+       tester.run(out_data, GL_RGBA, COLORSPACE_sRGB, GAMMA_sRGB);
+
+       // Rerun with the right format.
+       YCbCrFormat ycbcr_format;
+       ycbcr_format.luma_coefficients = YCBCR_REC_709;
+       ycbcr_format.full_range = false;
+       ycbcr_format.num_levels = 256;
+       ycbcr_format.chroma_subsampling_x = 1;
+       ycbcr_format.chroma_subsampling_y = 1;
+       ycbcr_format.cb_x_position = 0.5f;
+       ycbcr_format.cb_y_position = 0.5f;
+       ycbcr_format.cr_x_position = 0.5f;
+       ycbcr_format.cr_y_position = 0.5f;
+
+       input->change_ycbcr_format(ycbcr_format);
+       input->set_width(width);
+       input->set_height(height);
+
+       tester.run(out_data, GL_RGBA, COLORSPACE_sRGB, GAMMA_sRGB);
+
+       // Y'CbCr isn't 100% accurate (the input values are rounded),
+       // so we need some leeway.
+       expect_equal(expected_data, out_data, 4 * width, height, 0.025, 0.002);
+}
+
 TEST(YCbCrInputTest, Subsampling420) {
        const int width = 4;
        const int height = 4;
@@ -317,7 +391,7 @@ TEST(YCbCrInputTest, Subsampling420) {
        };
        float out_data[width * height];
 
-       EffectChainTester tester(NULL, width, height);
+       EffectChainTester tester(nullptr, width, height);
 
        ImageFormat format;
        format.color_space = COLORSPACE_sRGB;
@@ -379,7 +453,7 @@ TEST(YCbCrInputTest, Subsampling420WithNonCenteredSamples) {
        };
        float out_data[width * height];
 
-       EffectChainTester tester(NULL, width, height);
+       EffectChainTester tester(nullptr, width, height);
 
        ImageFormat format;
        format.color_space = COLORSPACE_sRGB;
@@ -449,7 +523,7 @@ TEST(YCbCrInputTest, DifferentCbAndCrPositioning) {
        };
        float out_data[width * height];
 
-       EffectChainTester tester(NULL, width, height);
+       EffectChainTester tester(nullptr, width, height);
 
        ImageFormat format;
        format.color_space = COLORSPACE_sRGB;
@@ -507,7 +581,7 @@ TEST(YCbCrInputTest, PBO) {
        glBufferData(GL_PIXEL_UNPACK_BUFFER_ARB, width * height * 3, data, 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;
@@ -564,7 +638,7 @@ TEST(YCbCrInputTest, CombinedCbAndCr) {
        };
        float out_data[4 * width * height];
 
-       EffectChainTester tester(NULL, width, height);
+       EffectChainTester tester(nullptr, width, height);
 
        ImageFormat format;
        format.color_space = COLORSPACE_sRGB;
@@ -617,7 +691,7 @@ TEST(YCbCrInputTest, ExternalTexture) {
        };
        float out_data[4 * width * height];
 
-       EffectChainTester tester(NULL, width, height);
+       EffectChainTester tester(nullptr, width, height);
 
        ImageFormat format;
        format.color_space = COLORSPACE_sRGB;
@@ -775,7 +849,7 @@ TEST(YCbCrInputTest, NoData) {
 
        float out_data[4 * width * height];
 
-       EffectChainTester tester(NULL, width, height);
+       EffectChainTester tester(nullptr, width, height);
 
        ImageFormat format;
        format.color_space = COLORSPACE_sRGB;
@@ -832,7 +906,7 @@ TEST(YCbCrInputTest, TenBitInterleaved) {
                        (expanded_data[i * 3 + 2] << 20);
        }
 
-       EffectChainTester tester(NULL, width, height);
+       EffectChainTester tester(nullptr, width, height);
 
        ImageFormat format;
        format.color_space = COLORSPACE_sRGB;
@@ -895,7 +969,7 @@ TEST(YCbCrInputTest, TenBitPlanar) {
        };
        float out_data[4 * width * height];
 
-       EffectChainTester tester(NULL, width, height);
+       EffectChainTester tester(nullptr, width, height);
 
        ImageFormat format;
        format.color_space = COLORSPACE_sRGB;
@@ -930,16 +1004,16 @@ TEST(YCbCrInputTest, TenBitPlanar) {
 class MipmapNeedingEffect : public Effect {
 public:
        MipmapNeedingEffect() {}
-       virtual bool needs_mipmaps() const { return true; }
+       MipmapRequirements needs_mipmaps() const override { return NEEDS_MIPMAPS; }
 
        // To be allowed to mess with the sampler state.
-       virtual bool needs_texture_bounce() const { return true; }
+       bool needs_texture_bounce() const override { return true; }
 
-       virtual string effect_type_id() const { return "MipmapNeedingEffect"; }
-       string output_fragment_shader() { return read_file("mipmap_needing_effect.frag"); }
-       virtual void inform_added(EffectChain *chain) { this->chain = chain; }
+       string effect_type_id() const override { return "MipmapNeedingEffect"; }
+       string output_fragment_shader() override { return read_file("mipmap_needing_effect.frag"); }
+       void inform_added(EffectChain *chain) override { this->chain = chain; }
 
-       void set_gl_state(GLuint glsl_program_num, const string& prefix, unsigned *sampler_num)
+       void set_gl_state(GLuint glsl_program_num, const string& prefix, unsigned *sampler_num) override
        {
                Node *self = chain->find_node_for_effect(this);
                glActiveTexture(chain->get_input_sampler(self, 0));
@@ -957,8 +1031,8 @@ private:
 // Basically the same test as EffectChainTest_MipmapGenerationWorks,
 // just with the data converted to Y'CbCr (as red only).
 TEST(EffectChainTest, MipmapGenerationWorks) {
-       unsigned width = 4;
-       unsigned height = 16;
+       const unsigned width = 4;
+       const unsigned height = 16;
        float red_data[width * height] = {  // In 4x4 blocks.
                1.0f, 0.0f, 0.0f, 0.0f,
                0.0f, 0.0f, 0.0f, 0.0f,
@@ -1044,8 +1118,8 @@ TEST(EffectChainTest, MipmapGenerationWorks) {
        format.color_space = COLORSPACE_sRGB;
        format.gamma_curve = GAMMA_sRGB;
 
-       float out_data[width * height];
-       EffectChainTester tester(NULL, width, height);
+       float out_data[width * height * 4];
+       EffectChainTester tester(nullptr, width, height);
        YCbCrInput *input = new YCbCrInput(format, ycbcr_format, width, height, YCBCR_INPUT_INTERLEAVED);
        input->set_pixel_data(0, ycbcr_data);
        tester.get_chain()->add_input(input);