X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=test_util.cpp;h=fadb2d77f084fb3b246cd491e4aab3b3a94fceda;hp=199be456ca4da8839882a46c5fdf2ee0e39f167e;hb=25162b5457057af3ebcc1649571eeeb923e90098;hpb=034721afa637a31a4f8d40f61e5d0ae3789eb340

diff --git a/test_util.cpp b/test_util.cpp
index 199be45..fadb2d7 100644
--- a/test_util.cpp
+++ b/test_util.cpp
@@ -47,7 +47,12 @@ void vertical_flip(T *data, unsigned width, unsigned height)
 EffectChainTester::EffectChainTester(const float *data, unsigned width, unsigned height,
                                      MovitPixelFormat pixel_format, Colorspace color_space, GammaCurve gamma_curve,
                                      GLenum framebuffer_format)
-	: chain(width, height, get_static_pool()), width(width), height(height), framebuffer_format(framebuffer_format), output_added(false), finalized(false)
+	: chain(width, height, get_static_pool()),
+	  width(width),
+	  height(height),
+	  framebuffer_format(framebuffer_format),
+	  output_added(false),
+	  finalized(false)
 {
 	CHECK(init_movit(".", MOVIT_DEBUG_OFF));
 
@@ -100,16 +105,41 @@ 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, GL_FLOAT, format, color_space, gamma_curve, alpha_format);
+	internal_run<float>(out_data, NULL, NULL, GL_FLOAT, 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)
+{
+	internal_run<float>(out_data, out_data2, NULL, GL_FLOAT, 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, GL_FLOAT, 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, GL_UNSIGNED_BYTE, format, color_space, gamma_curve, alpha_format);
+	internal_run<unsigned char>(out_data, NULL, NULL, GL_UNSIGNED_BYTE, 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<unsigned char>(out_data, out_data2, NULL, GL_UNSIGNED_BYTE, 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)
+{
+	internal_run(out_data, out_data2, out_data3, GL_UNSIGNED_BYTE, 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<uint32_t>(out_data, NULL, NULL, GL_UNSIGNED_INT_2_10_10_10_REV, format, color_space, gamma_curve, alpha_format);
 }
 
 template<class T>
-void EffectChainTester::internal_run(T *out_data, GLenum internal_format, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format)
+void EffectChainTester::internal_run(T *out_data, T *out_data2, T *out_data3, GLenum internal_format, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format)
 {
 	if (!finalized) {
 		finalize_chain(color_space, gamma_curve, alpha_format);
@@ -120,72 +150,94 @@ void EffectChainTester::internal_run(T *out_data, GLenum internal_format, GLenum
 		type = GL_UNSIGNED_BYTE;
 	} else if (framebuffer_format == GL_RGBA16F || framebuffer_format == GL_RGBA32F) {
 		type = GL_FLOAT;
+	} else if (framebuffer_format == GL_RGB10_A2) {
+		type = GL_UNSIGNED_INT_2_10_10_10_REV;
 	} else {
 		// Add more here as needed.
 		assert(false);
 	}
 
-	GLuint fbo, texnum;
+	unsigned num_outputs;
+	if (out_data3 != NULL) {
+		num_outputs = 3;
+	} else if (out_data2 != NULL) {
+		num_outputs = 2;
+	} else {
+		num_outputs = 1;
+	}
 
-	glGenTextures(1, &texnum);
-	check_error();
-	glBindTexture(GL_TEXTURE_2D, texnum);
-	check_error();
-	glTexImage2D(GL_TEXTURE_2D, 0, framebuffer_format, width, height, 0, GL_RGBA, type, NULL);
+	GLuint fbo, texnum[3];
+
+	glGenTextures(num_outputs, texnum);
 	check_error();
+	for (unsigned i = 0; i < num_outputs; ++i) {
+		glBindTexture(GL_TEXTURE_2D, texnum[i]);
+		check_error();
+		glTexImage2D(GL_TEXTURE_2D, 0, framebuffer_format, width, height, 0, GL_RGBA, type, NULL);
+		check_error();
+	}
 
 	glGenFramebuffers(1, &fbo);
 	check_error();
 	glBindFramebuffer(GL_FRAMEBUFFER, fbo);
 	check_error();
-	glFramebufferTexture2D(
-		GL_FRAMEBUFFER,
-		GL_COLOR_ATTACHMENT0,
-		GL_TEXTURE_2D,
-		texnum,
-		0);
-	check_error();
-	glBindFramebuffer(GL_FRAMEBUFFER, 0);
-	check_error();
+	for (unsigned i = 0; i < num_outputs; ++i) {
+		glFramebufferTexture2D(
+			GL_FRAMEBUFFER,
+			GL_COLOR_ATTACHMENT0 + i,
+			GL_TEXTURE_2D,
+			texnum[i],
+			0);
+		check_error();
+	}
+
+	GLenum bufs[] = { GL_COLOR_ATTACHMENT0, GL_COLOR_ATTACHMENT1, GL_COLOR_ATTACHMENT2 };
+	glDrawBuffers(num_outputs, bufs);
 
 	chain.render_to_fbo(fbo, width, height);
 
+	T *data[3] = { out_data, out_data2, out_data3 };
+
 	glBindFramebuffer(GL_FRAMEBUFFER, fbo);
 	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];
-		glReadPixels(0, 0, width, height, GL_RGBA, internal_format, temp);
-		check_error();
-		if (format == GL_ALPHA) {
-			for (unsigned i = 0; i < width * height; ++i) {
-				out_data[i] = temp[i * 4 + 3];
-			}
-		} else if (format == GL_BLUE) {
-			for (unsigned i = 0; i < width * height; ++i) {
-				out_data[i] = temp[i * 4 + 2];
+	for (unsigned i = 0; i < num_outputs; ++i) {
+		T *ptr = data[i];
+		glReadBuffer(GL_COLOR_ATTACHMENT0 + i);
+		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];
+			glReadPixels(0, 0, width, height, GL_RGBA, internal_format, temp);
+			check_error();
+			if (format == GL_ALPHA) {
+				for (unsigned i = 0; i < width * height; ++i) {
+					ptr[i] = temp[i * 4 + 3];
+				}
+			} else if (format == GL_BLUE) {
+				for (unsigned i = 0; i < width * height; ++i) {
+					ptr[i] = temp[i * 4 + 2];
+				}
+			} else {
+				for (unsigned i = 0; i < width * height; ++i) {
+					ptr[i] = temp[i * 4];
+				}
 			}
+			delete[] temp;
 		} else {
-			for (unsigned i = 0; i < width * height; ++i) {
-				out_data[i] = temp[i * 4];
-			}
+			glReadPixels(0, 0, width, height, format, internal_format, ptr);
+			check_error();
+		}
+
+		if (format == GL_RGBA && sizeof(*ptr) == 1) {
+			vertical_flip(ptr, width * 4, height);
+		} else {
+			vertical_flip(ptr, width, height);
 		}
-		delete[] temp;
-	} else {
-		glReadPixels(0, 0, width, height, format, internal_format, out_data);
-		check_error();
 	}
 
 	glDeleteFramebuffers(1, &fbo);
 	check_error();
-	glDeleteTextures(1, &texnum);
+	glDeleteTextures(num_outputs, texnum);
 	check_error();
-
-	if (format == GL_RGBA) {
-		width *= 4;
-	}
-
-	vertical_flip(out_data, width, height);
 }
 
 void EffectChainTester::add_output(const ImageFormat &format, OutputAlphaFormat alpha_format)
@@ -194,9 +246,9 @@ void EffectChainTester::add_output(const ImageFormat &format, OutputAlphaFormat
 	output_added = true;
 }
 
-void EffectChainTester::add_ycbcr_output(const ImageFormat &format, OutputAlphaFormat alpha_format, const YCbCrFormat &ycbcr_format)
+void EffectChainTester::add_ycbcr_output(const ImageFormat &format, OutputAlphaFormat alpha_format, const YCbCrFormat &ycbcr_format, YCbCrOutputSplitting output_splitting)
 {
-	chain.add_ycbcr_output(format, alpha_format, ycbcr_format);
+	chain.add_ycbcr_output(format, alpha_format, ycbcr_format, output_splitting);
 	output_added = true;
 }
 
@@ -282,6 +334,27 @@ void expect_equal(const unsigned char *ref, const unsigned char *result, unsigne
 	delete[] result_float;
 }
 
+void expect_equal(const int *ref, const int *result, unsigned width, unsigned height, unsigned largest_difference_limit, float rms_limit)
+{
+	assert(width > 0);
+	assert(height > 0);
+
+	float *ref_float = new float[width * height];
+	float *result_float = new float[width * height];
+
+	for (unsigned y = 0; y < height; ++y) {
+		for (unsigned x = 0; x < width; ++x) {
+			ref_float[y * width + x] = ref[y * width + x];
+			result_float[y * width + x] = result[y * width + x];
+		}
+	}
+
+	expect_equal(ref_float, result_float, width, height, largest_difference_limit, rms_limit);
+
+	delete[] ref_float;
+	delete[] result_float;
+}
+
 void test_accuracy(const float *expected, const float *result, unsigned num_values, double absolute_error_limit, double relative_error_limit, double local_relative_error_limit, double rms_limit)
 {
 	double squared_difference = 0.0;
@@ -305,4 +378,24 @@ void test_accuracy(const float *expected, const float *result, unsigned num_valu
 	EXPECT_LT(rms, rms_limit);
 }
 
+double srgb_to_linear(double x)
+{
+	// From the Wikipedia article on sRGB.
+	if (x < 0.04045) {
+		return x / 12.92;
+	} else {
+		return pow((x + 0.055) / 1.055, 2.4);
+	}
+}
+
+double linear_to_srgb(double x)
+{
+	// From the Wikipedia article on sRGB.
+	if (x < 0.0031308) {
+		return 12.92 * x;
+	} else {
+		return 1.055 * pow(x, 1.0 / 2.4) - 0.055;
+	}
+}
+
 }  // namespace movit