Fix an issue where the mixer lagging too much behind CEF would cause us to display...

[nageru] / theme.h

diff --git a/theme.h b/theme.h
index 51107d6a5e088e3f6806c3785b6d1d8e1fdad85a..f7897c77f9bf6b16ae3e5927af9b4c212ae21cc4 100644 (file)
--- a/theme.h
+++ b/theme.h
@@ -15,6 +15,7 @@
 #include "ref_counted_frame.h"
 #include "tweaked_inputs.h"
 
+class CEFCapture;
 class FFmpegCapture;
 class LiveInputWrapper;
 struct InputState;
@@ -34,7 +35,8 @@ public:
                movit::EffectChain *chain;
                std::function<void()> setup_chain;
 
-               // May have duplicates.
+               // FRAME_HISTORY frames for each input, in order. Will contain duplicates
+               // for non-interlaced inputs.
                std::vector<RefCountedFrame> input_frames;
        };
 
@@ -67,22 +69,48 @@ public:
                return video_inputs;
        }
 
-       void register_signal_connection(LiveInputWrapper *live_input, FFmpegCapture *capture)
+#ifdef HAVE_CEF
+       // Should be called as part of HTMLInput.new() only.
+       void register_html_input(CEFCapture *capture)
        {
-               signal_connections.emplace_back(live_input, capture);
+               html_inputs.push_back(capture);
        }
 
-       std::vector<std::pair<LiveInputWrapper *, FFmpegCapture *>> get_signal_connections() const
+       std::vector<CEFCapture *> get_html_inputs() const
        {
-               return signal_connections;
+               return html_inputs;
        }
+#endif
+
+       void register_video_signal_connection(LiveInputWrapper *live_input, FFmpegCapture *capture)
+       {
+               video_signal_connections.emplace_back(live_input, capture);
+       }
+
+       std::vector<std::pair<LiveInputWrapper *, FFmpegCapture *>> get_video_signal_connections() const
+       {
+               return video_signal_connections;
+       }
+
+#ifdef HAVE_CEF
+       void register_html_signal_connection(LiveInputWrapper *live_input, CEFCapture *capture)
+       {
+               html_signal_connections.emplace_back(live_input, capture);
+       }
+
+       std::vector<std::pair<LiveInputWrapper *, CEFCapture *>> get_html_signal_connections() const
+       {
+               return html_signal_connections;
+       }
+#endif
 
 private:
+       void register_constants();
        void register_class(const char *class_name, const luaL_Reg *funcs);
 
        std::mutex m;
        lua_State *L;  // Protected by <m>.
-       const InputState *input_state;  // Protected by <m>. Only set temporarily, during chain setup.
+       const InputState *input_state = nullptr;  // Protected by <m>. Only set temporarily, during chain setup.
        movit::ResourcePool *resource_pool;
        int num_channels;
        unsigned num_cards;
@@ -91,7 +119,11 @@ private:
        std::map<int, int> signal_to_card_mapping;  // Protected by <map_m>.
 
        std::vector<FFmpegCapture *> video_inputs;
-       std::vector<std::pair<LiveInputWrapper *, FFmpegCapture *>> signal_connections;
+       std::vector<std::pair<LiveInputWrapper *, FFmpegCapture *>> video_signal_connections;
+#ifdef HAVE_CEF
+       std::vector<CEFCapture *> html_inputs;
+       std::vector<std::pair<LiveInputWrapper *, CEFCapture *>> html_signal_connections;
+#endif
 
        friend class LiveInputWrapper;
 };
@@ -106,8 +138,8 @@ public:
        // Note: <override_bounce> is irrelevant for PixelFormat_8BitBGRA.
        LiveInputWrapper(Theme *theme, movit::EffectChain *chain, bmusb::PixelFormat pixel_format, bool override_bounce, bool deinterlace);
 
-       void connect_signal(int signal_num);
-       void connect_signal_raw(int signal_num);
+       void connect_signal(int signal_num);  // Must be called with the theme's <m> lock held, since it accesses theme->input_state.
+       void connect_signal_raw(int signal_num, const InputState &input_state);
        movit::Effect *get_effect() const
        {
                if (deinterlace) {
@@ -122,6 +154,7 @@ public:
 private:
        Theme *theme;  // Not owned by us.
        bmusb::PixelFormat pixel_format;
+       movit::YCbCrFormat input_ycbcr_format;
        std::vector<movit::YCbCrInput *> ycbcr_inputs;  // Multiple ones if deinterlacing. Owned by the chain.
        std::vector<movit::FlatInput *> rgba_inputs;  // Multiple ones if deinterlacing. Owned by the chain.
        movit::Effect *deinterlace_effect = nullptr;  // Owned by the chain.