X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=test_util.cpp;h=65dbe8a716210267432893b5783b0a3a7501bb79;hp=a3ccb5c5f04cebcd3c804c294e95e93d7b886a59;hb=0ed2c7fe3876a49d1565e3425e5a491206ffe32d;hpb=7ea0b3a5be9bafaa2d1fa5a17ce285a725ce132b

diff --git a/test_util.cpp b/test_util.cpp
index a3ccb5c..65dbe8a 100644
--- a/test_util.cpp
+++ b/test_util.cpp
@@ -47,52 +47,22 @@ 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), 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));
 
 	if (data != NULL) {
 		add_input(data, pixel_format, color_space, gamma_curve);
 	}
-
-	GLuint type;
-	if (framebuffer_format == GL_RGBA8) {
-		type = GL_UNSIGNED_BYTE;
-	} else if (framebuffer_format == GL_RGBA16F || framebuffer_format == GL_RGBA32F) {
-		type = GL_FLOAT;
-	} else {
-		// Add more here as needed.
-		assert(false);
-	}
-
-	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);
-	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();
 }
 
 EffectChainTester::~EffectChainTester()
 {
-	glDeleteFramebuffers(1, &fbo);
-	check_error();
-	glDeleteTextures(1, &texnum);
-	check_error();
 }
 
 Input *EffectChainTester::add_input(const float *data, MovitPixelFormat pixel_format, Colorspace color_space, GammaCurve gamma_curve, int input_width, int input_height)
@@ -134,94 +104,257 @@ 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<float>(out_data, NULL, 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, 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<float>(out_data, out_data2, out_data3, NULL, GL_FLOAT, format, color_space, gamma_curve, alpha_format);
+}
+
+void EffectChainTester::run(float *out_data, float *out_data2, float *out_data3, float *out_data4, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format)
+{
+	internal_run(out_data, out_data2, out_data3, out_data4, 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<unsigned char>(out_data, NULL, 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, 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<unsigned char>(out_data, out_data2, out_data3, 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, unsigned char *out_data4, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format)
+{
+	internal_run(out_data, out_data2, out_data3, out_data4, GL_UNSIGNED_BYTE, format, color_space, gamma_curve, alpha_format);
+}
+
+void EffectChainTester::run(uint16_t *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format)
+{
+	internal_run<uint16_t>(out_data, NULL, NULL, NULL, GL_UNSIGNED_SHORT, 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, NULL, GL_UNSIGNED_INT_2_10_10_10_REV, format, color_space, gamma_curve, alpha_format);
+}
+
+#ifdef HAVE_BENCHMARK
+
+void EffectChainTester::benchmark(benchmark::State &state, float *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format)
+{
+	internal_run<float>(out_data, NULL, NULL, NULL, GL_FLOAT, format, color_space, gamma_curve, alpha_format, &state);
+}
+
+void EffectChainTester::benchmark(benchmark::State &state, 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, NULL, GL_FLOAT, format, color_space, gamma_curve, alpha_format, &state);
+}
+
+void EffectChainTester::benchmark(benchmark::State &state, float *out_data, float *out_data2, float *out_data3, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format)
+{
+	internal_run<float>(out_data, out_data2, out_data3, NULL, GL_FLOAT, format, color_space, gamma_curve, alpha_format, &state);
+}
+
+void EffectChainTester::benchmark(benchmark::State &state, float *out_data, float *out_data2, float *out_data3, float *out_data4, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format)
+{
+	internal_run(out_data, out_data2, out_data3, out_data4, GL_FLOAT, format, color_space, gamma_curve, alpha_format, &state);
+}
+
+void EffectChainTester::benchmark(benchmark::State &state, unsigned char *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format)
+{
+	internal_run<unsigned char>(out_data, NULL, NULL, NULL, GL_UNSIGNED_BYTE, format, color_space, gamma_curve, alpha_format, &state);
+}
+
+void EffectChainTester::benchmark(benchmark::State &state, 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, NULL, GL_UNSIGNED_BYTE, format, color_space, gamma_curve, alpha_format, &state);
+}
+
+void EffectChainTester::benchmark(benchmark::State &state, 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<unsigned char>(out_data, out_data2, out_data3, NULL, GL_UNSIGNED_BYTE, format, color_space, gamma_curve, alpha_format, &state);
+}
+
+void EffectChainTester::benchmark(benchmark::State &state, unsigned char *out_data, unsigned char *out_data2, unsigned char *out_data3, unsigned char *out_data4, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format)
+{
+	internal_run(out_data, out_data2, out_data3, out_data4, GL_UNSIGNED_BYTE, format, color_space, gamma_curve, alpha_format, &state);
+}
+
+void EffectChainTester::benchmark(benchmark::State &state, uint16_t *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format)
+{
+	internal_run<uint16_t>(out_data, NULL, NULL, NULL, GL_UNSIGNED_SHORT, format, color_space, gamma_curve, alpha_format, &state);
+}
+
+void EffectChainTester::benchmark_10_10_10_2(benchmark::State &state, uint32_t *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format)
+{
+	internal_run<uint32_t>(out_data, NULL, NULL, NULL, GL_UNSIGNED_INT_2_10_10_10_REV, format, color_space, gamma_curve, alpha_format, &state);
+}
+
+#endif
+
+template<class T>
+void EffectChainTester::internal_run(T *out_data, T *out_data2, T *out_data3, T *out_data4, GLenum internal_format, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format
+#ifdef HAVE_BENCHMARK
+, benchmark::State *benchmark_state
+#endif
+)
 {
 	if (!finalized) {
 		finalize_chain(color_space, gamma_curve, alpha_format);
 	}
 
-	chain.render_to_fbo(fbo, width, height);
+	GLuint type;
+	if (framebuffer_format == GL_RGBA8) {
+		type = GL_UNSIGNED_BYTE;
+	} else if (framebuffer_format == GL_RGBA16) {
+		type = GL_UNSIGNED_SHORT;
+	} 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);
+	}
 
