X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fmixer.cpp;h=2fdbf645e876d89cc39022a411d75f2e92016ba3;hb=b9a74fdb2aaaec5f2859945f25bff9295da444e1;hp=80fcb64a054bf3c2c3c8047dfb28de321e4e3604;hpb=f2c703f883d511cdf850de0d69902a820f371237;p=nageru

diff --git a/nageru/mixer.cpp b/nageru/mixer.cpp
index 80fcb64..2fdbf64 100644
--- a/nageru/mixer.cpp
+++ b/nageru/mixer.cpp
@@ -277,7 +277,7 @@ void QueueLengthPolicy::unregister_metrics(const vector<pair<string, string>> &l
 }
 
 void QueueLengthPolicy::update_policy(steady_clock::time_point now,
-                                      steady_clock::time_point expected_next_frame,
+                                      steady_clock::time_point expected_next_input_frame,
                                       int64_t input_frame_duration,
                                       int64_t master_frame_duration,
                                       double max_input_card_jitter_seconds,
@@ -288,7 +288,7 @@ void QueueLengthPolicy::update_policy(steady_clock::time_point now,
 
 	// Figure out when we can expect the next frame for this card, assuming
 	// worst-case jitter (ie., the frame is maximally late).
-	double seconds_until_next_frame = max(duration<double>(expected_next_frame - now).count() + max_input_card_jitter_seconds, 0.0);
+	double seconds_until_next_frame = max(duration<double>(expected_next_input_frame - now).count() + max_input_card_jitter_seconds, 0.0);
 
 	// How many times are the master card expected to tick in that time?
 	// We assume the master clock has worst-case jitter but not any rate
@@ -499,10 +499,6 @@ Mixer::Mixer(const QSurfaceFormat &format)
 	}
 #endif
 
-	for (unsigned card_index = 0; card_index < MAX_VIDEO_CARDS; ++card_index) {
-		cards[card_index].queue_length_policy.reset(card_index);
-	}
-
 	chroma_subsampler.reset(new ChromaSubsampler(resource_pool.get()));
 
 	if (global_flags.ten_bit_input) {
@@ -890,7 +886,7 @@ void Mixer::set_output_card_internal(int card_index)
 		card->parked_capture = move(card->capture);
 		CaptureInterface *fake_capture = new FakeCapture(global_flags.width, global_flags.height, FAKE_FPS, OUTPUT_FREQUENCY, card_index, global_flags.fake_cards_audio);
 		configure_card(card_index, fake_capture, CardType::FAKE_CAPTURE, card->output.release(), /*is_srt_card=*/false);
-		card->queue_length_policy.reset(card_index);
+		card->jitter_history.clear();
 		card->capture->start_bm_capture();
 		desired_output_video_mode = output_video_mode = card->output->pick_video_mode(desired_output_video_mode);
 		card->output->start_output(desired_output_video_mode, pts_int);
@@ -1608,7 +1604,7 @@ void Mixer::handle_hotplugged_cards()
 				fprintf(stderr, "Card %u went away, replacing with a fake card.\n", card_index);
 				FakeCapture *capture = new FakeCapture(global_flags.width, global_flags.height, FAKE_FPS, OUTPUT_FREQUENCY, card_index, global_flags.fake_cards_audio);
 				configure_card(card_index, capture, CardType::FAKE_CAPTURE, /*output=*/nullptr, /*is_srt_card=*/false);
-				card->queue_length_policy.reset(card_index);
+				card->jitter_history.clear();
 				card->capture->start_bm_capture();
 			} else {
 				// NOTE: The theme might end up forcing the card back at some later point
@@ -1618,7 +1614,7 @@ void Mixer::handle_hotplugged_cards()
 				fprintf(stderr, "Card %u went away, removing. (To keep a fake card, increase --num-cards.)\n", card_index);
 				theme->remove_card(card_index);
 				configure_card(card_index, /*capture=*/nullptr, CardType::FAKE_CAPTURE, /*output=*/nullptr, /*is_srt_card=*/false);
-				card->queue_length_policy.reset(card_index);
+				card->jitter_history.clear();
 			}
 		}
 	}
@@ -1665,7 +1661,7 @@ void Mixer::handle_hotplugged_cards()
 			CaptureCard *card = &cards[free_card_index];
 			BMUSBCapture *capture = new BMUSBCapture(free_card_index, new_dev);
 			configure_card(free_card_index, capture, CardType::LIVE_CARD, /*output=*/nullptr, /*is_srt_card=*/false);
-			card->queue_length_policy.reset(free_card_index);
+			card->jitter_history.clear();
 			capture->set_card_disconnected_callback(bind(&Mixer::bm_hotplug_remove, this, free_card_index));
 			capture->start_bm_capture();
 		}
@@ -1721,7 +1717,7 @@ void Mixer::handle_hotplugged_cards()
 			configure_card(free_card_index, capture, CardType::FFMPEG_INPUT, /*output=*/nullptr, /*is_srt_card=*/true);
 			update_srt_stats(sock, card);  // Initial zero stats.
 			card->last_srt_stream_id = stream_id;
-			card->queue_length_policy.reset(free_card_index);
+			card->jitter_history.clear();
 			capture->set_card_disconnected_callback(bind(&Mixer::bm_hotplug_remove, this, free_card_index));
 			capture->start_bm_capture();
 		}
@@ -1734,7 +1730,7 @@ void Mixer::handle_hotplugged_cards()
 		if (card->capture == nullptr && card->force_active) {
 			FakeCapture *capture = new FakeCapture(global_flags.width, global_flags.height, FAKE_FPS, OUTPUT_FREQUENCY, card_index, global_flags.fake_cards_audio);
 			configure_card(card_index, capture, CardType::FAKE_CAPTURE, /*output=*/nullptr, /*is_srt_card=*/false);
-			card->queue_length_policy.reset(card_index);
+			card->jitter_history.clear();
 			card->capture->start_bm_capture();
 		}
 	}
@@ -1980,7 +1976,7 @@ void Mixer::quit()
 	if (global_flags.srt_port >= 0) {
 		// There's seemingly no other reasonable way to wake up the thread
 		// (libsrt's epoll equivalent is busy-waiting).
-		int sock = srt_socket(AF_INET6, 0, 0);
+		int sock = srt_create_socket();
 		if (sock != -1) {
 			sockaddr_in6 addr;
 			memset(&addr, 0, sizeof(addr));
@@ -2189,7 +2185,7 @@ void Mixer::OutputChannel::set_color_updated_callback(Mixer::color_updated_callb
 #ifdef HAVE_SRT
 void Mixer::start_srt()
 {
-	SRTSOCKET sock = srt_socket(AF_INET6, 0, 0);
+	SRTSOCKET sock = srt_create_socket();
 	sockaddr_in6 addr;
 	memset(&addr, 0, sizeof(addr));
 	addr.sin6_family = AF_INET6;