X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=futatabi%2Fplayer.cpp;h=442144918559bebe00c106f4d705e4592875b525;hb=f014bc9a81cc4fae068172a84f0491efef38135e;hp=30dccc8e4e88132664d26cd4e8f7058586c6c430;hpb=2c9a83aeae44dae6a0bbfbae33719976e6d527af;p=nageru diff --git a/futatabi/player.cpp b/futatabi/player.cpp index 30dccc8..4421449 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(); @@ -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) { @@ -151,6 +158,7 @@ void Player::play_playlist_once() return; } + should_skip_to_next = false; // To make sure we don't have a lingering click from before play. steady_clock::time_point origin = steady_clock::now(); // TODO: Add a 100 ms buffer for ramp-up? int64_t in_pts_origin = clip_list[0].clip.pts_in; for (size_t clip_idx = 0; clip_idx < clip_list.size(); ++clip_idx) { @@ -181,7 +189,7 @@ void Player::play_playlist_once() } steady_clock::time_point next_frame_start; - for (int frameno = 0; !should_quit; ++frameno) { // Ends when the clip ends. + for (int64_t frameno = 0; !should_quit; ++frameno) { // Ends when the clip ends. double out_pts = out_pts_origin + TIMEBASE * frameno / global_flags.output_framerate; next_frame_start = origin + microseconds(lrint((out_pts - out_pts_origin) * 1e6 / TIMEBASE)); @@ -195,10 +203,19 @@ void Player::play_playlist_once() out_pts_origin = out_pts - TIMEBASE * frameno / global_flags.output_framerate; } + if (should_skip_to_next.exchange(false)) { // Test and clear. + Clip *clip = &clip_list[clip_idx].clip; // Get a non-const pointer. + 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) { @@ -265,7 +282,7 @@ void Player::play_playlist_once() // NOTE: None of this will take into account any snapping done below. double clip_progress = calc_progress(*clip, in_pts_for_progress); map progress{ { clip_list[clip_idx].id, clip_progress } }; - double time_remaining; + TimeRemaining time_remaining; if (next_clip != nullptr && time_left_this_clip <= next_clip_fade_time) { double next_clip_progress = calc_progress(*next_clip, in_pts_secondary_for_progress); progress[clip_list[clip_idx + 1].id] = next_clip_progress; @@ -333,30 +350,21 @@ void Player::play_playlist_once() ss.imbue(locale("C")); ss.precision(3); ss << "Futatabi " NAGERU_VERSION ";PLAYING;"; - ss << fixed << time_remaining; + 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. - double pts_snap_tolerance = 0.01 * double(TIMEBASE) / global_flags.output_framerate; + double pts_snap_tolerance = 0.01 * double(TIMEBASE) * clip->speed / global_flags.output_framerate; bool snapped = false; for (FrameOnDisk snap_frame : { frame_lower, frame_upper }) { 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; @@ -366,6 +374,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 @@ -412,7 +429,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. } @@ -433,7 +450,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) { @@ -452,7 +469,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. @@ -470,6 +487,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); @@ -481,6 +499,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; @@ -596,30 +620,34 @@ void Player::release_queue_spot() new_clip_changed.notify_all(); } -double compute_time_left(const vector &clips, size_t currently_playing_idx, double progress_currently_playing) +TimeRemaining compute_time_left(const vector &clips, size_t currently_playing_idx, double progress_currently_playing) { // Look at the last clip and then start counting from there. - double remaining = 0.0; + TimeRemaining remaining { 0, 0.0 }; double last_fade_time_seconds = 0.0; 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 (row == currently_playing_idx) { - // A clip we're playing: Subtract the part we've already played. - remaining = clip_length * (1.0 - progress_currently_playing); + if (clip_length >= 86400.0) { // More than one day. + ++remaining.num_infinite; } else { - // A clip we haven't played yet: Subtract the part that's overlapping - // with a previous clip (due to fade). - remaining += max(clip_length - last_fade_time_seconds, 0.0); + if (row == currently_playing_idx) { + // A clip we're playing: Subtract the part we've already played. + remaining.t = clip_length * (1.0 - progress_currently_playing); + } else { + // A clip we haven't played yet: Subtract the part that's overlapping + // with a previous clip (due to fade). + remaining.t += max(clip_length - last_fade_time_seconds, 0.0); + } } last_fade_time_seconds = min(clip_length, clip.fade_time_seconds); } return remaining; } -string format_duration(double t) +string format_duration(TimeRemaining t) { - int t_ms = lrint(t * 1e3); + int t_ms = lrint(t.t * 1e3); int ms = t_ms % 1000; t_ms /= 1000; @@ -628,6 +656,16 @@ string format_duration(double t) int m = t_ms; char buf[256]; - snprintf(buf, sizeof(buf), "%d:%02d.%03d", m, s, ms); + if (t.num_infinite > 1 && t.t > 0.0) { + snprintf(buf, sizeof(buf), "%zu clips + %d:%02d.%03d", t.num_infinite, m, s, ms); + } else if (t.num_infinite > 1) { + snprintf(buf, sizeof(buf), "%zu clips", t.num_infinite); + } else if (t.num_infinite == 1 && t.t > 0.0) { + snprintf(buf, sizeof(buf), "%zu clip + %d:%02d.%03d", t.num_infinite, m, s, ms); + } else if (t.num_infinite == 1) { + snprintf(buf, sizeof(buf), "%zu clip", t.num_infinite); + } else { + snprintf(buf, sizeof(buf), "%d:%02d.%03d", m, s, ms); + } return buf; }