From: Steinar H. Gunderson Date: Wed, 4 Mar 2020 23:16:47 +0000 (+0100) Subject: Add a metric for general Futatabi player health (how much buffer there is left). X-Git-Tag: 1.9.2~17 X-Git-Url: https://git.sesse.net/?p=nageru;a=commitdiff_plain;h=06c2ef3a3edb23b0e02eca9d5b43b0098c9474e7 Add a metric for general Futatabi player health (how much buffer there is left). --- diff --git a/futatabi/player.cpp b/futatabi/player.cpp index 94438a0..19868f4 100644 --- a/futatabi/player.cpp +++ b/futatabi/player.cpp @@ -242,6 +242,7 @@ void Player::play_playlist_once() } steady_clock::duration time_behind = steady_clock::now() - next_frame_start; + metric_player_ahead_seconds.count_event(-duration(time_behind).count()); if (stream_output != FILE_STREAM_OUTPUT && time_behind >= milliseconds(200)) { fprintf(stderr, "WARNING: %ld ms behind, dropping a frame (no matter the type).\n", lrint(1e3 * duration(time_behind).count())); @@ -534,6 +535,10 @@ Player::Player(JPEGFrameView *destination, Player::StreamOutput stream_output, A global_metrics.add("http_output_frames", { { "type", "refresh" } }, &metric_refresh_frame); global_metrics.add("http_dropped_frames", { { "type", "interpolated" } }, &metric_dropped_interpolated_frame); global_metrics.add("http_dropped_frames", { { "type", "unconditional" } }, &metric_dropped_unconditional_frame); + + vector quantiles{ 0.01, 0.1, 0.25, 0.5, 0.75, 0.9, 0.99 }; + metric_player_ahead_seconds.init(quantiles, 60.0); + global_metrics.add("player_ahead_seconds", &metric_player_ahead_seconds); } } diff --git a/futatabi/player.h b/futatabi/player.h index 597f702..77fb9e2 100644 --- a/futatabi/player.h +++ b/futatabi/player.h @@ -4,6 +4,7 @@ #include "clip_list.h" #include "frame_on_disk.h" #include "queue_spot_holder.h" +#include "shared/metrics.h" extern "C" { #include @@ -137,6 +138,7 @@ private: std::atomic metric_refresh_frame{ 0 }; std::atomic metric_interpolated_frame{ 0 }; std::atomic metric_interpolated_faded_frame{ 0 }; + Summary metric_player_ahead_seconds; // under queue_state_mu. Part of this instead of VideoStream so that we own // its lock and can sleep on it.