X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=test_util.cpp;h=3aecd54463a9c6213e53e22dcbf26122ae64ff68;hp=047eb11a18a360de615f08249d50a034df64a5fe;hb=3140175e3160e75d659e596e420afffb596e3c2c;hpb=fbe8a2a49401559a456a883d08fe5a7ac9e5f936

diff --git a/test_util.cpp b/test_util.cpp
index 047eb11..3aecd54 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,10 +8,31 @@
 
 #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)
 {
-	add_input(data, pixel_format, color_space, gamma_curve);
+	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)
+	: chain(width, height), width(width), height(height), finalized(false)
+{
+	init_movit();
+
+	if (data != NULL) {
+		add_input(data, pixel_format, color_space, gamma_curve);
+	}
 
 	glGenTextures(1, &texnum);
 	check_error();
@@ -34,7 +56,15 @@ EffectChainTester::EffectChainTester(const float *data, unsigned width, unsigned
 	check_error();
 }
 
-Input *EffectChainTester::add_input(const float *data, MovitPixelFormat pixel_format, ColorSpace color_space, GammaCurve gamma_curve)
+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)
 {
 	ImageFormat format;
 	format.color_space = color_space;
@@ -46,26 +76,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)
+{
+	if (!finalized) {
+		finalize_chain(color_space, gamma_curve);
+	}
 
 	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)
+{
+	if (!finalized) {
+		finalize_chain(color_space, gamma_curve);
+	}
+
+	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)
+{
+	assert(!finalized);
+	ImageFormat image_format;
+	image_format.color_space = color_space;
+	image_format.gamma_curve = gamma_curve;
+	chain.add_output(image_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)
@@ -87,7 +154,9 @@ void expect_equal(const float *ref, const float *result, unsigned width, unsigne
 	}
 
 	EXPECT_LT(largest_difference, largest_difference_limit)
-		<< "Largest difference is in x=" << largest_diff_x << ", y=" << largest_diff_y;
+		<< "Largest difference is in x=" << largest_diff_x << ", y=" << largest_diff_y << ":\n"
+		<< "Reference: " << ref[largest_diff_y * width + largest_diff_x] << "\n"
+		<< "Result:    " << result[largest_diff_y * width + largest_diff_x];
 
 	float rms = sqrt(squared_difference) / (width * height);
 	EXPECT_LT(rms, rms_limit);