X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=futatabi%2Fplayer.cpp;h=30dccc8e4e88132664d26cd4e8f7058586c6c430;hb=873c8b204ab70622f6e231556cc94d3aab1889ce;hp=f8eb57eb58692b23d1992fb7f6dbd5e5ad9174bf;hpb=4d334dafa066cf9af7899a555e1145d1e4dd0b3d;p=nageru diff --git a/futatabi/player.cpp b/futatabi/player.cpp index f8eb57e..30dccc8 100644 --- a/futatabi/player.cpp +++ b/futatabi/player.cpp @@ -50,9 +50,6 @@ void Player::thread_func(AVFormatContext *file_avctx) while (!should_quit) { play_playlist_once(); - if (done_callback != nullptr) { - done_callback(); - } } } @@ -116,6 +113,8 @@ void Player::play_playlist_once() vector clip_list; bool clip_ready; steady_clock::time_point before_sleep = steady_clock::now(); + string pause_status; + float master_speed = 1.0f; // Wait until we're supposed to play something. { @@ -134,6 +133,8 @@ void Player::play_playlist_once() queued_clip_list.clear(); assert(!clip_list.empty()); assert(!splice_ready); // This corner case should have been handled in splice_play(). + } else { + pause_status = this->pause_status; } } @@ -143,7 +144,9 @@ void Player::play_playlist_once() if (!clip_ready) { if (video_stream != nullptr) { ++metric_refresh_frame; - video_stream->schedule_refresh_frame(steady_clock::now(), pts, /*display_func=*/nullptr, QueueSpotHolder()); + string subtitle = "Futatabi " NAGERU_VERSION ";PAUSED;0.000;" + pause_status; + video_stream->schedule_refresh_frame(steady_clock::now(), pts, /*display_func=*/nullptr, QueueSpotHolder(), + subtitle); } return; } @@ -182,9 +185,16 @@ void Player::play_playlist_once() 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)); - int64_t in_pts = lrint(in_pts_origin + TIMEBASE * frameno * clip->speed / global_flags.output_framerate); + int64_t in_pts = lrint(in_pts_origin + TIMEBASE * frameno * clip->speed * master_speed / global_flags.output_framerate); pts = lrint(out_pts); + float new_master_speed = change_master_speed.exchange(0.0f / 0.0f); + if (!std::isnan(new_master_speed)) { + master_speed = new_master_speed; + in_pts_origin = in_pts - TIMEBASE * frameno * clip->speed * master_speed / global_flags.output_framerate; + out_pts_origin = out_pts - TIMEBASE * frameno / global_flags.output_framerate; + } + if (in_pts >= clip->pts_out) { break; } @@ -192,7 +202,6 @@ void Player::play_playlist_once() { lock_guard lock(queue_state_mu); if (splice_ready) { - fprintf(stderr, "splicing\n"); if (next_clip == nullptr) { do_splice(to_splice_clip_list, clip_idx, -1, &clip_list); } else { @@ -253,18 +262,18 @@ 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; + 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; + time_remaining = compute_time_left(clip_list, clip_idx + 1, next_clip_progress); + } else { + time_remaining = compute_time_left(clip_list, clip_idx, clip_progress); + } if (progress_callback != nullptr) { - // 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; - 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; - time_remaining = compute_time_left(clip_list, clip_idx + 1, next_clip_progress); - } else { - time_remaining = compute_time_left(clip_list, clip_idx, clip_progress); - } progress_callback(progress, time_remaining); } @@ -318,11 +327,23 @@ void Player::play_playlist_once() } } + string subtitle; + { + stringstream ss; + ss.imbue(locale("C")); + ss.precision(3); + ss << "Futatabi " NAGERU_VERSION ";PLAYING;"; + ss << fixed << time_remaining; + 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); + secondary_frame, fade_alpha, next_frame_start, /*snapped=*/false, + subtitle); continue; } @@ -334,7 +355,8 @@ void Player::play_playlist_once() 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); + secondary_frame, fade_alpha, next_frame_start, /*snapped=*/true, + subtitle); in_pts_origin += snap_frame.pts - in_pts; snapped = true; break; @@ -390,7 +412,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); + secondary_frame, fade_alpha, subtitle); last_pts_played = in_pts; // Not really needed; only previews use last_pts_played. } @@ -405,9 +427,13 @@ void Player::play_playlist_once() in_pts_origin = next_clip->pts_in + lrint(next_clip_fade_time * TIMEBASE * clip->speed); } } + + if (done_callback != nullptr) { + done_callback(); + } } -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) +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) { auto display_func = [this, primary_stream_idx, primary_frame, secondary_frame, fade_alpha] { if (destination != nullptr) { @@ -426,7 +452,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); + primary_frame, subtitle); } else { assert(secondary_frame.pts != -1); // NOTE: We could be increasing unused metrics for previews, but that's harmless. @@ -437,7 +463,7 @@ void Player::display_single_frame(int primary_stream_idx, const FrameOnDisk &pri } video_stream->schedule_faded_frame(frame_start, pts, display_func, QueueSpotHolder(this), primary_frame, - secondary_frame, fade_alpha); + secondary_frame, fade_alpha, subtitle); } } last_pts_played = primary_frame.pts; @@ -487,11 +513,12 @@ Player::Player(JPEGFrameView *destination, Player::StreamOutput stream_output, A Player::~Player() { should_quit = true; + new_clip_changed.notify_all(); + player_thread.join(); + if (video_stream != nullptr) { video_stream->stop(); } - new_clip_changed.notify_all(); - player_thread.join(); } void Player::play(const vector &clips) @@ -506,7 +533,7 @@ void Player::play(const vector &clips) void Player::splice_play(const vector &clips) { - lock_guard lock(queue_state_mu); + lock_guard lock(queue_state_mu); if (new_clip_ready) { queued_clip_list = clips; assert(!splice_ready); @@ -569,7 +596,7 @@ 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) +double 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; @@ -589,3 +616,18 @@ double compute_time_left(const vector &clips, size_t currently_playi } return remaining; } + +string format_duration(double t) +{ + int t_ms = lrint(t * 1e3); + + int ms = t_ms % 1000; + t_ms /= 1000; + int s = t_ms % 60; + t_ms /= 60; + int m = t_ms; + + char buf[256]; + snprintf(buf, sizeof(buf), "%d:%02d.%03d", m, s, ms); + return buf; +}