X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=test_util.cpp;h=2073bc2d6d3e31550dc6657c77d8664253203739;hp=c7c2ac01d13343a660c0231d0429e60b15de9186;hb=80fc4a6e806e5638ae050c3020962137ca5fd76b;hpb=cfc161e0289c2169d4835c48751ff56b97355eb2 diff --git a/test_util.cpp b/test_util.cpp index c7c2ac0..2073bc2 100644 --- a/test_util.cpp +++ b/test_util.cpp @@ -2,11 +2,11 @@ #include #include #include +#include +#include +#include #include "flat_input.h" -#include "glew.h" -#include "gtest/gtest.h" -#include "gtest/gtest-message.h" #include "init.h" #include "resource_pool.h" #include "test_util.h" @@ -47,7 +47,7 @@ void vertical_flip(T *data, unsigned width, unsigned height) EffectChainTester::EffectChainTester(const float *data, unsigned width, unsigned height, MovitPixelFormat pixel_format, Colorspace color_space, GammaCurve gamma_curve, GLenum framebuffer_format) - : chain(width, height, get_static_pool()), width(width), height(height), finalized(false) + : chain(width, height, get_static_pool()), width(width), height(height), output_added(false), finalized(false) { CHECK(init_movit(".", MOVIT_DEBUG_OFF)); @@ -55,11 +55,21 @@ EffectChainTester::EffectChainTester(const float *data, unsigned width, unsigned add_input(data, pixel_format, color_space, gamma_curve); } + GLuint type; + if (framebuffer_format == GL_RGBA8) { + type = GL_UNSIGNED_BYTE; + } else if (framebuffer_format == GL_RGBA16F || framebuffer_format == GL_RGBA32F) { + type = GL_FLOAT; + } else { + // Add more here as needed. + assert(false); + } + glGenTextures(1, &texnum); check_error(); glBindTexture(GL_TEXTURE_2D, texnum); check_error(); - glTexImage2D(GL_TEXTURE_2D, 0, framebuffer_format, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL); + glTexImage2D(GL_TEXTURE_2D, 0, framebuffer_format, width, height, 0, GL_RGBA, type, NULL); check_error(); glGenFramebuffers(1, &fbo); @@ -85,25 +95,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; @@ -118,7 +142,30 @@ void EffectChainTester::run(float *out_data, GLenum format, Colorspace color_spa chain.render_to_fbo(fbo, width, height); glBindFramebuffer(GL_FRAMEBUFFER, fbo); - glReadPixels(0, 0, width, height, format, GL_FLOAT, out_data); + check_error(); + if (!epoxy_is_desktop_gl() && (format == GL_RED || format == GL_BLUE || format == GL_ALPHA)) { + // GLES will only read GL_RGBA. + float *temp = new float[width * height * 4]; + glReadPixels(0, 0, width, height, GL_RGBA, GL_FLOAT, temp); + check_error(); + if (format == GL_ALPHA) { + for (unsigned i = 0; i < width * height; ++i) { + out_data[i] = temp[i * 4 + 3]; + } + } else if (format == GL_BLUE) { + for (unsigned i = 0; i < width * height; ++i) { + out_data[i] = temp[i * 4 + 2]; + } + } else { + for (unsigned i = 0; i < width * height; ++i) { + out_data[i] = temp[i * 4]; + } + } + delete[] temp; + } else { + glReadPixels(0, 0, width, height, format, GL_FLOAT, out_data); + check_error(); + } if (format == GL_RGBA) { width *= 4; @@ -136,7 +183,30 @@ void EffectChainTester::run(unsigned char *out_data, GLenum format, Colorspace c chain.render_to_fbo(fbo, width, height); glBindFramebuffer(GL_FRAMEBUFFER, fbo); - glReadPixels(0, 0, width, height, format, GL_UNSIGNED_BYTE, out_data); + check_error(); + if (!epoxy_is_desktop_gl() && (format == GL_RED || format == GL_BLUE || format == GL_ALPHA)) { + // GLES will only read GL_RGBA. + unsigned char *temp = new unsigned char[width * height * 4]; + glReadPixels(0, 0, width, height, GL_RGBA, GL_UNSIGNED_BYTE, temp); + check_error(); + if (format == GL_ALPHA) { + for (unsigned i = 0; i < width * height; ++i) { + out_data[i] = temp[i * 4 + 3]; + } + } else if (format == GL_BLUE) { + for (unsigned i = 0; i < width * height; ++i) { + out_data[i] = temp[i * 4 + 2]; + } + } else { + for (unsigned i = 0; i < width * height; ++i) { + out_data[i] = temp[i * 4]; + } + } + delete[] temp; + } else { + glReadPixels(0, 0, width, height, format, GL_UNSIGNED_BYTE, out_data); + check_error(); + } if (format == GL_RGBA) { width *= 4; @@ -145,13 +215,28 @@ void EffectChainTester::run(unsigned char *out_data, GLenum format, Colorspace c vertical_flip(out_data, width, height); } +void EffectChainTester::add_output(const ImageFormat &format, OutputAlphaFormat alpha_format) +{ + chain.add_output(format, alpha_format); + output_added = true; +} + +void EffectChainTester::add_ycbcr_output(const ImageFormat &format, OutputAlphaFormat alpha_format, const YCbCrFormat &ycbcr_format) +{ + chain.add_ycbcr_output(format, alpha_format, ycbcr_format); + output_added = true; +} + void EffectChainTester::finalize_chain(Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format) { assert(!finalized); - ImageFormat image_format; - image_format.color_space = color_space; - image_format.gamma_curve = gamma_curve; - chain.add_output(image_format, alpha_format); + if (!output_added) { + ImageFormat image_format; + image_format.color_space = color_space; + image_format.gamma_curve = gamma_curve; + chain.add_output(image_format, alpha_format); + output_added = true; + } chain.finalize(); finalized = true; }