X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mixer.cpp;h=b6824d51ef3911034ac700d1a4a2295e3d57fa1b;hb=196392c483a9cbf7fd7b572d9242aa283031453f;hp=57cd5bdaf2d30daeabc370bffdffaa7703239ef7;hpb=2464152a8c084f39b52e063da888a6a0b7ea9306;p=nageru

diff --git a/mixer.cpp b/mixer.cpp
index 57cd5bd..b6824d5 100644
--- a/mixer.cpp
+++ b/mixer.cpp
@@ -59,6 +59,22 @@ void convert_fixed24_to_fp32(float *dst, size_t out_channels, const uint8_t *src
 	}
 }
 
+void insert_new_frame(RefCountedFrame frame, unsigned field_num, bool interlaced, unsigned card_index, InputState *input_state)
+{
+	if (interlaced) {
+		for (unsigned frame_num = FRAME_HISTORY_LENGTH; frame_num --> 1; ) {  // :-)
+			input_state->buffered_frames[card_index][frame_num] =
+				input_state->buffered_frames[card_index][frame_num - 1];
+		}
+		input_state->buffered_frames[card_index][0] = { frame, field_num };
+	} else {
+		for (unsigned frame_num = 0; frame_num < FRAME_HISTORY_LENGTH; ++frame_num) {
+			input_state->buffered_frames[card_index][frame_num] = { frame, field_num };
+		}
+	}
+}
+
+
 }  // namespace
 
 Mixer::Mixer(const QSurfaceFormat &format, unsigned num_cards)
@@ -493,6 +509,7 @@ void Mixer::thread_func()
 		}
 
 		if (audio_level_callback != nullptr) {
+			unique_lock<mutex> lock(r128_mutex);
 			double loudness_s = r128.loudness_S();
 			double loudness_i = r128.integrated();
 			double loudness_range_low = r128.range_min();
@@ -527,16 +544,7 @@ void Mixer::thread_func()
 				continue;
 
 			assert(card->new_frame != nullptr);
-			if (card->new_frame_interlaced) {
-				for (unsigned frame_num = FRAME_HISTORY_LENGTH; frame_num --> 1; ) {  // :-)
-					buffered_frames[card_index][frame_num] = buffered_frames[card_index][frame_num - 1];
-				}
-				buffered_frames[card_index][0] = { card->new_frame, card->new_frame_field };
-			} else {
-				for (unsigned frame_num = 0; frame_num < FRAME_HISTORY_LENGTH; ++frame_num) {
-					buffered_frames[card_index][frame_num] = { card->new_frame, card->new_frame_field };
-				}
-			}
+			insert_new_frame(card->new_frame, card->new_frame_field, card->new_frame_interlaced, card_index, &input_state);
 			check_error();
 
 			// The new texture might still be uploaded,
@@ -550,7 +558,7 @@ void Mixer::thread_func()
 		}
 
 		// Get the main chain from the theme, and set its state immediately.
-		Theme::Chain theme_main_chain = theme->get_chain(0, pts(), WIDTH, HEIGHT);
+		Theme::Chain theme_main_chain = theme->get_chain(0, pts(), WIDTH, HEIGHT, input_state);
 		EffectChain *chain = theme_main_chain.chain;
 		theme_main_chain.setup_chain();
 
@@ -599,7 +607,7 @@ void Mixer::thread_func()
 		// Set up preview and any additional channels.
 		for (int i = 1; i < theme->get_num_channels() + 2; ++i) {
 			DisplayFrame display_frame;
-			Theme::Chain chain = theme->get_chain(i, pts(), WIDTH, HEIGHT);  // FIXME: dimensions
+			Theme::Chain chain = theme->get_chain(i, pts(), WIDTH, HEIGHT, input_state);  // FIXME: dimensions
 			display_frame.chain = chain.chain;
 			display_frame.setup_chain = chain.setup_chain;
 			display_frame.ready_fence = fence;
@@ -743,7 +751,10 @@ void Mixer::process_audio_one_frame(int64_t frame_pts_int, int num_samples)
 	vector<float> left, right;
 	deinterleave_samples(samples_out, &left, &right);
 	float *ptrs[] = { left.data(), right.data() };
-	r128.process(left.size(), ptrs);
+	{
+		unique_lock<mutex> lock(r128_mutex);
+		r128.process(left.size(), ptrs);
+	}
 
 	// Send the samples to the sound card.
 	if (alsa) {