Small refactoring in EffectChainTester.

[movit] / test_util.cpp

diff --git a/test_util.cpp b/test_util.cpp
index 8f812117858c12475b364e08f9eed797a96e73fc..f822fcc442e32f60820f92046fd9c9c24c3a8055 100644 (file)
--- a/test_util.cpp
+++ b/test_util.cpp
@@ -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));
 
@@ -135,42 +135,16 @@ 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)
 {
-       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)) {
-               // 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_BLUE) {
-                       for (int i = 0; i < width * height; ++i) {
-                               out_data[i] = temp[i * 4 + 2];
-                       }
-               } else {
-                       for (int 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;
-       }
-
-       vertical_flip(out_data, width, height);
+       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);
@@ -180,23 +154,27 @@ void EffectChainTester::run(unsigned char *out_data, GLenum format, Colorspace c
 
        glBindFramebuffer(GL_FRAMEBUFFER, fbo);
        check_error();
-       if (!epoxy_is_desktop_gl() && (format == GL_RED || format == GL_BLUE)) {
+       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_BLUE) {
-                       for (int i = 0; i < width * height; ++i) {
+               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 (int i = 0; i < width * height; ++i) {
+                       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);
+               glReadPixels(0, 0, width, height, format, internal_format, out_data);
                check_error();
        }
 
@@ -207,13 +185,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;
 }