Factorize out some stuff from EffectChainTester::run().

[movit] / test_util.h

diff --git a/test_util.h b/test_util.h
index 1de5d2582ad0058c10b4156707fe19cdbc3da090..d149fe135d8b2e381e160a983469a2a991a194cb 100644 (file)
--- a/test_util.h
+++ b/test_util.h
@@ -5,15 +5,24 @@
 
 class EffectChainTester {
 public:
-       EffectChainTester(const float *data, unsigned width, unsigned height, MovitPixelFormat pixel_format, ColorSpace color_space, GammaCurve gamma_curve);
+       EffectChainTester(const float *data, unsigned width, unsigned height,
+                         MovitPixelFormat pixel_format = FORMAT_GRAYSCALE,
+                         Colorspace color_space = COLORSPACE_sRGB,
+                         GammaCurve gamma_curve = GAMMA_LINEAR);
+       ~EffectChainTester();
+       
        EffectChain *get_chain() { return &chain; }
-       Input *add_input(const float *data, MovitPixelFormat pixel_format, ColorSpace color_space, GammaCurve gamma_curve);
-       void run(float *out_data, GLenum format, ColorSpace color_space, GammaCurve gamma_curve);
+       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);
 
 private:
+       void finalize_chain(Colorspace color_space, GammaCurve gamma_curve);
+
        EffectChain chain;
        GLuint fbo, texnum;
        unsigned width, height;
+       bool finalized;
 };
 
 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);