X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=test_util.cpp;h=68e0b93e3dd51e4aca8e07bb99bb5976ee719485;hp=cd79bd7c5adc973c1c29ea58449a8d5434878292;hb=caa05550e868db406e4b54e69d60b5573f59cb60;hpb=ed30033a26851b96c2c3a0ed2a5751446038fcc3

diff --git a/test_util.cpp b/test_util.cpp
index cd79bd7..68e0b93 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);
@@ -106,6 +107,24 @@ 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)
+{
+	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);
@@ -163,3 +182,18 @@ 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)
+{
+	float *ref_float = new float[width * height];
+	float *result_float = new float[width * height];
+
+	for (unsigned y = 0; y < height; ++y) {
+		for (unsigned x = 0; x < width; ++x) {
+			ref_float[y * width + x] = ref[y * width + x];
+			result_float[y * width + x] = result[y * width + x];
+		}
+	}
+
+	expect_equal(ref_float, result_float, width, height, largest_difference_limit, rms_limit);
+}