Support audio-only FFmpeg inputs. Somewhat wonky, though.

[nageru] / print_latency.cpp

diff --git a/print_latency.cpp b/print_latency.cpp
index 4b7fa0bea8efbe84666f48d0a211c5457653ff24..72440ae0fe41a3ec13df76c595450ca409090aec 100644 (file)
--- a/print_latency.cpp
+++ b/print_latency.cpp
@@ -45,9 +45,10 @@ void LatencyHistogram::init(const string &measuring_point)
                        snprintf(frame_index_str, sizeof(frame_index_str), "%u", frame_index);
 
                        vector<double> quantiles{0.01, 0.1, 0.25, 0.5, 0.75, 0.9, 0.99};
-                       summaries[card_index][frame_index].reset(new Summary[2]);
+                       summaries[card_index][frame_index].reset(new Summary[3]);
                        summaries[card_index][frame_index][0].init(quantiles, 60.0);
                        summaries[card_index][frame_index][1].init(quantiles, 60.0);
+                       summaries[card_index][frame_index][2].init(quantiles, 60.0);
                        global_metrics.add("latency_seconds",
                                {{ "measuring_point", measuring_point },
                                 { "card", card_index_str },
@@ -62,27 +63,46 @@ void LatencyHistogram::init(const string &measuring_point)
                                 { "frame_type", "b" }},
                                 &summaries[card_index][frame_index][1],
                                Metrics::PRINT_WHEN_NONEMPTY);
+                       global_metrics.add("latency_seconds",
+                               {{ "measuring_point", measuring_point },
+                                { "card", card_index_str },
+                                { "frame_age", frame_index_str },
+                                { "frame_type", "total" }},
+                                &summaries[card_index][frame_index][2],
+                               (frame_index == 0) ? Metrics::PRINT_ALWAYS : Metrics::PRINT_WHEN_NONEMPTY);
                }
        }
 }
 
-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[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());
+                       }
                }
        }
 
@@ -100,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");