Use Movit also for the display logic; a bit more setup on the mixer side, but much...

[nageru] / mixer.h

diff --git a/mixer.h b/mixer.h
index c4697310ec95757fecbfacea767ed887ba821e03..f2f9f7aecef7570fe1ccb47ae8adff56ef2a76be 100644 (file)
--- a/mixer.h
+++ b/mixer.h
@@ -6,6 +6,7 @@
 #include <epoxy/gl.h>
 #undef Success
 #include <movit/effect_chain.h>
+#include <movit/flat_input.h>
 #include <functional>
 
 #include "bmusb.h"
@@ -44,8 +45,25 @@ public:
        };
 
        struct DisplayFrame {
-               GLuint texnum;
-               RefCountedGLsync ready_fence;  // Asserted when the texture is done rendering.
+               // The chain for rendering this frame. To render a display frame,
+               // first wait for <ready_fence>, then call <setup_chain>
+               // to wire up all the inputs, and then finally call
+               // chain->render_to_screen() or similar.
+               movit::EffectChain *chain;
+               std::function<void()> setup_chain;
+
+               // Asserted when all the inputs are ready; you cannot render the chain
+               // before this.
+               RefCountedGLsync ready_fence;
+
+               // Holds on to all the input frames needed for this display frame,
+               // so they are not released while still rendering.
+               std::vector<RefCountedFrame> input_frames;
+
+               // Textures that should be released back to the resource pool
+               // when this frame disappears, if any.
+               // TODO: Refcount these as well?
+               std::vector<GLuint> temp_textures;
        };
        // Implicitly frees the previous one if there's a new frame available.
        bool get_display_frame(Output output, DisplayFrame *frame) {
@@ -76,6 +94,7 @@ private:
        QSurface *mixer_surface, *h264_encoder_surface;
        std::unique_ptr<movit::ResourcePool> resource_pool;
        std::unique_ptr<movit::EffectChain> chain;
+       std::unique_ptr<movit::EffectChain> display_chain;
        std::unique_ptr<movit::EffectChain> preview_chain;
        GLuint cbcr_program_num;  // Owned by <resource_pool>.
        std::unique_ptr<H264Encoder> h264_encoder;
@@ -85,6 +104,9 @@ private:
        movit::Effect *resample_effect, *resample2_effect;
        movit::Effect *padding_effect, *padding2_effect;
 
+       // Effects part of <display_chain>. Owned by <display_chain>.
+       movit::FlatInput *display_input;
+
        // Effects part of <preview_chain>. Owned by <preview_chain>.
        movit::YCbCrInput *preview_input;
 
@@ -112,7 +134,7 @@ private:
 
        class OutputChannel {
        public:
-               void output_frame(GLuint tex, RefCountedGLsync fence);
+               void output_frame(DisplayFrame frame);
                bool get_display_frame(DisplayFrame *frame);
                void set_frame_ready_callback(new_frame_ready_callback_t callback);
                void set_size(int width, int height);  // Ignored for OUTPUT_LIVE.