Allow YCbCrInput to change input format after finalize.

[movit] / effect_chain.cpp

diff --git a/effect_chain.cpp b/effect_chain.cpp
index 10573ef8aba7ac58cf4c037db15552321e494cad..efd4abc49a611c233164089858d586a0538d075b 100644 (file)
--- a/effect_chain.cpp
+++ b/effect_chain.cpp
@@ -36,7 +36,7 @@ EffectChain::EffectChain(float aspect_nom, float aspect_denom, ResourcePool *res
        : aspect_nom(aspect_nom),
          aspect_denom(aspect_denom),
          output_color_rgba(false),
-         output_color_ycbcr(false),
+         num_output_color_ycbcr(0),
          dither_effect(NULL),
          ycbcr_conversion_effect_node(NULL),
          intermediate_format(GL_RGBA16F),
@@ -97,15 +97,27 @@ void EffectChain::add_output(const ImageFormat &format, OutputAlphaFormat alpha_
 }
 
 void EffectChain::add_ycbcr_output(const ImageFormat &format, OutputAlphaFormat alpha_format,
-                                   const YCbCrFormat &ycbcr_format, YCbCrOutputSplitting output_splitting)
+                                   const YCbCrFormat &ycbcr_format, YCbCrOutputSplitting output_splitting,
+                                   GLenum output_type)
 {
        assert(!finalized);
-       assert(!output_color_ycbcr);
+       assert(num_output_color_ycbcr < 2);
        output_format = format;
        output_alpha_format = alpha_format;
-       output_color_ycbcr = true;
-       output_ycbcr_format = ycbcr_format;
-       output_ycbcr_splitting = output_splitting;
+
+       if (num_output_color_ycbcr == 1) {
+               // Check that the format is the same.
+               assert(output_ycbcr_format.luma_coefficients == ycbcr_format.luma_coefficients);
+               assert(output_ycbcr_format.full_range == ycbcr_format.full_range);
+               assert(output_ycbcr_format.num_levels == ycbcr_format.num_levels);
+               assert(output_ycbcr_format.chroma_subsampling_x == 1);
+               assert(output_ycbcr_format.chroma_subsampling_y == 1);
+               assert(output_ycbcr_type == output_type);
+       } else {
+               output_ycbcr_format = ycbcr_format;
+               output_ycbcr_type = output_type;
+       }
+       output_ycbcr_splitting[num_output_color_ycbcr++] = output_splitting;
 
        assert(ycbcr_format.chroma_subsampling_x == 1);
        assert(ycbcr_format.chroma_subsampling_y == 1);
@@ -113,13 +125,9 @@ void EffectChain::add_ycbcr_output(const ImageFormat &format, OutputAlphaFormat
 
 void EffectChain::change_ycbcr_output_format(const YCbCrFormat &ycbcr_format)
 {
-       assert(output_color_ycbcr);
-       assert(output_ycbcr_format.chroma_subsampling_x == ycbcr_format.chroma_subsampling_x);
-       assert(output_ycbcr_format.chroma_subsampling_y == ycbcr_format.chroma_subsampling_y);
-       assert(fabs(output_ycbcr_format.cb_x_position - ycbcr_format.cb_x_position) < 1e-3);
-       assert(fabs(output_ycbcr_format.cb_y_position - ycbcr_format.cb_y_position) < 1e-3);
-       assert(fabs(output_ycbcr_format.cr_x_position - ycbcr_format.cr_x_position) < 1e-3);
-       assert(fabs(output_ycbcr_format.cr_y_position - ycbcr_format.cr_y_position) < 1e-3);
+       assert(num_output_color_ycbcr > 0);
+       assert(output_ycbcr_format.chroma_subsampling_x == 1);
+       assert(output_ycbcr_format.chroma_subsampling_y == 1);
 
        output_ycbcr_format = ycbcr_format;
        if (finalized) {
@@ -412,8 +420,8 @@ void EffectChain::compile_glsl_program(Phase *phase)
 
        // If we're the last phase, add the right #defines for Y'CbCr multi-output as needed.
        vector<string> frag_shader_outputs;  // In order.
-       if (phase->output_node->outgoing_links.empty() && output_color_ycbcr) {
-               switch (output_ycbcr_splitting) {
+       if (phase->output_node->outgoing_links.empty() && num_output_color_ycbcr > 0) {
+               switch (output_ycbcr_splitting[0]) {
                case YCBCR_OUTPUT_INTERLEAVED:
                        // No #defines set.
                        frag_shader_outputs.push_back("FragColor");
@@ -433,6 +441,28 @@ void EffectChain::compile_glsl_program(Phase *phase)
                        assert(false);
                }
 
+               if (num_output_color_ycbcr > 1) {
+                       switch (output_ycbcr_splitting[1]) {
+                       case YCBCR_OUTPUT_INTERLEAVED:
+                               frag_shader += "#define SECOND_YCBCR_OUTPUT_INTERLEAVED 1\n";
+                               frag_shader_outputs.push_back("YCbCr2");
+                               break;
+                       case YCBCR_OUTPUT_SPLIT_Y_AND_CBCR:
+                               frag_shader += "#define SECOND_YCBCR_OUTPUT_SPLIT_Y_AND_CBCR 1\n";
+                               frag_shader_outputs.push_back("Y2");
+                               frag_shader_outputs.push_back("Chroma2");
+                               break;
+                       case YCBCR_OUTPUT_PLANAR:
+                               frag_shader += "#define SECOND_YCBCR_OUTPUT_PLANAR 1\n";
+                               frag_shader_outputs.push_back("Y2");
+                               frag_shader_outputs.push_back("Cb2");
+                               frag_shader_outputs.push_back("Cr2");
+                               break;
+                       default:
+                               assert(false);
+                       }
+               }
+
                if (output_color_rgba) {
                        // Note: Needs to come in the header, because not only the
                        // output needs to see it (YCbCrConversionEffect and DitherEffect
@@ -1612,12 +1642,12 @@ void EffectChain::fix_output_gamma()
 // gamma-encoded data.
 void EffectChain::add_ycbcr_conversion_if_needed()
 {
-       assert(output_color_rgba || output_color_ycbcr);
-       if (!output_color_ycbcr) {
+       assert(output_color_rgba || num_output_color_ycbcr > 0);
+       if (num_output_color_ycbcr == 0) {
                return;
        }
        Node *output = find_output_node();
-       ycbcr_conversion_effect_node = add_node(new YCbCrConversionEffect(output_ycbcr_format));
+       ycbcr_conversion_effect_node = add_node(new YCbCrConversionEffect(output_ycbcr_format, output_ycbcr_type));
        connect_nodes(output, ycbcr_conversion_effect_node);
 }
        
@@ -1733,8 +1763,10 @@ void EffectChain::render_to_fbo(GLuint dest_fbo, unsigned width, unsigned height
        check_error();
        glDisable(GL_DITHER);
        check_error();
-       glEnable(GL_FRAMEBUFFER_SRGB);
+
+       const bool final_srgb = glIsEnabled(GL_FRAMEBUFFER_SRGB);
        check_error();
+       bool current_srgb = final_srgb;
 
        // Save original viewport.
        GLuint x = 0, y = 0;
@@ -1800,7 +1832,22 @@ void EffectChain::render_to_fbo(GLuint dest_fbo, unsigned width, unsigned height
                                CHECK(dither_effect->set_int("output_height", height));
                        }
                }
-               execute_phase(phase, phase_num == phases.size() - 1, &bound_attribute_indices, &output_textures, &generated_mipmaps);
+               bool last_phase = (phase_num == phases.size() - 1);
+
+               // Enable sRGB rendering for intermediates in case we are
+               // rendering to an sRGB format.
+               bool needs_srgb = last_phase ? final_srgb : true;
+               if (needs_srgb && !current_srgb) {
+                       glEnable(GL_FRAMEBUFFER_SRGB);
+                       check_error();
+                       current_srgb = true;
+               } else if (!needs_srgb && current_srgb) {
+                       glDisable(GL_FRAMEBUFFER_SRGB);
+                       check_error();
+                       current_srgb = true;
+               }
+
+               execute_phase(phase, last_phase, &bound_attribute_indices, &output_textures, &generated_mipmaps);
                if (do_phase_timing) {
                        glEndQuery(GL_TIME_ELAPSED);
                }