-	glBindFramebuffer(GL_FRAMEBUFFER, fbo);
+	unsigned num_outputs;
+	if (out_data4 != NULL) {
+		num_outputs = 4;
+	} else if (out_data3 != NULL) {
+		num_outputs = 3;
+	} else if (out_data2 != NULL) {
+		num_outputs = 2;
+	} else {
+		num_outputs = 1;
+	}
+
+	GLuint fbo, texnum[4];
+
+	glGenTextures(num_outputs, texnum);
 	check_error();
-	if (!epoxy_is_desktop_gl() && (format == GL_RED || format == GL_BLUE || format == GL_ALPHA)) {
-		// GLES will only read GL_RGBA.
-		float *temp = new float[width * height * 4];
-		glReadPixels(0, 0, width, height, GL_RGBA, GL_FLOAT, temp);
+	for (unsigned i = 0; i < num_outputs; ++i) {
+		glBindTexture(GL_TEXTURE_2D, texnum[i]);
 		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];
-			}
-		} else {
-			for (unsigned i = 0; i < width * height; ++i) {
-				out_data[i] = temp[i * 4];
-			}
-		}
-		delete[] temp;
-	} else {
-		glReadPixels(0, 0, width, height, format, GL_FLOAT, out_data);
+		glTexImage2D(GL_TEXTURE_2D, 0, framebuffer_format, width, height, 0, GL_RGBA, type, NULL);
 		check_error();
 	}
 
-	if (format == GL_RGBA) {
-		width *= 4;
+	glGenFramebuffers(1, &fbo);
+	check_error();
+	glBindFramebuffer(GL_FRAMEBUFFER, fbo);
+	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();
 	}
 
-	vertical_flip(out_data, width, height);
-}
+	GLenum bufs[] = { GL_COLOR_ATTACHMENT0, GL_COLOR_ATTACHMENT1, GL_COLOR_ATTACHMENT2, GL_COLOR_ATTACHMENT3 };
+	glDrawBuffers(num_outputs, bufs);
 
-void EffectChainTester::run(unsigned char *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format)
-{
-	if (!finalized) {
-		finalize_chain(color_space, gamma_curve, alpha_format);
+	chain.render_to_fbo(fbo, width, height);
+
+#ifdef HAVE_BENCHMARK
+	// If running benchmarks: Now we've warmed up everything, so let's run the
+	// actual benchmark loop.
+	if (benchmark_state != nullptr) {
+		glFinish();
+	        size_t iters = benchmark_state->max_iterations;
+		for (auto _ : *benchmark_state) {
+			chain.render_to_fbo(fbo, width, height);
+			if (--iters == 0) {
+				glFinish();
+			}
+		}
+		benchmark_state->SetItemsProcessed(benchmark_state->iterations() * width * height);
 	}
+#endif
 
-	chain.render_to_fbo(fbo, width, height);
+	T *data[4] = { out_data, out_data2, out_data3, out_data4 };
 
 	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.
-		unsigned char *temp = new unsigned char[width * height * 4];
-		glReadPixels(0, 0, width, height, GL_RGBA, GL_UNSIGNED_BYTE, 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();
 		}
-		delete[] temp;
-	} else {
-		glReadPixels(0, 0, width, height, format, GL_UNSIGNED_BYTE, out_data);
-		check_error();
-	}
 
-	if (format == GL_RGBA) {
-		width *= 4;
+		if (format == GL_RGBA && (type == GL_UNSIGNED_BYTE || type == GL_UNSIGNED_SHORT || type == GL_FLOAT)) {
+			vertical_flip(ptr, width * 4, height);
+		} else {
+			vertical_flip(ptr, width, height);
+		}
 	}
 
-	vertical_flip(out_data, width, height);
+	glDeleteFramebuffers(1, &fbo);
+	check_error();
+	glDeleteTextures(num_outputs, texnum);
+	check_error();
+}
+
+void EffectChainTester::add_output(const ImageFormat &format, OutputAlphaFormat alpha_format)
+{
+	chain.add_output(format, alpha_format);
+	output_added = true;
+}
+
+void EffectChainTester::add_ycbcr_output(const ImageFormat &format, OutputAlphaFormat alpha_format, const YCbCrFormat &ycbcr_format, YCbCrOutputSplitting output_splitting, GLenum type)
+{
+	chain.add_ycbcr_output(format, alpha_format, ycbcr_format, output_splitting, type);
+	output_added = true;
 }
 
 void EffectChainTester::finalize_chain(Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format)
 {
 	assert(!finalized);
-	ImageFormat image_format;
-	image_format.color_space = color_space;
-	image_format.gamma_curve = gamma_curve;
-	chain.add_output(image_format, alpha_format);
+	if (!output_added) {
+		ImageFormat image_format;
+		image_format.color_space = color_space;
+		image_format.gamma_curve = gamma_curve;
+		chain.add_output(image_format, alpha_format);
+		output_added = true;
+	}
 	chain.finalize();
 	finalized = true;
 }
@@ -294,6 +427,48 @@ void expect_equal(const unsigned char *ref, const unsigned char *result, unsigne
 	delete[] result_float;
 }
 
+void expect_equal(const uint16_t *ref, const uint16_t *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 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;
@@ -317,4 +492,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