X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=print_latency.cpp;h=72440ae0fe41a3ec13df76c595450ca409090aec;hb=e284d1c7a2e18ee7e4aea082c4a57a3504a0f5e8;hp=52943537997cae27bf318ba2da15c1c843819371;hpb=f914b63b7c3bd77c00dad3e3bc60d95279de7520;p=nageru

diff --git a/print_latency.cpp b/print_latency.cpp
index 5294353..72440ae 100644
--- a/print_latency.cpp
+++ b/print_latency.cpp
@@ -74,24 +74,35 @@ void LatencyHistogram::init(const string &measuring_point)
 	}
 }
 
-void print_latency(const string &header, const ReceivedTimestamps &received_ts, bool is_b_frame, int *frameno, LatencyHistogram *histogram)
+void print_latency(const char *header, const ReceivedTimestamps &received_ts, bool is_b_frame, int *frameno, LatencyHistogram *histogram)
 {
 	if (received_ts.ts.empty())
 		return;
 
 	const steady_clock::time_point now = steady_clock::now();
 
-	unsigned num_cards = global_mixer->get_num_cards();
-	assert(received_ts.ts.size() == num_cards * FRAME_HISTORY_LENGTH);
-	for (unsigned card_index = 0; card_index < num_cards; ++card_index) {
-		for (unsigned frame_index = 0; frame_index < FRAME_HISTORY_LENGTH; ++frame_index) {
-			steady_clock::time_point ts = received_ts.ts[card_index * FRAME_HISTORY_LENGTH + frame_index];
-			if (ts == steady_clock::time_point::min()) {
-				continue;
-			}
+	if (global_mixer == nullptr) {
+		// Kaeru.
+		assert(received_ts.ts.size() == 1);
+		steady_clock::time_point ts = received_ts.ts[0];
+		if (ts != steady_clock::time_point::min()) {
 			duration<double> latency = now - ts;
-			histogram->summaries[card_index][frame_index][is_b_frame].count_event(latency.count());
-			histogram->summaries[card_index][frame_index][2].count_event(latency.count());
+			histogram->summaries[0][0][is_b_frame].count_event(latency.count());
+			histogram->summaries[0][0][2].count_event(latency.count());
+		}
+	} else {
+		unsigned num_cards = global_mixer->get_num_cards();
+		assert(received_ts.ts.size() == num_cards * FRAME_HISTORY_LENGTH);
+		for (unsigned card_index = 0; card_index < num_cards; ++card_index) {
+			for (unsigned frame_index = 0; frame_index < FRAME_HISTORY_LENGTH; ++frame_index) {
+				steady_clock::time_point ts = received_ts.ts[card_index * FRAME_HISTORY_LENGTH + frame_index];
+				if (ts == steady_clock::time_point::min()) {
+					continue;
+				}
+				duration<double> latency = now - ts;
+				histogram->summaries[card_index][frame_index][is_b_frame].count_event(latency.count());
+				histogram->summaries[card_index][frame_index][2].count_event(latency.count());
+			}
 		}
 	}
 
@@ -109,7 +120,7 @@ void print_latency(const string &header, const ReceivedTimestamps &received_ts,
 		duration<double> highest_latency = now - min_ts;
 
 		printf("%-60s %4.0f ms (lowest-latency input), %4.0f ms (highest-latency input)",
-			header.c_str(), 1e3 * lowest_latency.count(), 1e3 * highest_latency.count());
+			header, 1e3 * lowest_latency.count(), 1e3 * highest_latency.count());
 
 		if (is_b_frame) {
 			printf("  [on B-frame; potential extra latency]\n");