X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=futatabi%2Fplayer.cpp;h=94438a0c9713dff414bbff2f3594f6666ff38b11;hb=f9024d141398e69e7b4011becd3ebbe37eaa1776;hp=611f0abce4151ceff3a9adc8e51da2dc14e987b3;hpb=9ffd4f03f314cc6e0254449593def95c9bc203d6;p=nageru diff --git a/futatabi/player.cpp b/futatabi/player.cpp index 611f0ab..94438a0 100644 --- a/futatabi/player.cpp +++ b/futatabi/player.cpp @@ -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) { @@ -205,6 +212,10 @@ void Player::play_playlist_once() 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) { @@ -263,8 +274,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; } } @@ -344,15 +358,6 @@ void Player::play_playlist_once() 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. @@ -362,7 +367,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; @@ -372,6 +377,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 @@ -418,7 +432,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. } @@ -439,7 +453,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) { @@ -458,7 +472,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. @@ -476,6 +490,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); @@ -487,6 +502,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; @@ -610,7 +631,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) {