X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=test_util.cpp;h=afeb8486041487878ac666b6916db9efc12d30fd;hp=ab10f7b82be0fd3a4528d54eb406cdd6ce09f733;hb=34f5f331bd3b643949ccbb0c3488af2823634d59;hpb=1727b0714398fc4f318048d457a35ca58bc30b59

diff --git a/test_util.cpp b/test_util.cpp
index ab10f7b..afeb848 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,15 @@
 
 #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)
+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)
 {
-	add_input(data, pixel_format, color_space, gamma_curve);
+	init_movit();
+
+	if (data != NULL) {
+		add_input(data, pixel_format, color_space, gamma_curve);
+	}
 
 	glGenTextures(1, &texnum);
 	check_error();
@@ -37,10 +43,12 @@ EffectChainTester::EffectChainTester(const float *data, unsigned width, unsigned
 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)
+Input *EffectChainTester::add_input(const float *data, MovitPixelFormat pixel_format, Colorspace color_space, GammaCurve gamma_curve)
 {
 	ImageFormat format;
 	format.color_space = color_space;
@@ -52,19 +60,38 @@ 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) {
+		ImageFormat image_format;
+		image_format.color_space = color_space;
+		image_format.gamma_curve = gamma_curve;
+		chain.add_output(image_format);
+		chain.finalize();
+		finalized = true;
+	}
 
 	chain.render_to_fbo(fbo, width, height);
 
 	glBindFramebuffer(GL_FRAMEBUFFER, fbo);
 	glReadPixels(0, 0, width, height, format, GL_FLOAT, out_data);
 
+	if (format == GL_RGBA) {
+		width *= 4;
+	}
+
 	// Flip upside-down to compensate for different origin.
 	for (unsigned y = 0; y < height / 2; ++y) {
 		unsigned flip_y = height - y - 1;