]> git.sesse.net Git - movit/blobdiff - test_util.cpp
In EffectChainTester, there is no point in making the FBO and texture persistent.
[movit] / test_util.cpp
index a3ccb5c5f04cebcd3c804c294e95e93d7b886a59..199be456ca4da8839882a46c5fdf2ee0e39f167e 100644 (file)
@@ -47,52 +47,17 @@ 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), framebuffer_format(framebuffer_format), output_added(false), finalized(false)
 {
        CHECK(init_movit(".", MOVIT_DEBUG_OFF));
 
        if (data != NULL) {
                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, type, NULL);
-       check_error();
-
-       glGenFramebuffers(1, &fbo);
-       check_error();
-       glBindFramebuffer(GL_FRAMEBUFFER, fbo);
-       check_error();
-       glFramebufferTexture2D(
-               GL_FRAMEBUFFER,
-               GL_COLOR_ATTACHMENT0,
-               GL_TEXTURE_2D,
-               texnum,
-               0);
-       check_error();
-       glBindFramebuffer(GL_FRAMEBUFFER, 0);
-       check_error();
 }
 
 EffectChainTester::~EffectChainTester()
 {
-       glDeleteFramebuffers(1, &fbo);
-       check_error();
-       glDeleteTextures(1, &texnum);
-       check_error();
 }
 
 Input *EffectChainTester::add_input(const float *data, MovitPixelFormat pixel_format, Colorspace color_space, GammaCurve gamma_curve, int input_width, int input_height)
@@ -134,51 +99,54 @@ Input *EffectChainTester::add_input(const unsigned char *data, MovitPixelFormat
 }
 
 void EffectChainTester::run(float *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format)
+{
+       internal_run(out_data, GL_FLOAT, format, color_space, gamma_curve, alpha_format);
+}
+
+void EffectChainTester::run(unsigned char *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format)
+{
+       internal_run(out_data, GL_UNSIGNED_BYTE, format, color_space, gamma_curve, alpha_format);
+}
+
+template<class T>
+void EffectChainTester::internal_run(T *out_data, GLenum internal_format, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format)
 {
        if (!finalized) {
                finalize_chain(color_space, gamma_curve, alpha_format);
        }
 
-       chain.render_to_fbo(fbo, width, height);
-
-       glBindFramebuffer(GL_FRAMEBUFFER, fbo);
-       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;
+       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 {
-               glReadPixels(0, 0, width, height, format, GL_FLOAT, out_data);
-               check_error();
+               // Add more here as needed.
+               assert(false);
        }
 
-       if (format == GL_RGBA) {
-               width *= 4;
-       }
+       GLuint fbo, texnum;
 
-       vertical_flip(out_data, width, height);
-}
+       glGenTextures(1, &texnum);
+       check_error();
+       glBindTexture(GL_TEXTURE_2D, texnum);
+       check_error();
+       glTexImage2D(GL_TEXTURE_2D, 0, framebuffer_format, width, height, 0, GL_RGBA, type, NULL);
+       check_error();
 
-void EffectChainTester::run(unsigned char *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format)
-{
-       if (!finalized) {
-               finalize_chain(color_space, gamma_curve, alpha_format);
-       }
+       glGenFramebuffers(1, &fbo);
+       check_error();
+       glBindFramebuffer(GL_FRAMEBUFFER, fbo);
+       check_error();
+       glFramebufferTexture2D(
+               GL_FRAMEBUFFER,
+               GL_COLOR_ATTACHMENT0,
+               GL_TEXTURE_2D,
+               texnum,
+               0);
+       check_error();
+       glBindFramebuffer(GL_FRAMEBUFFER, 0);
+       check_error();
 
        chain.render_to_fbo(fbo, width, height);
 
@@ -186,8 +154,8 @@ void EffectChainTester::run(unsigned char *out_data, GLenum format, Colorspace c
        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);
+               T *temp = new T[width * height * 4];
+               glReadPixels(0, 0, width, height, GL_RGBA, internal_format, temp);
                check_error();
                if (format == GL_ALPHA) {
                        for (unsigned i = 0; i < width * height; ++i) {
@@ -204,10 +172,15 @@ void EffectChainTester::run(unsigned char *out_data, GLenum format, Colorspace c
                }
                delete[] temp;
        } else {
-               glReadPixels(0, 0, width, height, format, GL_UNSIGNED_BYTE, out_data);
+               glReadPixels(0, 0, width, height, format, internal_format, out_data);
                check_error();
        }
 
+       glDeleteFramebuffers(1, &fbo);
+       check_error();
+       glDeleteTextures(1, &texnum);
+       check_error();
+
        if (format == GL_RGBA) {
                width *= 4;
        }
@@ -215,13 +188,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;
 }