X-Git-Url: https://git.sesse.net/?p=nageru;a=blobdiff_plain;f=nageru%2Fmixer.cpp;fp=nageru%2Fmixer.cpp;h=cbca327e07663326a0eee26512939d093f1f59e3;hp=c6f126fc6682ef78fa23757205a4ceaff0a36526;hb=34c8970de7b295638574ceb72ae39644394e8d6d;hpb=c9f0f678e20f095885b08ee2c55e356ba777b197

diff --git a/nageru/mixer.cpp b/nageru/mixer.cpp
index c6f126f..cbca327 100644
--- a/nageru/mixer.cpp
+++ b/nageru/mixer.cpp
@@ -1471,7 +1471,7 @@ pair<string, string> Mixer::get_channel_color_http(unsigned channel_idx)
 Mixer::OutputFrameInfo Mixer::get_one_frame_from_each_card(unsigned master_card_index, bool master_card_is_output, CaptureCard::NewFrame new_frames[MAX_VIDEO_CARDS], bool has_new_frame[MAX_VIDEO_CARDS], vector<int32_t> raw_audio[MAX_VIDEO_CARDS])
 {
 	OutputFrameInfo output_frame_info;
-	constexpr steady_clock::duration master_card_timeout = milliseconds(100);
+	constexpr steady_clock::duration master_card_timeout = milliseconds(200);
 start:
 	unique_lock<mutex> lock(card_mutex, defer_lock);
 	bool timed_out = false;
@@ -1490,13 +1490,14 @@ start:
 					cards[master_card_index].capture->get_disconnected();
 			});
 		if (timed_out) {
-			fprintf(stderr, "WARNING: Master card (%s) did not deliver a frame for 100 ms, creating a fake one.\n",
-				description_for_card(master_card_index).c_str());
+			fprintf(stderr, "WARNING: Master card (%s) did not deliver a frame for %u ms, creating a fake one.\n",
+				description_for_card(master_card_index).c_str(),
+				unsigned(duration_cast<milliseconds>(master_card_timeout).count()));
 		}
 	}
 
 	if (timed_out) {
-		// The master card stalled for 100 ms (possible when it's e.g.
+		// The master card stalled for 200 ms (possible when it's e.g.
 		// an SRT card). Send a frame no matter what; this also makes sure
 		// any other cards get to empty their queues, and in general,
 		// that we make _some_ sort of forward progress.