X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=test_util.h;h=90665916f4e3e2116e8027efe2c694aa10f0685b;hp=cc7318ba3380f9ff6a634d100d7eea9b503757d0;hb=2ee9c77ad76449314d28d62f60e10d80039c2353;hpb=b16d7433b249c5381fa137d3ac3ef7867ae2eae4

diff --git a/test_util.h b/test_util.h
index cc7318b..9066591 100644
--- a/test_util.h
+++ b/test_util.h
@@ -8,15 +8,19 @@ public:
 	EffectChainTester(const float *data, unsigned width, unsigned height,
 	                  MovitPixelFormat pixel_format = FORMAT_GRAYSCALE,
 	                  Colorspace color_space = COLORSPACE_sRGB,
-	                  GammaCurve gamma_curve = GAMMA_LINEAR);
+	                  GammaCurve gamma_curve = GAMMA_LINEAR,
+	                  GLenum framebuffer_format = GL_RGBA16F_ARB);
 	~EffectChainTester();
 	
 	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(float *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format = OUTPUT_ALPHA_POSTMULTIPLIED);
+	void run(unsigned char *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format = OUTPUT_ALPHA_POSTMULTIPLIED);
 
 private:
+	void finalize_chain(Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format);
+
 	EffectChain chain;
 	GLuint fbo, texnum;
 	unsigned width, height;
@@ -24,5 +28,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);
 
 #endif  // !defined(_TEST_UTIL_H)