X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=test_util.cpp;h=2073bc2d6d3e31550dc6657c77d8664253203739;hp=c8759744b9853229e24e1faf7a0f0f8321157758;hb=80fc4a6e806e5638ae050c3020962137ca5fd76b;hpb=cef6dcbc9ebaceb7b0cb47d6a519cb08a390c358

diff --git a/test_util.cpp b/test_util.cpp
index c875974..2073bc2 100644
--- a/test_util.cpp
+++ b/test_util.cpp
@@ -47,7 +47,7 @@ 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), output_added(false), finalized(false)
 {
 	CHECK(init_movit(".", MOVIT_DEBUG_OFF));
 
@@ -143,13 +143,23 @@ void EffectChainTester::run(float *out_data, GLenum format, Colorspace color_spa
 
 	glBindFramebuffer(GL_FRAMEBUFFER, fbo);
 	check_error();
-	if (!epoxy_is_desktop_gl() && format == GL_RED) {
+	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);
 		check_error();
-		for (int i = 0; i < width * height; ++i) {
-			out_data[i] = temp[i * 4];
+		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 {
@@ -174,13 +184,23 @@ void EffectChainTester::run(unsigned char *out_data, GLenum format, Colorspace c
 
 	glBindFramebuffer(GL_FRAMEBUFFER, fbo);
 	check_error();
-	if (!epoxy_is_desktop_gl() && format == GL_RED) {
+	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();
-		for (int i = 0; i < width * height; ++i) {
-			out_data[i] = temp[i * 4];
+		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 {
@@ -195,13 +215,28 @@ void EffectChainTester::run(unsigned char *out_data, GLenum format, Colorspace c
 	vertical_flip(out_data, width, height);
 }
 
+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)
+{
+	chain.add_ycbcr_output(format, alpha_format, ycbcr_format);
+	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;
 }