X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=test_util.h;h=f413a39ca65251681b53c169d9e874da48988d2a;hp=8fb17bfecf77cb6cef3604808730d90e3fa57e9a;hb=1ec439c7fb975c09029adaa9090e7f35ce6484b8;hpb=cfc161e0289c2169d4835c48751ff56b97355eb2

diff --git a/test_util.h b/test_util.h
index 8fb17bf..f413a39 100644
--- a/test_util.h
+++ b/test_util.h
@@ -1,7 +1,7 @@
 #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"
 
@@ -19,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);
@@ -30,6 +32,7 @@ private:
 	EffectChain chain;
 	GLuint fbo, texnum;
 	unsigned width, height;
+	bool output_added;
 	bool finalized;
 };