X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=test_util.cpp;h=be34583805df68a2da1cedc5e8212eb380bf8cdf;hp=68e0b93e3dd51e4aca8e07bb99bb5976ee719485;hb=85f9719bf3519b1f1942738d11601584f5d38725;hpb=49ef2523611e215b327cd26f7bf698d1516edd46

diff --git a/test_util.cpp b/test_util.cpp
index 68e0b93..be34583 100644
--- a/test_util.cpp
+++ b/test_util.cpp
@@ -1,15 +1,32 @@
-#include "init.h"
-#include "test_util.h"
+#include <assert.h>
+#include <gtest/gtest-message.h>
+#include <math.h>
+#include <stdio.h>
+#include <algorithm>
+
 #include "flat_input.h"
 #include "gtest/gtest.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>
+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 +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]);
 		}
 	}
 }
@@ -27,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);
@@ -89,10 +106,10 @@ Input *EffectChainTester::add_input(const unsigned char *data, MovitPixelFormat
 	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, OutputAlphaFormat alpha_format)
 {
 	if (!finalized) {
-		finalize_chain(color_space, gamma_curve);
+		finalize_chain(color_space, gamma_curve, alpha_format);
 	}
 
 	chain.render_to_fbo(fbo, width, height);
@@ -107,10 +124,10 @@ 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)
+void EffectChainTester::run(unsigned char *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format)
 {
 	if (!finalized) {
-		finalize_chain(color_space, gamma_curve);
+		finalize_chain(color_space, gamma_curve, alpha_format);
 	}
 
 	chain.render_to_fbo(fbo, width, height);
@@ -125,13 +142,13 @@ void EffectChainTester::run(unsigned char *out_data, GLenum format, Colorspace c
 	vertical_flip(out_data, width, height);
 }
 
-void EffectChainTester::finalize_chain(Colorspace color_space, GammaCurve gamma_curve)
+void EffectChainTester::finalize_chain(Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format)
 {
 	assert(!finalized);
 	ImageFormat image_format;
 	image_format.color_space = color_space;
 	image_format.gamma_curve = gamma_curve;
-	chain.add_output(image_format);
+	chain.add_output(image_format, alpha_format);
 	chain.finalize();
 	finalized = true;
 }
@@ -185,6 +202,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];
 
@@ -196,4 +216,30 @@ void expect_equal(const unsigned char *ref, const unsigned char *result, unsigne
 	}
 
 	expect_equal(ref_float, result_float, width, height, largest_difference_limit, rms_limit);
+
+	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);
 }