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

diff --git a/theme.h b/theme.h
index b04050e..e1c3ed1 100644
--- a/theme.h
+++ b/theme.h
@@ -34,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;
 	};
 
@@ -78,11 +79,12 @@ public:
 	}
 
 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;
@@ -103,16 +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);
+	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_8BitRGBA) {
+		} else if (pixel_format == bmusb::PixelFormat_8BitBGRA) {
 			return rgba_inputs[0];
 		} else {
 			return ycbcr_inputs[0];
@@ -122,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.