X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=ycbcr_input_test.cpp;h=873a6c5f132c3b0e5a303e4192d5905f0c69c049;hp=4beaaa33cb53d013f4319ed57698d1257be4ee6c;hb=5f81c29e307735bbadb3c0cb06500af627b2e57a;hpb=9651a4eaae012cdc49c1aa38197861e04f62e91e

diff --git a/ycbcr_input_test.cpp b/ycbcr_input_test.cpp
index 4beaaa3..873a6c5 100644
--- 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"
@@ -10,7 +9,9 @@
 #include "util.h"
 #include "ycbcr_input.h"
 
-TEST(YCbCrInput, Simple444) {
+namespace movit {
+
+TEST(YCbCrInputTest, Simple444) {
 	const int width = 1;
 	const int height = 5;
 
@@ -43,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;
@@ -63,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;
 
@@ -97,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;
@@ -117,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;
 
@@ -150,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;
@@ -170,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;
 
@@ -205,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;
@@ -225,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;
 
@@ -266,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;
@@ -286,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;
 
@@ -327,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;
@@ -348,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;
 
@@ -396,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;
@@ -418,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;
 
@@ -453,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;
@@ -474,3 +483,5 @@ TEST(YCbCrInput, PBO) {
 
 	glDeleteBuffers(1, &pbo);
 }
+
+}  // namespace movit