X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=test_util.cpp;h=cb9263b2fc0f8c680fb3926b061f64e276dcea2a;hp=bcfc97a644146837ba50b1e7cb8de05756a8c0dd;hb=c9a573370a976df3675d4bd3195a49c854ab7db9;hpb=2fdbe6e32ef5de09db9c890b6cd4355bf65dd1e5

diff --git a/test_util.cpp b/test_util.cpp
index bcfc97a..cb9263b 100644
--- a/test_util.cpp
+++ b/test_util.cpp
@@ -34,6 +34,14 @@ EffectChainTester::EffectChainTester(const float *data, unsigned width, unsigned
 	check_error();
 }
 
+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;
@@ -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;
@@ -68,23 +80,28 @@ void EffectChainTester::run(float *out_data, GLenum format, ColorSpace color_spa
 	}
 }
 
-void expect_equal(const float *ref, const float *result, unsigned width, unsigned height)
+void expect_equal(const float *ref, const float *result, unsigned width, unsigned height, float largest_difference_limit, float rms_limit)
 {
 	float largest_difference = -1.0f;
 	float squared_difference = 0.0f;
+	int largest_diff_x = -1, largest_diff_y = -1;
 
 	for (unsigned y = 0; y < height; ++y) {
 		for (unsigned x = 0; x < width; ++x) {
 			float diff = ref[y * width + x] - result[y * width + x];
-			largest_difference = std::max(largest_difference, fabsf(diff));
+			if (fabs(diff) > largest_difference) {
+				largest_difference = fabs(diff);
+				largest_diff_x = x;
+				largest_diff_y = y;
+			}
 			squared_difference += diff * diff;
 		}
 	}
 
-	const float largest_difference_limit = 1.5 / 255.0;
-	const float rms_limit = 0.2 / 255.0;
-
-	EXPECT_LT(largest_difference, largest_difference_limit);
+	EXPECT_LT(largest_difference, largest_difference_limit)
+		<< "Largest difference is in x=" << largest_diff_x << ", y=" << largest_diff_y << ":\n"
+		<< "Reference: " << ref[largest_diff_y * width + largest_diff_x] << "\n"
+		<< "Result:    " << result[largest_diff_y * width + largest_diff_x];
 
 	float rms = sqrt(squared_difference) / (width * height);
 	EXPECT_LT(rms, rms_limit);