X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=test_util.h;h=90665916f4e3e2116e8027efe2c694aa10f0685b;hp=412acadd912f3423d8df35c4bbeff552636cd441;hb=545c9c70d0be03667a8d78da6be29836fa9c4f1d;hpb=3140175e3160e75d659e596e420afffb596e3c2c

diff --git a/test_util.h b/test_util.h
index 412acad..9066591 100644
--- a/test_util.h
+++ b/test_util.h
@@ -8,17 +8,18 @@ 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(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_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);
+	void finalize_chain(Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format);
 
 	EffectChain chain;
 	GLuint fbo, texnum;
@@ -27,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)