Add latency metrics to Kaeru.

diff --git a/kaeru.cpp b/kaeru.cpp
index c41a4c2323dec4b21b8188575e9229f5d9bd8b31..23b3c8786ce4ae0336d60f3cdcd85305d4b6a788 100644 (file)
--- a/kaeru.cpp
+++ b/kaeru.cpp
@@ -14,11 +14,13 @@
 #include <fcntl.h>
 #include <signal.h>
 #include <unistd.h>
+#include <chrono>
 #include <string>
 
 using namespace bmusb;
 using namespace movit;
 using namespace std;
+using namespace std::chrono;
 using namespace std::placeholders;
 
 Mixer *global_mixer = nullptr;
@@ -76,9 +78,12 @@ void video_frame_callback(FFmpegCapture *video, X264Encoder *x264_encoder, Audio
                          FrameAllocator::Frame audio_frame, size_t audio_offset, AudioFormat audio_format)
 {
        if (video_pts >= 0 && video_frame.len > 0) {
+               ReceivedTimestamps ts;
+               ts.ts.push_back(steady_clock::now());
+
                video_pts = av_rescale_q(video_pts, video_timebase, AVRational{ 1, TIMEBASE });
                int64_t frame_duration = TIMEBASE * video_format.frame_rate_nom / video_format.frame_rate_den;
-               x264_encoder->add_frame(video_pts, frame_duration, video->get_current_frame_ycbcr_format().luma_coefficients, video_frame.data + video_offset, ReceivedTimestamps());
+               x264_encoder->add_frame(video_pts, frame_duration, video->get_current_frame_ycbcr_format().luma_coefficients, video_frame.data + video_offset, ts);
        }
        if (audio_frame.len > 0) {
                // FFmpegCapture takes care of this for us.
@@ -154,6 +159,7 @@ int main(int argc, char *argv[])
                usage(PROGRAM_KAERU);
                exit(1);
        }
+       global_flags.num_cards = 1;  // For latency metrics.
 
        av_register_all();
        avformat_network_init();

diff --git a/print_latency.cpp b/print_latency.cpp
index 52943537997cae27bf318ba2da15c1c843819371..af199856e4d1c34935486584282552c7aa5fc0d9 100644 (file)
--- a/print_latency.cpp
+++ b/print_latency.cpp
@@ -81,17 +81,28 @@ void print_latency(const string &header, const ReceivedTimestamps &received_ts,
 
        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());
+                       }
                }
        }