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

diff --git a/test_util.cpp b/test_util.cpp
index cc02801..b89b3ff 100644
--- a/test_util.cpp
+++ b/test_util.cpp
@@ -25,10 +25,11 @@ void vertical_flip(T *data, unsigned width, unsigned height)
 }  // namespace
 
 EffectChainTester::EffectChainTester(const float *data, unsigned width, unsigned height,
-                                     MovitPixelFormat pixel_format, Colorspace color_space, GammaCurve gamma_curve)
+                                     MovitPixelFormat pixel_format, Colorspace color_space, GammaCurve gamma_curve,
+                                     GLenum framebuffer_format)
 	: chain(width, height), width(width), height(height), finalized(false)
 {
-	init_movit();
+	init_movit(".", MOVIT_DEBUG_ON);
 
 	if (data != NULL) {
 		add_input(data, pixel_format, color_space, gamma_curve);
@@ -38,7 +39,7 @@ EffectChainTester::EffectChainTester(const float *data, unsigned width, unsigned
 	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);
@@ -88,10 +89,10 @@ Input *EffectChainTester::add_input(const unsigned char *data, MovitPixelFormat
 	return input;
 }
 
-void EffectChainTester::run(float *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve)
+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);
+		finalize_chain(color_space, gamma_curve, alpha_format);
 	}
 
 	chain.render_to_fbo(fbo, width, height);
@@ -106,10 +107,10 @@ void EffectChainTester::run(float *out_data, GLenum format, Colorspace color_spa
 	vertical_flip(out_data, width, height);
 }
 
-void EffectChainTester::run(unsigned char *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve)
+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);
+		finalize_chain(color_space, gamma_curve, alpha_format);
 	}
 
 	chain.render_to_fbo(fbo, width, height);
@@ -124,13 +125,13 @@ void EffectChainTester::run(unsigned char *out_data, GLenum format, Colorspace c
 	vertical_flip(out_data, width, height);
 }
 
-void EffectChainTester::finalize_chain(Colorspace color_space, GammaCurve gamma_curve)
+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);
+	chain.add_output(image_format, alpha_format);
 	chain.finalize();
 	finalized = true;
 }
@@ -184,6 +185,9 @@ 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];
 
@@ -195,4 +199,7 @@ void expect_equal(const unsigned char *ref, const unsigned char *result, unsigne
 	}
 
 	expect_equal(ref_float, result_float, width, height, largest_difference_limit, rms_limit);
+
+	delete[] ref_float;
+	delete[] result_float;
 }