Implement fades.

[nageru] / ycbcr_converter.h

diff --git a/ycbcr_converter.h b/ycbcr_converter.h
index 928ebed5950f8f8ecfff9ed70b24fcdf6daaabce..a7a6179269fbb60d82a4d24ec9129ec5fec93d21 100644 (file)
--- a/ycbcr_converter.h
+++ b/ycbcr_converter.h
@@ -3,6 +3,7 @@
 
 #include <memory>
 
+#include <epoxy/gl.h>
 #include <movit/ycbcr_input.h>
 
 namespace movit {
@@ -20,12 +21,17 @@ struct YCbCrConverter {
 public:
        enum OutputMode {
                OUTPUT_TO_RGBA,         // One texture (bottom-left origin): RGBA
+               OUTPUT_TO_SEMIPLANAR,   // Two textures (top-left origin):   Y, CbCr
                OUTPUT_TO_DUAL_YCBCR    // Two textures (top-left origin):   Y'CbCr, Y'CbCr
        };
        YCbCrConverter(OutputMode output_mode, movit::ResourcePool *resource_pool);
 
        // Returns the appropriate chain for rendering.
        movit::EffectChain *prepare_chain_for_conversion(std::shared_ptr<Frame> frame);
+       movit::EffectChain *prepare_chain_for_fade(std::shared_ptr<Frame> frame, std::shared_ptr<Frame> secondary_frame, float fade_alpha);
+
+       // <tex> must be interleaved Y'CbCr.
+       movit::EffectChain *prepare_chain_for_fade_from_texture(GLuint tex, std::shared_ptr<Frame> secondary_frame, float fade_alpha);
 
 private:
        movit::YCbCrFormat ycbcr_format;
@@ -34,6 +40,19 @@ private:
        // TODO: Have a separate version with ResampleEffect, for scaling?
        std::unique_ptr<movit::EffectChain> planar_chain, semiplanar_chain;
        movit::YCbCrInput *ycbcr_planar_input, *ycbcr_semiplanar_input;
+
+       // These do fades, parametrized on whether the two inputs are planar
+       // or semiplanar.
+       struct FadeChain {
+               std::unique_ptr<movit::EffectChain> chain;
+               movit::YCbCrInput *input[2];
+               movit::MixEffect *mix_effect;
+       };
+       FadeChain fade_chains[2][2];
+
+       // These do fades, where the first input is interleaved and the second is
+       // either planar or semiplanar.
+       FadeChain interleaved_fade_chains[2];
 };
 
 // TODO: make private