X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=theme.cpp;h=c03776b4b8e0a8b53bbb9ec04f625bff74a707c5;hb=9e47a2f661b9d292598ef0277e507458e3dad62f;hp=048abddcff168843f4cd9ab8fde751df1e896101;hpb=9ba511b7edf9d6875040a0b959d97bd7867ce159;p=nageru

diff --git a/theme.cpp b/theme.cpp
index 048abdd..c03776b 100644
--- a/theme.cpp
+++ b/theme.cpp
@@ -5,9 +5,11 @@
 #include <epoxy/gl.h>
 #include <lauxlib.h>
 #include <lua.hpp>
+#include <movit/deinterlace_effect.h>
 #include <movit/effect.h>
 #include <movit/effect_chain.h>
 #include <movit/image_format.h>
+#include <movit/input.h>
 #include <movit/mix_effect.h>
 #include <movit/multiply_effect.h>
 #include <movit/overlay_effect.h>
@@ -26,11 +28,9 @@
 #include <utility>
 
 #include "defs.h"
-#include "deinterlace_effect.h"
 #include "ffmpeg_capture.h"
 #include "flags.h"
 #include "image_input.h"
-#include "input.h"
 #include "input_state.h"
 #include "pbo_frame_allocator.h"
 
@@ -775,12 +775,12 @@ void LiveInputWrapper::connect_signal(int signal_num)
 	}
 
 	signal_num = theme->map_signal(signal_num);
-	connect_signal_raw(signal_num);
+	connect_signal_raw(signal_num, *theme->input_state);
 }
 
-void LiveInputWrapper::connect_signal_raw(int signal_num)
+void LiveInputWrapper::connect_signal_raw(int signal_num, const InputState &input_state)
 {
-	BufferedFrame first_frame = theme->input_state->buffered_frames[signal_num][0];
+	BufferedFrame first_frame = input_state.buffered_frames[signal_num][0];
 	if (first_frame.frame == nullptr) {
 		// No data yet.
 		return;
@@ -792,10 +792,10 @@ void LiveInputWrapper::connect_signal_raw(int signal_num)
 		height = userdata->last_height[first_frame.field_number];
 	}
 
-	movit::YCbCrLumaCoefficients ycbcr_coefficients = theme->input_state->ycbcr_coefficients[signal_num];
-	bool full_range = theme->input_state->full_range[signal_num];
+	movit::YCbCrLumaCoefficients ycbcr_coefficients = input_state.ycbcr_coefficients[signal_num];
+	bool full_range = input_state.full_range[signal_num];
 
-	if (theme->input_state->ycbcr_coefficients_auto[signal_num]) {
+	if (input_state.ycbcr_coefficients_auto[signal_num]) {
 		full_range = false;
 
 		// The Blackmagic driver docs claim that the device outputs Y'CbCr
@@ -819,7 +819,7 @@ void LiveInputWrapper::connect_signal_raw(int signal_num)
 
 	BufferedFrame last_good_frame = first_frame;
 	for (unsigned i = 0; i < max(ycbcr_inputs.size(), rgba_inputs.size()); ++i) {
-		BufferedFrame frame = theme->input_state->buffered_frames[signal_num][i];
+		BufferedFrame frame = input_state.buffered_frames[signal_num][i];
 		if (frame.frame == nullptr) {
 			// Not enough data; reuse last frame (well, field).
 			// This is suboptimal, but we have nothing better.
@@ -871,7 +871,7 @@ void LiveInputWrapper::connect_signal_raw(int signal_num)
 	}
 
 	if (deinterlace) {
-		BufferedFrame frame = theme->input_state->buffered_frames[signal_num][0];
+		BufferedFrame frame = input_state.buffered_frames[signal_num][0];
 		CHECK(deinterlace_effect->set_int("current_field_position", frame.field_number));
 	}
 }
@@ -1027,6 +1027,7 @@ Theme::Chain Theme::get_chain(unsigned num, float t, unsigned width, unsigned he
 	chain.setup_chain = [this, funcref, input_state]{
 		unique_lock<mutex> lock(m);
 
+		assert(this->input_state == nullptr);
 		this->input_state = &input_state;
 
 		// Set up state, including connecting signals.
@@ -1036,10 +1037,13 @@ Theme::Chain Theme::get_chain(unsigned num, float t, unsigned width, unsigned he
 			exit(1);
 		}
 		assert(lua_gettop(L) == 0);
+
+		this->input_state = nullptr;
 	};
 
 	// TODO: Can we do better, e.g. by running setup_chain() and seeing what it references?
 	// Actually, setup_chain does maybe hold all the references we need now anyway?
+	chain.input_frames.reserve(num_cards * FRAME_HISTORY_LENGTH);
 	for (unsigned card_index = 0; card_index < num_cards; ++card_index) {
 		for (unsigned frame_num = 0; frame_num < FRAME_HISTORY_LENGTH; ++frame_num) {
 			chain.input_frames.push_back(input_state.buffered_frames[card_index][frame_num].frame);