X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=test_util.cpp;h=4fba7bb02fe2a58e94dea62f10cb62474eb9b4cd;hp=1f7dc1fe8629a2191df3f35123cffb1892875be9;hb=1ca4785183b5af9a2a255bba0a28dfdae156470a;hpb=a5c3a852b9a325f1283a2b286a507e499e394892

diff --git a/test_util.cpp b/test_util.cpp
index 1f7dc1f..4fba7bb 100644
--- a/test_util.cpp
+++ b/test_util.cpp
@@ -7,7 +7,7 @@
 
 #include <algorithm>
 
-EffectChainTester::EffectChainTester(const float *data, unsigned width, unsigned height, MovitPixelFormat pixel_format, ColorSpace color_space, GammaCurve gamma_curve)
+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)
 {
 	add_input(data, pixel_format, color_space, gamma_curve);
@@ -34,7 +34,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,7 +54,7 @@ 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)
+void EffectChainTester::run(float *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve)
 {
 	ImageFormat image_format;
 	image_format.color_space = color_space;
@@ -59,6 +67,10 @@ void EffectChainTester::run(float *out_data, GLenum format, ColorSpace color_spa
 	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;