X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=theme.h;h=9e9672e0fa5b98d23b8edd897a587a84cc9360ca;hb=96cb6414f85e0ef4d660b7bd56267303e80fcd05;hp=5580909f549396fb891f6c0f3b82304c3847394c;hpb=4d288e59bea313bbc2369eaad5cfdfb28bbcd960;p=nageru

diff --git a/theme.h b/theme.h
index 5580909..9e9672e 100644
--- a/theme.h
+++ b/theme.h
@@ -15,6 +15,8 @@
 #include "ref_counted_frame.h"
 #include "tweaked_inputs.h"
 
+class FFmpegCapture;
+class LiveInputWrapper;
 struct InputState;
 
 namespace movit {
@@ -32,7 +34,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;
 	};
 
@@ -54,7 +57,29 @@ 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;
+	}
+
+	void register_signal_connection(LiveInputWrapper *live_input, FFmpegCapture *capture)
+	{
+		signal_connections.emplace_back(live_input, capture);
+	}
+
+	std::vector<std::pair<LiveInputWrapper *, FFmpegCapture *>> get_signal_connections() const
+	{
+		return signal_connections;
+	}
+
 private:
+	void register_constants();
 	void register_class(const char *class_name, const luaL_Reg *funcs);
 
 	std::mutex m;
@@ -67,6 +92,9 @@ 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 *>> signal_connections;
+
 	friend class LiveInputWrapper;
 };
 
@@ -77,15 +105,16 @@ private:
 // the mixer, and communicates that state over to the actual YCbCrInput.
 class LiveInputWrapper {
 public:
-	// Note: <override_bounce> is irrelevant for PixelFormat_8BitRGBA.
+	// 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);
 	movit::Effect *get_effect() const
 	{
 		if (deinterlace) {
 			return deinterlace_effect;
-		} else if (pixel_format == bmusb::PixelFormat_8BitRGBA) {
+		} else if (pixel_format == bmusb::PixelFormat_8BitBGRA) {
 			return rgba_inputs[0];
 		} else {
 			return ycbcr_inputs[0];
@@ -95,6 +124,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.