X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=test_util.cpp;h=be34583805df68a2da1cedc5e8212eb380bf8cdf;hp=05b61aff9bdc0ecdd793e9af01f7b92d70c3e3b0;hb=85f9719bf3519b1f1942738d11601584f5d38725;hpb=37f56fcbe571b2322243f6de59494bf9e0cbb37a

diff --git a/test_util.cpp b/test_util.cpp
index 05b61af..be34583 100644
--- a/test_util.cpp
+++ b/test_util.cpp
@@ -3,18 +3,30 @@
 #include <math.h>
 #include <stdio.h>
 #include <algorithm>
-#include <ostream>
 
 #include "flat_input.h"
 #include "gtest/gtest.h"
 #include "init.h"
+#include "resource_pool.h"
 #include "test_util.h"
 #include "util.h"
 
+using namespace std;
+
 class Input;
 
 namespace {
 
+// Not thread-safe, but this isn't a big problem for testing.
+ResourcePool *get_static_pool()
+{
+	static ResourcePool *resource_pool = NULL;
+	if (!resource_pool) {
+		resource_pool = new ResourcePool();
+	}
+	return resource_pool;
+}
+
 // Flip upside-down to compensate for different origin.
 template<class T>
 void vertical_flip(T *data, unsigned width, unsigned height)
@@ -22,7 +34,7 @@ void vertical_flip(T *data, unsigned width, unsigned height)
 	for (unsigned y = 0; y < height / 2; ++y) {
 		unsigned flip_y = height - y - 1;
 		for (unsigned x = 0; x < width; ++x) {
-			std::swap(data[y * width + x], data[flip_y * width + x]);
+			swap(data[y * width + x], data[flip_y * width + x]);
 		}
 	}
 }
@@ -32,9 +44,9 @@ void vertical_flip(T *data, unsigned width, unsigned height)
 EffectChainTester::EffectChainTester(const float *data, unsigned width, unsigned height,
                                      MovitPixelFormat pixel_format, Colorspace color_space, GammaCurve gamma_curve,
                                      GLenum framebuffer_format)
-	: chain(width, height), width(width), height(height), finalized(false)
+	: chain(width, height, get_static_pool()), width(width), height(height), finalized(false)
 {
-	init_movit(".", MOVIT_DEBUG_ON);
+	init_movit(".", MOVIT_DEBUG_OFF);
 
 	if (data != NULL) {
 		add_input(data, pixel_format, color_space, gamma_curve);
@@ -208,3 +220,26 @@ void expect_equal(const unsigned char *ref, const unsigned char *result, unsigne
 	delete[] ref_float;
 	delete[] result_float;
 }
+
+void test_accuracy(const float *expected, const float *result, unsigned num_values, double absolute_error_limit, double relative_error_limit, double local_relative_error_limit, double rms_limit)
+{
+	double squared_difference = 0.0;
+	for (unsigned i = 0; i < num_values; ++i) {
+		double absolute_error = fabs(expected[i] - result[i]);
+		squared_difference += absolute_error * absolute_error;
+		EXPECT_LT(absolute_error, absolute_error_limit);
+
+		if (expected[i] > 0.0) {
+			double relative_error = fabs(absolute_error / expected[i]);
+
+			EXPECT_LT(relative_error, relative_error_limit);
+		}
+		if (i < num_values - 1) {
+			double delta = expected[i + 1] - expected[i];
+			double local_relative_error = fabs(absolute_error / delta);
+			EXPECT_LT(local_relative_error, local_relative_error_limit);
+		}
+	}
+	double rms = sqrt(squared_difference) / num_values;
+	EXPECT_LT(rms, rms_limit);
+}