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 d5657fe0309b2711b8a70ca76ac3227a60d927a1..f7897c77f9bf6b16ae3e5927af9b4c212ae21cc4 100644 (file)
--- a/theme.h
+++ b/theme.h
@@ -2,6 +2,7 @@
 #define _THEME_H 1
 
 #include <lua.hpp>
+#include <movit/flat_input.h>
 #include <movit/ycbcr_input.h>
 #include <stdbool.h>
 #include <functional>
@@ -10,29 +11,21 @@
 #include <string>
 #include <vector>
 
+#include "bmusb/bmusb.h"
 #include "ref_counted_frame.h"
+#include "tweaked_inputs.h"
 
+class CEFCapture;
+class FFmpegCapture;
+class LiveInputWrapper;
 struct InputState;
 
 namespace movit {
-class ResourcePool;
 class Effect;
 class EffectChain;
-struct ImageFormat;
-struct YCbCrFormat;
+class ResourcePool;
 }  // namespace movit
 
-class NonBouncingYCbCrInput : public movit::YCbCrInput {
-public:
-       NonBouncingYCbCrInput(const movit::ImageFormat &image_format,
-                             const movit::YCbCrFormat &ycbcr_format,
-                             unsigned width, unsigned height,
-                             movit::YCbCrInputSplitting ycbcr_input_splitting = movit::YCBCR_INPUT_PLANAR)
-           : movit::YCbCrInput(image_format, ycbcr_format, width, height, ycbcr_input_splitting) {}
-
-       bool override_disable_bounce() const override { return true; }
-};
-
 class Theme {
 public:
        Theme(const std::string &filename, const std::vector<std::string> &search_dirs, movit::ResourcePool *resource_pool, unsigned num_cards);
@@ -42,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;
        };
 
@@ -64,12 +58,59 @@ public:
 
        movit::ResourcePool *get_resource_pool() const { return resource_pool; }
 
+       // Should be called as part of VideoInput.new() only.
+       void register_video_input(FFmpegCapture *capture)
+       {
+               video_inputs.push_back(capture);
+       }
+
+       std::vector<FFmpegCapture *> get_video_inputs() const
+       {
+               return video_inputs;
+       }
+
+#ifdef HAVE_CEF
+       // Should be called as part of HTMLInput.new() only.
+       void register_html_input(CEFCapture *capture)
+       {
+               html_inputs.push_back(capture);
+       }
+
+       std::vector<CEFCapture *> get_html_inputs() const
+       {
+               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;
@@ -77,6 +118,13 @@ private:
        std::mutex map_m;
        std::map<int, int> signal_to_card_mapping;  // Protected by <map_m>.
 
+       std::vector<FFmpegCapture *> video_inputs;
+       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;
 };
 
@@ -87,21 +135,28 @@ private:
 // the mixer, and communicates that state over to the actual YCbCrInput.
 class LiveInputWrapper {
 public:
-       LiveInputWrapper(Theme *theme, movit::EffectChain *chain, bool override_bounce, bool deinterlace);
+       // 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(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) {
                        return deinterlace_effect;
+               } else if (pixel_format == bmusb::PixelFormat_8BitBGRA) {
+                       return rgba_inputs[0];
                } else {
-                       return inputs[0];
+                       return ycbcr_inputs[0];
                }
        }
 
 private:
        Theme *theme;  // Not owned by us.
-       std::vector<movit::YCbCrInput *> inputs;  // Multiple ones if deinterlacing. Owned by the chain.
+       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.
        bool deinterlace;
 };