X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=test_util.cpp;h=a9f738d715754c70d2e6d06b73ed100409c28d89;hp=61c3918810d1bb9fea9f0ef1da4fcb32690caaf0;hb=131e7179b596f8268fd80c32312849da83581e55;hpb=0fa51e08f83e0283337216f5b951b3d5a8c0555b

diff --git a/test_util.cpp b/test_util.cpp
index 61c3918..a9f738d 100644
--- a/test_util.cpp
+++ b/test_util.cpp
@@ -14,6 +14,8 @@
 
 using namespace std;
 
+namespace movit {
+
 class Input;
 
 namespace {
@@ -53,11 +55,21 @@ EffectChainTester::EffectChainTester(const float *data, unsigned width, unsigned
 		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, GL_UNSIGNED_BYTE, NULL);
+	glTexImage2D(GL_TEXTURE_2D, 0, framebuffer_format, width, height, 0, GL_RGBA, type, NULL);
 	check_error();
 
 	glGenFramebuffers(1, &fbo);
@@ -83,25 +95,39 @@ 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, int input_width, int input_height)
 {
 	ImageFormat format;
 	format.color_space = color_space;
 	format.gamma_curve = gamma_curve;
 
-	FlatInput *input = new FlatInput(format, pixel_format, GL_FLOAT, width, height);
+	if (input_width == -1) {
+		input_width = width;
+	}
+	if (input_height == -1) {
+		input_height = height;
+	}
+
+	FlatInput *input = new FlatInput(format, pixel_format, GL_FLOAT, input_width, input_height);
 	input->set_pixel_data(data);
 	chain.add_input(input);
 	return input;
 }
 
-Input *EffectChainTester::add_input(const unsigned char *data, MovitPixelFormat pixel_format, Colorspace color_space, GammaCurve gamma_curve)
+Input *EffectChainTester::add_input(const unsigned char *data, MovitPixelFormat pixel_format, Colorspace color_space, GammaCurve gamma_curve, int input_width, int input_height)
 {
 	ImageFormat format;
 	format.color_space = color_space;
 	format.gamma_curve = gamma_curve;
 
-	FlatInput *input = new FlatInput(format, pixel_format, GL_UNSIGNED_BYTE, width, height);
+	if (input_width == -1) {
+		input_width = width;
+	}
+	if (input_height == -1) {
+		input_height = height;
+	}
+
+	FlatInput *input = new FlatInput(format, pixel_format, GL_UNSIGNED_BYTE, input_width, input_height);
 	input->set_pixel_data(data);
 	chain.add_input(input);
 	return input;
@@ -244,3 +270,5 @@ void test_accuracy(const float *expected, const float *result, unsigned num_valu
 	double rms = sqrt(squared_difference) / num_values;
 	EXPECT_LT(rms, rms_limit);
 }
+
+}  // namespace movit