X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=theme.h;h=e1c3ed1baa0baa0820705a6c4428ea8d95d9c2d0;hb=fa54f2630c56a1df0046923d6a77b1bd58abf240;hp=ad963d6cdb0cb8bec9f59d7ccb73b167e0f06b7e;hpb=00107239ef2b0fdab7b7728a0eeec0da1ad2ffc0;p=nageru

diff --git a/theme.h b/theme.h
index ad963d6..e1c3ed1 100644
--- 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,20 @@
 #include <string>
 #include <vector>
 
+#include "bmusb/bmusb.h"
 #include "ref_counted_frame.h"
+#include "tweaked_inputs.h"
 
+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 +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;
 	};
 
@@ -59,18 +52,39 @@ public:
 
 	std::vector<std::string> get_transition_names(float t);
 
-	void connect_signal(movit::YCbCrInput *input, int signal_num);
 	void transition_clicked(int transition_num, float t);
 	void channel_clicked(int preview_num);
 
 	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;
 	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;
@@ -78,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;
 };
 
@@ -88,21 +105,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;
 };