QOpenGLContext *context = create_context(surface);
if (!make_current(context, surface)) {
printf("oops\n");
- exit(1);
+ abort();
}
check_error();
while (!should_quit) {
play_playlist_once();
- if (done_callback != nullptr) {
- done_callback();
- }
}
}
return double(pts - clip.pts_in) / (clip.pts_out - clip.pts_in);
}
+void do_splice(const vector<ClipWithID> &new_list, size_t playing_index1, ssize_t playing_index2, vector<ClipWithID> *old_list)
+{
+ assert(playing_index2 == -1 || size_t(playing_index2) == playing_index1 + 1);
+
+ // First see if we can do the simple thing; find an element in the new
+ // list that we are already playing, which will serve as our splice point.
+ int splice_start_new_list = -1;
+ for (size_t clip_idx = 0; clip_idx < new_list.size(); ++clip_idx) {
+ if (new_list[clip_idx].id == (*old_list)[playing_index1].id) {
+ splice_start_new_list = clip_idx + 1;
+ } else if (playing_index2 != -1 && new_list[clip_idx].id == (*old_list)[playing_index2].id) {
+ splice_start_new_list = clip_idx + 1;
+ }
+ }
+ if (splice_start_new_list == -1) {
+ // OK, so the playing items are no longer in the new list. Most likely,
+ // that means we deleted some range that included them. But the ones
+ // before should stay put -- and we don't want to play them. So find
+ // the ones that we've already played, and ignore them. Hopefully,
+ // they're contiguous; the last one that's not seen will be our cut point.
+ //
+ // Keeping track of the playlist range explicitly in the UI would remove
+ // the need for these heuristics, but it would probably also mean we'd
+ // have to lock the playing clip, which sounds annoying.
+ unordered_map<uint64_t, size_t> played_ids;
+ for (size_t clip_idx = 0; clip_idx < playing_index1; ++old_list) {
+ played_ids.emplace((*old_list)[clip_idx].id, clip_idx);
+ }
+ for (size_t clip_idx = 0; clip_idx < new_list.size(); ++clip_idx) {
+ if (played_ids.count(new_list[clip_idx].id)) {
+ splice_start_new_list = clip_idx + 1;
+ }
+ }
+
+ if (splice_start_new_list == -1) {
+ // OK, we didn't find any matches; the lists are totally distinct.
+ // So probably the entire thing was deleted; leave it alone.
+ return;
+ }
+ }
+
+ size_t splice_start_old_list = ((playing_index2 == -1) ? playing_index1 : playing_index2) + 1;
+ old_list->erase(old_list->begin() + splice_start_old_list, old_list->end());
+ old_list->insert(old_list->end(), new_list.begin() + splice_start_new_list, new_list.end());
+}
+
} // namespace
void Player::play_playlist_once()
vector<ClipWithID> clip_list;
bool clip_ready;
steady_clock::time_point before_sleep = steady_clock::now();
+ string pause_status;
+ float master_speed = start_master_speed;
// Wait until we're supposed to play something.
{
clip_list = move(queued_clip_list);
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;
}
}
steady_clock::duration time_slept = steady_clock::now() - before_sleep;
- pts += duration_cast<duration<size_t, TimebaseRatio>>(time_slept).count();
+ int64_t slept_pts = duration_cast<duration<size_t, TimebaseRatio>>(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) {
++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;
}
+ 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) {
- const Clip &clip = clip_list[clip_idx].clip;
+ const Clip *clip = &clip_list[clip_idx].clip;
const Clip *next_clip = (clip_idx + 1 < clip_list.size()) ? &clip_list[clip_idx + 1].clip : nullptr;
int64_t out_pts_origin = pts;
double next_clip_fade_time = -1.0;
if (next_clip != nullptr) {
- double duration_this_clip = double(clip.pts_out - in_pts_origin) / TIMEBASE / clip.speed;
- double duration_next_clip = double(next_clip->pts_out - next_clip->pts_in) / TIMEBASE / clip.speed;
- next_clip_fade_time = min(min(duration_this_clip, duration_next_clip), clip.fade_time_seconds);
+ double duration_this_clip = double(clip->pts_out - in_pts_origin) / TIMEBASE / clip->speed;
+ double duration_next_clip = double(next_clip->pts_out - next_clip->pts_in) / TIMEBASE / clip->speed;
+ next_clip_fade_time = min(min(duration_this_clip, duration_next_clip), clip->fade_time_seconds);
}
- int stream_idx = clip.stream_idx;
+ int stream_idx = clip->stream_idx;
// Start playing exactly at a frame.
// TODO: Snap secondary (fade-to) clips in the same fashion
}
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));
- 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);
- if (in_pts >= clip.pts_out) {
+ 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 (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<int64_t>(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<mutex> lock(queue_state_mu);
+ if (splice_ready) {
+ if (next_clip == nullptr) {
+ do_splice(to_splice_clip_list, clip_idx, -1, &clip_list);
+ } else {
+ do_splice(to_splice_clip_list, clip_idx, clip_idx + 1, &clip_list);
+ }
+ to_splice_clip_list.clear();
+ splice_ready = false;
+
+ // Refresh the clip pointer, since the clip list may have been reallocated.
+ clip = &clip_list[clip_idx].clip;
+
+ // Recompute next_clip and any needed fade times, since the next clip may have changed
+ // (or we may have gone from no new clip to having one, or the other way).
+ next_clip = (clip_idx + 1 < clip_list.size()) ? &clip_list[clip_idx + 1].clip : nullptr;
+ if (next_clip != nullptr) {
+ double duration_this_clip = double(clip->pts_out - in_pts) / TIMEBASE / clip->speed;
+ double duration_next_clip = double(next_clip->pts_out - next_clip->pts_in) / TIMEBASE / clip->speed;
+ next_clip_fade_time = min(min(duration_this_clip, duration_next_clip), clip->fade_time_seconds);
+ }
+ }
+ }
+
steady_clock::duration time_behind = steady_clock::now() - next_frame_start;
if (stream_output != FILE_STREAM_OUTPUT && time_behind >= milliseconds(200)) {
fprintf(stderr, "WARNING: %ld ms behind, dropping a frame (no matter the type).\n",
FrameOnDisk secondary_frame;
int secondary_stream_idx = -1;
float fade_alpha = 0.0f;
- double time_left_this_clip = double(clip.pts_out - in_pts) / TIMEBASE / clip.speed;
+ double time_left_this_clip = double(clip->pts_out - in_pts) / TIMEBASE / clip->speed;
if (next_clip != nullptr && time_left_this_clip <= next_clip_fade_time) {
- // We're in a fade to the next clip.
+ // We're in a fade to the next clip->
secondary_stream_idx = next_clip->stream_idx;
- int64_t in_pts_secondary = lrint(next_clip->pts_in + (next_clip_fade_time - time_left_this_clip) * TIMEBASE * clip.speed);
+ int64_t in_pts_secondary = lrint(next_clip->pts_in + (next_clip_fade_time - time_left_this_clip) * TIMEBASE * clip->speed);
in_pts_secondary_for_progress = in_pts_secondary;
fade_alpha = 1.0f - time_left_this_clip / next_clip_fade_time;
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;
}
}
+ // 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 } };
+ 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;
+ 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);
}
}
}
- // 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);
- continue;
+ string subtitle;
+ {
+ stringstream ss;
+ ss.imbue(locale("C"));
+ ss.precision(3);
+ ss << "Futatabi " NAGERU_VERSION ";PLAYING;";
+ ss << fixed << (time_remaining.num_infinite * 86400.0 + time_remaining.t);
+ ss << ";" << format_duration(time_remaining) << " left";
+ subtitle = ss.str();
}
// 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);
+ secondary_frame, fade_alpha, next_frame_start, /*snapped=*/true,
+ subtitle, play_audio);
in_pts_origin += snap_frame.pts - in_pts;
snapped = true;
break;
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
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, play_audio);
last_pts_played = in_pts; // Not really needed; only previews use last_pts_played.
}
// Start the next clip from the point where the fade went out.
if (next_clip != nullptr) {
origin = next_frame_start;
- in_pts_origin = next_clip->pts_in + lrint(next_clip_fade_time * TIMEBASE * clip.speed);
+ 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, bool play_audio)
{
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, play_audio);
} 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;
}
// 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<mutex> lock(frame_mu);
}
*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;
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)
lock_guard<mutex> lock(queue_state_mu);
new_clip_ready = true;
queued_clip_list = clips;
+ splice_ready = false;
override_stream_idx = -1;
new_clip_changed.notify_all();
}
+void Player::splice_play(const vector<ClipWithID> &clips)
+{
+ lock_guard<mutex> lock(queue_state_mu);
+ if (new_clip_ready) {
+ queued_clip_list = clips;
+ assert(!splice_ready);
+ return;
+ }
+
+ splice_ready = true;
+ to_splice_clip_list = clips; // Overwrite any queued but not executed splice.
+}
+
void Player::override_angle(unsigned stream_idx)
{
int64_t last_pts;
new_clip_changed.notify_all();
}
-double compute_time_left(const vector<ClipWithID> &clips, size_t currently_playing_idx, double progress_currently_playing)
+TimeRemaining 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;
+ 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 || clip.pts_out == -1) { // 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(TimeRemaining t)
+{
+ int t_ms = lrint(t.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];
+ 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;
+}
projects / nageru / blobdiff