while (!should_quit) {
play_playlist_once();
- if (done_callback != nullptr) {
- done_callback();
- }
}
}
vector<ClipWithID> clip_list;
bool clip_ready;
steady_clock::time_point before_sleep = steady_clock::now();
+ string pause_status;
// Wait until we're supposed to play something.
{
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;
}
}
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;
}
}
}
+ // NOTE: None of this will take into account any snapping done below.
+ double clip_progress = calc_progress(*clip, in_pts_for_progress);
+ map<uint64_t, double> 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<uint64_t, double> 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);
}
}
}
+ 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;
}
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;
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.
}
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) {
}
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.
}
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;
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<ClipWithID> &clips)
void Player::splice_play(const vector<ClipWithID> &clips)
{
- lock_guard<mutex> lock(queue_state_mu);
+ lock_guard<mutex> lock(queue_state_mu);
if (new_clip_ready) {
queued_clip_list = clips;
assert(!splice_ready);
new_clip_changed.notify_all();
}
-double compute_time_left(const vector<ClipWithID> &clips, size_t currently_playing_idx, double progress_currently_playing)
+double compute_time_left(const vector<ClipWithID> &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;
}
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;
+}