X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=test_util.h;h=992ca46bab9e68a736282ea715b8fb9a0cc2a29b;hp=407824d5441ddc34e4770ff54cf95e09eda28a00;hb=18fdebc534adc6b7a4c36b290b01d598bcb671bc;hpb=624796b894b3fa04a08b70f4e69ab0fc322da19c

diff --git a/test_util.h b/test_util.h
index 407824d..992ca46 100644
--- a/test_util.h
+++ b/test_util.h
@@ -1,7 +1,11 @@
-#ifndef _TEST_UTIL_H
-#define _TEST_UTIL_H 1
+#ifndef _MOVIT_TEST_UTIL_H
+#define _MOVIT_TEST_UTIL_H 1
 
+#include <GL/glew.h>
 #include "effect_chain.h"
+#include "image_format.h"
+
+class Input;
 
 class EffectChainTester {
 public:
@@ -15,11 +19,11 @@ public:
 	EffectChain *get_chain() { return &chain; }
 	Input *add_input(const float *data, MovitPixelFormat pixel_format, Colorspace color_space, GammaCurve gamma_curve);
 	Input *add_input(const unsigned char *data, MovitPixelFormat pixel_format, Colorspace color_space, GammaCurve gamma_curve);
-	void run(float *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve);
-	void run(unsigned char *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve);
+	void run(float *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format = OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED);
+	void run(unsigned char *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format = OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED);
 
 private:
-	void finalize_chain(Colorspace color_space, GammaCurve gamma_curve);
+	void finalize_chain(Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format);
 
 	EffectChain chain;
 	GLuint fbo, texnum;
@@ -29,5 +33,6 @@ private:
 
 void expect_equal(const float *ref, const float *result, unsigned width, unsigned height, float largest_difference_limit = 1.5 / 255.0, float rms_limit = 0.2 / 255.0);
 void expect_equal(const unsigned char *ref, const unsigned char *result, unsigned width, unsigned height, unsigned largest_difference_limit = 1, float rms_limit = 0.2);
+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);
 
-#endif  // !defined(_TEST_UTIL_H)
+#endif  // !defined(_MOVIT_TEST_UTIL_H)