X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=theme.h;h=f7897c77f9bf6b16ae3e5927af9b4c212ae21cc4;hb=82e392b0e444d9b4043b78ef3413343b092e4537;hp=71e44bd42cac49b4b9691f358c8f85f545f7addf;hpb=9ba511b7edf9d6875040a0b959d97bd7867ce159;p=nageru

diff --git a/theme.h b/theme.h
index 71e44bd..f7897c7 100644
--- 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,15 +69,40 @@ 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();
@@ -83,7 +110,7 @@ private:
 
 	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;
@@ -92,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;
 };
@@ -107,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) {