X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=test_util.cpp;h=b89b3ffb9ec64364768140b475ca53018b09a0a5;hp=36c7d7c1e52995a2202c2e8dac2e98f81493eb10;hb=616432c0732b8e7780457a1b6320acb46daa9663;hpb=f898f4106a13b1efdbad85037781f785c2064a76

diff --git a/test_util.cpp b/test_util.cpp
index 36c7d7c..b89b3ff 100644
--- a/test_util.cpp
+++ b/test_util.cpp
@@ -1,3 +1,4 @@
+#include "init.h"
 #include "test_util.h"
 #include "flat_input.h"
 #include "gtest/gtest.h"
@@ -7,16 +8,38 @@
 
 #include <algorithm>
 
-EffectChainTester::EffectChainTester(const float *data, unsigned width, unsigned height, MovitPixelFormat pixel_format, ColorSpace color_space, GammaCurve gamma_curve)
-	: chain(width, height), width(width), height(height)
+namespace {
+
+// Flip upside-down to compensate for different origin.
+template<class T>
+void vertical_flip(T *data, unsigned width, unsigned height)
+{
+	for (unsigned y = 0; y < height / 2; ++y) {
+		unsigned flip_y = height - y - 1;
+		for (unsigned x = 0; x < width; ++x) {
+			std::swap(data[y * width + x], data[flip_y * width + x]);
+		}
+	}
+}
+
+}  // namespace
+
+EffectChainTester::EffectChainTester(const float *data, unsigned width, unsigned height,
+                                     MovitPixelFormat pixel_format, Colorspace color_space, GammaCurve gamma_curve,
+                                     GLenum framebuffer_format)
+	: chain(width, height), width(width), height(height), finalized(false)
 {
-	add_input(data, pixel_format, color_space, gamma_curve);
+	init_movit(".", MOVIT_DEBUG_ON);
+
+	if (data != NULL) {
+		add_input(data, pixel_format, color_space, gamma_curve);
+	}
 
 	glGenTextures(1, &texnum);
 	check_error();
 	glBindTexture(GL_TEXTURE_2D, texnum);
 	check_error();
-	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA16F_ARB, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
+	glTexImage2D(GL_TEXTURE_2D, 0, framebuffer_format, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
 	check_error();
 
 	glGenFramebuffers(1, &fbo);
@@ -42,7 +65,7 @@ EffectChainTester::~EffectChainTester()
 	check_error();
 }
 
-Input *EffectChainTester::add_input(const float *data, MovitPixelFormat pixel_format, ColorSpace color_space, GammaCurve gamma_curve)
+Input *EffectChainTester::add_input(const float *data, MovitPixelFormat pixel_format, Colorspace color_space, GammaCurve gamma_curve)
 {
 	ImageFormat format;
 	format.color_space = color_space;
@@ -54,26 +77,63 @@ Input *EffectChainTester::add_input(const float *data, MovitPixelFormat pixel_fo
 	return input;
 }
 
-void EffectChainTester::run(float *out_data, GLenum format, ColorSpace color_space, GammaCurve gamma_curve)
+Input *EffectChainTester::add_input(const unsigned char *data, MovitPixelFormat pixel_format, Colorspace color_space, GammaCurve gamma_curve)
 {
-	ImageFormat image_format;
-	image_format.color_space = color_space;
-	image_format.gamma_curve = gamma_curve;
-	chain.add_output(image_format);
-	chain.finalize();
+	ImageFormat format;
+	format.color_space = color_space;
+	format.gamma_curve = gamma_curve;
+
+	FlatInput *input = new FlatInput(format, pixel_format, GL_UNSIGNED_BYTE, width, height);
+	input->set_pixel_data(data);
+	chain.add_input(input);
+	return input;
+}
+
+void EffectChainTester::run(float *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);
 
 	glBindFramebuffer(GL_FRAMEBUFFER, fbo);
 	glReadPixels(0, 0, width, height, format, GL_FLOAT, out_data);
 
-	// Flip upside-down to compensate for different origin.
-	for (unsigned y = 0; y < height / 2; ++y) {
-		unsigned flip_y = height - y - 1;
-		for (unsigned x = 0; x < width; ++x) {
-			std::swap(out_data[y * width + x], out_data[flip_y * width + x]);
-		}
+	if (format == GL_RGBA) {
+		width *= 4;
 	}
+
+	vertical_flip(out_data, width, height);
+}
+
+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);
+
+	glBindFramebuffer(GL_FRAMEBUFFER, fbo);
+	glReadPixels(0, 0, width, height, format, GL_UNSIGNED_BYTE, out_data);
+
+	if (format == GL_RGBA) {
+		width *= 4;
+	}
+
+	vertical_flip(out_data, width, height);
+}
+
+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);
+	chain.finalize();
+	finalized = true;
 }
 
 void expect_equal(const float *ref, const float *result, unsigned width, unsigned height, float largest_difference_limit, float rms_limit)
@@ -122,3 +182,24 @@ void expect_equal(const float *ref, const float *result, unsigned width, unsigne
 		}
 	}
 }
+
+void expect_equal(const unsigned char *ref, const unsigned char *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;
+}