Unbreak make install after the last changes.

[movit] / ycbcr_input_test.cpp

diff --git a/ycbcr_input_test.cpp b/ycbcr_input_test.cpp
index 352fe290dffc4143c27a44e62bf27bef842f2980..8b69e879ff0b2537469cc5f4a175c0eb06dce56d 100644 (file)
--- a/ycbcr_input_test.cpp
+++ b/ycbcr_input_test.cpp
@@ -1,7 +1,6 @@
 // Unit tests for YCbCrInput.
-// FIXME: This class really ought to support mipmaps.
 
-#include <GL/glew.h>
+#include <epoxy/gl.h>
 #include <stddef.h>
 
 #include "effect_chain.h"
@@ -12,7 +11,7 @@
 
 namespace movit {
 
-TEST(YCbCrInput, Simple444) {
+TEST(YCbCrInputTest, Simple444) {
        const int width = 1;
        const int height = 5;
 
@@ -45,6 +44,7 @@ TEST(YCbCrInput, Simple444) {
        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 = 1;
        ycbcr_format.chroma_subsampling_y = 1;
        ycbcr_format.cb_x_position = 0.5f;
@@ -65,7 +65,7 @@ TEST(YCbCrInput, Simple444) {
        expect_equal(expected_data, out_data, 4 * width, height, 0.025, 0.002);
 }
 
-TEST(YCbCrInput, FullRangeRec601) {
+TEST(YCbCrInputTest, FullRangeRec601) {
        const int width = 1;
        const int height = 5;
 
@@ -99,6 +99,7 @@ TEST(YCbCrInput, FullRangeRec601) {
        YCbCrFormat ycbcr_format;
        ycbcr_format.luma_coefficients = YCBCR_REC_601;
        ycbcr_format.full_range = true;
+       ycbcr_format.num_levels = 256;
        ycbcr_format.chroma_subsampling_x = 1;
        ycbcr_format.chroma_subsampling_y = 1;
        ycbcr_format.cb_x_position = 0.5f;
@@ -119,7 +120,7 @@ TEST(YCbCrInput, FullRangeRec601) {
        expect_equal(expected_data, out_data, 4 * width, height, 0.025, 0.002);
 }
 
-TEST(YCbCrInput, Rec709) {
+TEST(YCbCrInputTest, Rec709) {
        const int width = 1;
        const int height = 5;
 
@@ -152,6 +153,7 @@ TEST(YCbCrInput, Rec709) {
        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;
@@ -172,7 +174,7 @@ TEST(YCbCrInput, Rec709) {
        expect_equal(expected_data, out_data, 4 * width, height, 0.025, 0.002);
 }
 
-TEST(YCbCrInput, Rec2020) {
+TEST(YCbCrInputTest, Rec2020) {
        const int width = 1;
        const int height = 5;
 
@@ -207,6 +209,7 @@ TEST(YCbCrInput, Rec2020) {
        YCbCrFormat ycbcr_format;
        ycbcr_format.luma_coefficients = YCBCR_REC_2020;
        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;
@@ -227,7 +230,7 @@ TEST(YCbCrInput, Rec2020) {
        expect_equal(expected_data, out_data, 4 * width, height, 0.025, 0.002);
 }
 
-TEST(YCbCrInput, Subsampling420) {
+TEST(YCbCrInputTest, Subsampling420) {
        const int width = 4;
        const int height = 4;
 
@@ -268,6 +271,7 @@ TEST(YCbCrInput, Subsampling420) {
        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 = 2;
        ycbcr_format.cb_x_position = 0.5f;
@@ -288,7 +292,7 @@ TEST(YCbCrInput, Subsampling420) {
        expect_equal(expected_data, out_data, width, height, 0.01, 0.001);
 }
 
-TEST(YCbCrInput, Subsampling420WithNonCenteredSamples) {
+TEST(YCbCrInputTest, Subsampling420WithNonCenteredSamples) {
        const int width = 4;
        const int height = 4;
 
@@ -329,6 +333,7 @@ TEST(YCbCrInput, Subsampling420WithNonCenteredSamples) {
        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 = 2;
        ycbcr_format.cb_x_position = 0.0f;
@@ -350,7 +355,7 @@ TEST(YCbCrInput, Subsampling420WithNonCenteredSamples) {
 }
 
 // Yes, some 4:2:2 formats actually have this craziness.
-TEST(YCbCrInput, DifferentCbAndCrPositioning) {
+TEST(YCbCrInputTest, DifferentCbAndCrPositioning) {
        const int width = 4;
        const int height = 4;
 
@@ -398,6 +403,7 @@ TEST(YCbCrInput, 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;
@@ -420,7 +426,7 @@ TEST(YCbCrInput, DifferentCbAndCrPositioning) {
        expect_equal(expected_data_blue, out_data, width, height, 0.01, 0.001);
 }
 
-TEST(YCbCrInput, PBO) {
+TEST(YCbCrInputTest, PBO) {
        const int width = 1;
        const int height = 5;
 
@@ -455,6 +461,7 @@ TEST(YCbCrInput, 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 = 1;
        ycbcr_format.chroma_subsampling_y = 1;
        ycbcr_format.cb_x_position = 0.5f;
@@ -477,4 +484,58 @@ TEST(YCbCrInput, PBO) {
        glDeleteBuffers(1, &pbo);
 }
 
+TEST(YCbCrInputTest, CombinedCbAndCr) {
+       const int width = 1;
+       const int height = 5;
+
+       // Pure-color test inputs, calculated with the formulas in Rec. 601
+       // section 2.5.4.
+       unsigned char y[width * height] = {
+               16, 235, 81, 145, 41,
+       };
+       unsigned char cb_cr[width * height * 2] = {
+               128, 128,
+               128, 128,
+                90, 240,
+                54,  34,
+               240, 110,
+       };
+       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(NULL, width, height);
+
+       ImageFormat format;
+       format.color_space = COLORSPACE_sRGB;
+       format.gamma_curve = GAMMA_sRGB;
+
+       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 = 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;
+
+       YCbCrInput *input = new YCbCrInput(format, ycbcr_format, width, height, YCBCR_INPUT_SPLIT_Y_AND_CBCR);
+       input->set_pixel_data(0, y);
+       input->set_pixel_data(1, cb_cr);
+       tester.get_chain()->add_input(input);
+
+       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);
+}
+
 }  // namespace movit