X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=test_util.cpp;h=ec9cbf947a5bcbd7b518677f44f279c7972df301;hp=ea3a0110ce6e509da802e0d3d9a0eb9deaa1aaf2;hb=ee7863d9cdd683dd4df9d6463d98dc59182c54fe;hpb=7f1c8bb8b3ce08b94054f0a8990e5b8225d36036 diff --git a/test_util.cpp b/test_util.cpp index ea3a011..ec9cbf9 100644 --- a/test_util.cpp +++ b/test_util.cpp @@ -85,25 +85,39 @@ EffectChainTester::~EffectChainTester() check_error(); } -Input *EffectChainTester::add_input(const float *data, MovitPixelFormat pixel_format, Colorspace color_space, GammaCurve gamma_curve) +Input *EffectChainTester::add_input(const float *data, MovitPixelFormat pixel_format, Colorspace color_space, GammaCurve gamma_curve, int input_width, int input_height) { ImageFormat format; format.color_space = color_space; format.gamma_curve = gamma_curve; - FlatInput *input = new FlatInput(format, pixel_format, GL_FLOAT, width, height); + if (input_width == -1) { + input_width = width; + } + if (input_height == -1) { + input_height = height; + } + + FlatInput *input = new FlatInput(format, pixel_format, GL_FLOAT, input_width, input_height); input->set_pixel_data(data); chain.add_input(input); return input; } -Input *EffectChainTester::add_input(const unsigned char *data, MovitPixelFormat pixel_format, Colorspace color_space, GammaCurve gamma_curve) +Input *EffectChainTester::add_input(const unsigned char *data, MovitPixelFormat pixel_format, Colorspace color_space, GammaCurve gamma_curve, int input_width, int input_height) { ImageFormat format; format.color_space = color_space; format.gamma_curve = gamma_curve; - FlatInput *input = new FlatInput(format, pixel_format, GL_UNSIGNED_BYTE, width, height); + if (input_width == -1) { + input_width = width; + } + if (input_height == -1) { + input_height = height; + } + + FlatInput *input = new FlatInput(format, pixel_format, GL_UNSIGNED_BYTE, input_width, input_height); input->set_pixel_data(data); chain.add_input(input); return input;