X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=futatabi%2Fplayer.cpp;h=19868f486944fcf51bab9fec200437ab9fe9d88e;hb=02ea864dc5a6dde7450c497581ff18d784ab832c;hp=fa094be98b3bfb715730ed4eab3d3b74e0255900;hpb=f78363119d05e83b2665d89b147945fc0cdec020;p=nageru diff --git a/futatabi/player.cpp b/futatabi/player.cpp index fa094be..19868f4 100644 --- a/futatabi/player.cpp +++ b/futatabi/player.cpp @@ -35,7 +35,7 @@ void Player::thread_func(AVFormatContext *file_avctx) QOpenGLContext *context = create_context(surface); if (!make_current(context, surface)) { printf("oops\n"); - exit(1); + abort(); } check_error(); @@ -114,7 +114,7 @@ void Player::play_playlist_once() bool clip_ready; steady_clock::time_point before_sleep = steady_clock::now(); string pause_status; - float master_speed = 1.0f; + float master_speed = start_master_speed; // Wait until we're supposed to play something. { @@ -139,7 +139,14 @@ void Player::play_playlist_once() } steady_clock::duration time_slept = steady_clock::now() - before_sleep; - pts += duration_cast>(time_slept).count(); + int64_t slept_pts = duration_cast>(time_slept).count(); + if (slept_pts > 0) { + if (video_stream != nullptr) { + // Add silence for the time we're waiting. + video_stream->schedule_silence(steady_clock::now(), pts, slept_pts, QueueSpotHolder()); + } + pts += slept_pts; + } if (!clip_ready) { if (video_stream != nullptr) { @@ -198,14 +205,17 @@ void Player::play_playlist_once() if (should_skip_to_next.exchange(false)) { // Test and clear. Clip *clip = &clip_list[clip_idx].clip; // Get a non-const pointer. - fprintf(stderr, "pts_out moving to first of %ld and %ld (currently at %f)\n", clip->pts_out, lrint(out_pts + clip->fade_time_seconds * TIMEBASE), out_pts); - clip->pts_out = std::min(clip->pts_out, lrint(in_pts + clip->fade_time_seconds * clip->speed * TIMEBASE)); + clip->pts_out = std::min(clip->pts_out, llrint(in_pts + clip->fade_time_seconds * clip->speed * TIMEBASE)); } if (in_pts >= clip->pts_out) { break; } + // Only play audio if we're within 0.1% of normal speed. We could do + // stretching or pitch shift later if it becomes needed. + bool play_audio = clip->speed * master_speed >= 0.999 && clip->speed * master_speed <= 1.001; + { lock_guard lock(queue_state_mu); if (splice_ready) { @@ -232,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())); @@ -264,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; } } @@ -340,20 +354,11 @@ void Player::play_playlist_once() ss.imbue(locale("C")); ss.precision(3); ss << "Futatabi " NAGERU_VERSION ";PLAYING;"; - ss << fixed << time_remaining.t; + ss << fixed << (time_remaining.num_infinite * 86400.0 + time_remaining.t); ss << ";" << format_duration(time_remaining) << " left"; subtitle = ss.str(); } - // If there's nothing to interpolate between, or if interpolation is turned off, - // or we're a preview, then just display the frame. - if (frame_lower.pts == frame_upper.pts || global_flags.interpolation_quality == 0 || video_stream == nullptr) { - display_single_frame(primary_stream_idx, frame_lower, secondary_stream_idx, - secondary_frame, fade_alpha, next_frame_start, /*snapped=*/false, - subtitle); - continue; - } - // Snap to input frame: If we can do so with less than 1% jitter // (ie., move less than 1% of an _output_ frame), do so. // TODO: Snap secondary (fade-to) clips in the same fashion. @@ -363,7 +368,7 @@ void Player::play_playlist_once() if (fabs(snap_frame.pts - in_pts) < pts_snap_tolerance) { display_single_frame(primary_stream_idx, snap_frame, secondary_stream_idx, secondary_frame, fade_alpha, next_frame_start, /*snapped=*/true, - subtitle); + subtitle, play_audio); in_pts_origin += snap_frame.pts - in_pts; snapped = true; break; @@ -373,6 +378,15 @@ void Player::play_playlist_once() continue; } + // If there's nothing to interpolate between, or if interpolation is turned off, + // or we're a preview, then just display the frame. + if (frame_lower.pts == frame_upper.pts || global_flags.interpolation_quality == 0 || video_stream == nullptr) { + display_single_frame(primary_stream_idx, frame_lower, secondary_stream_idx, + secondary_frame, fade_alpha, next_frame_start, /*snapped=*/false, + subtitle, play_audio); + continue; + } + // The snapping above makes us lock to the input framerate, even in the presence // of pts drift, for most typical cases where it's needed, like converting 60 → 2x60 // or 60 → 2x59.94. However, there are some corner cases like 25 → 2x59.94, where we'd @@ -419,7 +433,7 @@ void Player::play_playlist_once() video_stream->schedule_interpolated_frame( next_frame_start, pts, display_func, QueueSpotHolder(this), frame_lower, frame_upper, alpha, - secondary_frame, fade_alpha, subtitle); + secondary_frame, fade_alpha, subtitle, play_audio); last_pts_played = in_pts; // Not really needed; only previews use last_pts_played. } @@ -440,7 +454,7 @@ void Player::play_playlist_once() } } -void Player::display_single_frame(int primary_stream_idx, const FrameOnDisk &primary_frame, int secondary_stream_idx, const FrameOnDisk &secondary_frame, double fade_alpha, steady_clock::time_point frame_start, bool snapped, const std::string &subtitle) +void Player::display_single_frame(int primary_stream_idx, const FrameOnDisk &primary_frame, int secondary_stream_idx, const FrameOnDisk &secondary_frame, double fade_alpha, steady_clock::time_point frame_start, bool snapped, const std::string &subtitle, bool play_audio) { auto display_func = [this, primary_stream_idx, primary_frame, secondary_frame, fade_alpha] { if (destination != nullptr) { @@ -459,7 +473,7 @@ void Player::display_single_frame(int primary_stream_idx, const FrameOnDisk &pri } video_stream->schedule_original_frame( frame_start, pts, display_func, QueueSpotHolder(this), - primary_frame, subtitle); + primary_frame, subtitle, play_audio); } else { assert(secondary_frame.pts != -1); // NOTE: We could be increasing unused metrics for previews, but that's harmless. @@ -477,6 +491,7 @@ void Player::display_single_frame(int primary_stream_idx, const FrameOnDisk &pri } // Find the frame immediately before and after this point. +// If we have an exact match, return it immediately. bool Player::find_surrounding_frames(int64_t pts, int stream_idx, FrameOnDisk *frame_lower, FrameOnDisk *frame_upper) { lock_guard lock(frame_mu); @@ -488,6 +503,12 @@ bool Player::find_surrounding_frames(int64_t pts, int stream_idx, FrameOnDisk *f } *frame_upper = *it; + // If we have an exact match, return it immediately. + if (frame_upper->pts == pts) { + *frame_lower = *it; + return true; + } + // Find the last frame such that in_pts <= frame.pts (if any). if (it == frames[stream_idx].begin()) { *frame_lower = *it; @@ -514,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); } } @@ -611,7 +636,7 @@ TimeRemaining compute_time_left(const vector &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) {