X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=test_util.h;h=f413a39ca65251681b53c169d9e874da48988d2a;hp=992ca46bab9e68a736282ea715b8fb9a0cc2a29b;hb=5e34f7a8969f4afc169f034d34fb908019b3a389;hpb=245513f7873fca03be3f031beddaca716d7536d9

diff --git a/test_util.h b/test_util.h
index 992ca46..f413a39 100644
--- a/test_util.h
+++ b/test_util.h
@@ -1,10 +1,12 @@
 #ifndef _MOVIT_TEST_UTIL_H
 #define _MOVIT_TEST_UTIL_H 1
 
-#include <GL/glew.h>
+#include <epoxy/gl.h>
 #include "effect_chain.h"
 #include "image_format.h"
 
+namespace movit {
+
 class Input;
 
 class EffectChainTester {
@@ -17,10 +19,12 @@ public:
 	~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);
+	Input *add_input(const float *data, MovitPixelFormat pixel_format, Colorspace color_space, GammaCurve gamma_curve, int input_width = -1, int input_height = -1);
+	Input *add_input(const unsigned char *data, MovitPixelFormat pixel_format, Colorspace color_space, GammaCurve gamma_curve, int input_width = -1, int input_height = -1);
 	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);
+	void add_output(const ImageFormat &format, OutputAlphaFormat alpha_format);
+	void add_ycbcr_output(const ImageFormat &format, OutputAlphaFormat alpha_format, const YCbCrFormat &ycbcr_format);
 
 private:
 	void finalize_chain(Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format);
@@ -28,6 +32,7 @@ private:
 	EffectChain chain;
 	GLuint fbo, texnum;
 	unsigned width, height;
+	bool output_added;
 	bool finalized;
 };
 
@@ -35,4 +40,6 @@ 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 = 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);
 
+}  // namespace movit
+
 #endif  // !defined(_MOVIT_TEST_UTIL_H)