Add metrics for how many frames we are decoding, but did not have the time to display.

[nageru] / futatabi / player.cpp

diff --git a/futatabi/player.cpp b/futatabi/player.cpp
index 910377a8236fb3a323bdc1b4559328b50725e5fe..19868f486944fcf51bab9fec200437ab9fe9d88e 100644 (file)
--- 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<double>(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<double>(time_behind).count()));
@@ -274,8 +275,11 @@ void Player::play_playlist_once()
 
                                FrameOnDisk frame_lower, frame_upper;
                                bool ok = find_surrounding_frames(in_pts_secondary, secondary_stream_idx, &frame_lower, &frame_upper);
+
                                if (ok) {
                                        secondary_frame = frame_lower;
+                               } else {
+                                       secondary_stream_idx = -1;
                                }
                        }
 
@@ -531,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<double> 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);
        }
 }
 
@@ -628,7 +636,7 @@ TimeRemaining compute_time_left(const vector<ClipWithID> &clips, size_t currentl
        for (size_t row = currently_playing_idx; row < clips.size(); ++row) {
                const Clip &clip = clips[row].clip;
                double clip_length = double(clip.pts_out - clip.pts_in) / TIMEBASE / clip.speed;
-               if (clip_length >= 86400.0) {  // More than one day.
+               if (clip_length >= 86400.0 || clip.pts_out == -1) {  // More than one day.
                        ++remaining.num_infinite;
                } else {
                        if (row == currently_playing_idx) {