X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=test_util.cpp;h=cb972364d000b45ee57ab4024f2a141c1d6576b4;hp=b466de2dfe5d765c0036c61834edd57f67952bf9;hb=f3c466c53a5fd158029c3752d720af39a15b075e;hpb=5fea9e6cd7aba98acc8b026801d268a3111eba63

diff --git a/test_util.cpp b/test_util.cpp
index b466de2..cb97236 100644
--- a/test_util.cpp
+++ b/test_util.cpp
@@ -1,15 +1,35 @@
-#include "init.h"
-#include "test_util.h"
+#include <assert.h>
+#include <math.h>
+#include <stdio.h>
+#include <algorithm>
+
 #include "flat_input.h"
+#include "glew.h"
 #include "gtest/gtest.h"
+#include "gtest/gtest-message.h"
+#include "init.h"
+#include "resource_pool.h"
+#include "test_util.h"
+#include "util.h"
 
-#include <stdio.h>
-#include <math.h>
+using namespace std;
 
-#include <algorithm>
+namespace movit {
+
+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)
@@ -17,7 +37,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]);
 		}
 	}
 }
@@ -27,9 +47,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);
+	CHECK(init_movit(".", MOVIT_DEBUG_OFF));
 
 	if (data != NULL) {
 		add_input(data, pixel_format, color_space, gamma_curve);
@@ -65,25 +85,39 @@ EffectChainTester::~EffectChainTester()
 	check_error();
 }
 
-Input *EffectChainTester::add_input(const float *data, MovitPixelFormat pixel_format, Colorspace color_space, GammaCurve gamma_curve)
+Input *EffectChainTester::add_input(const float *data, MovitPixelFormat pixel_format, Colorspace color_space, GammaCurve gamma_curve, int input_width, int input_height)
 {
 	ImageFormat format;
 	format.color_space = color_space;
 	format.gamma_curve = gamma_curve;
 
-	FlatInput *input = new FlatInput(format, pixel_format, GL_FLOAT, width, height);
+	if (input_width == -1) {
+		input_width = width;
+	}
+	if (input_height == -1) {
+		input_height = height;
+	}
+
+	FlatInput *input = new FlatInput(format, pixel_format, GL_FLOAT, input_width, input_height);
 	input->set_pixel_data(data);
 	chain.add_input(input);
 	return input;
 }
 
-Input *EffectChainTester::add_input(const unsigned char *data, MovitPixelFormat pixel_format, Colorspace color_space, GammaCurve gamma_curve)
+Input *EffectChainTester::add_input(const unsigned char *data, MovitPixelFormat pixel_format, Colorspace color_space, GammaCurve gamma_curve, int input_width, int input_height)
 {
 	ImageFormat format;
 	format.color_space = color_space;
 	format.gamma_curve = gamma_curve;
 
-	FlatInput *input = new FlatInput(format, pixel_format, GL_UNSIGNED_BYTE, width, height);
+	if (input_width == -1) {
+		input_width = width;
+	}
+	if (input_height == -1) {
+		input_height = height;
+	}
+
+	FlatInput *input = new FlatInput(format, pixel_format, GL_UNSIGNED_BYTE, input_width, input_height);
 	input->set_pixel_data(data);
 	chain.add_input(input);
 	return input;
@@ -185,6 +219,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];
 
@@ -200,3 +237,28 @@ 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);
+}
+
+}  // namespace movit