old_list->insert(old_list->end(), new_list.begin() + splice_start_new_list, new_list.end());
}
+// Keeps track of the various timelines (wall clock time, output pts,
+// position in the clip we are playing). Generally we keep an origin
+// and assume we increase linearly from there; the intention is to
+// avoid getting compounded accuracy errors, although with double,
+// that is perhaps overkill. (Whenever we break the linear assumption,
+// we need to reset said origin.)
+class TimelineTracker
+{
+public:
+ struct Instant {
+ steady_clock::time_point wallclock_time;
+ int64_t in_pts;
+ int64_t out_pts;
+ int64_t frameno;
+ };
+
+ TimelineTracker(double master_speed, int64_t out_pts_origin)
+ : master_speed(master_speed), last_out_pts(out_pts_origin) {
+ origin.out_pts = out_pts_origin;
+ master_speed_ease_target = master_speed; // Keeps GCC happy.
+ }
+
+ void new_clip(steady_clock::time_point wallclock_origin, const Clip *clip, int64_t start_pts_offset)
+ {
+ this->clip = clip;
+ origin.wallclock_time = wallclock_origin;
+ origin.in_pts = clip->pts_in + start_pts_offset;
+ origin.out_pts = last_out_pts;
+ origin.frameno = 0;
+ }
+
+ // Returns the current time for said frame.
+ Instant advance_to_frame(int64_t frameno);
+
+ int64_t get_in_pts_origin() const { return origin.in_pts; }
+ bool playing_at_normal_speed() const {
+ if (in_easing) return false;
+
+ const double effective_speed = clip->speed * master_speed;
+ return effective_speed >= 0.999 && effective_speed <= 1.001;
+ }
+
+ void snap_by(int64_t offset) {
+ if (in_easing) {
+ // Easing will normally aim for a snap at the very end,
+ // so don't disturb it by jittering during the ease.
+ return;
+ }
+ origin.in_pts += offset;
+ }
+
+ void change_master_speed(double new_master_speed, Instant now);
+
+ float in_master_speed(float speed) const {
+ return (!in_easing && fabs(master_speed - speed) < 1e-6);
+ }
+
+ // Instead of changing the speed instantly, change it over the course of
+ // about 200 ms. This is a simple linear ramp; I tried various forms of
+ // Bézier curves for more elegant/dramatic changing, but it seemed linear
+ // looked just as good in practical video.
+ void start_easing(double new_master_speed, int64_t length_out_pts, Instant now);
+
+ int64_t find_easing_length(double master_speed_target, int64_t length_out_pts, const vector<FrameOnDisk> &frames, Instant now);
+
+private:
+ // Find out how far we are into the easing curve (0..1).
+ // We use this to adjust the input pts.
+ double find_ease_t(double out_pts) const;
+ double easing_out_pts_adjustment(double out_pts) const;
+
+ double master_speed;
+ const Clip *clip = nullptr;
+ Instant origin;
+ int64_t last_out_pts;
+
+ // If easing between new and old master speeds.
+ bool in_easing = false;
+ int64_t ease_started_pts = 0;
+ double master_speed_ease_target;
+ int64_t ease_length_out_pts = 0;
+};
+
+TimelineTracker::Instant TimelineTracker::advance_to_frame(int64_t frameno)
+{
+ Instant ret;
+ double in_pts_double = origin.in_pts + TIMEBASE * clip->speed * (frameno - origin.frameno) * master_speed / global_flags.output_framerate;
+ double out_pts_double = origin.out_pts + TIMEBASE * (frameno - origin.frameno) / global_flags.output_framerate;
+
+ if (in_easing) {
+ double in_pts_adjustment = easing_out_pts_adjustment(out_pts_double) * clip->speed;
+ in_pts_double += in_pts_adjustment;
+ }
+
+ ret.in_pts = lrint(in_pts_double);
+ ret.out_pts = lrint(out_pts_double);
+ ret.wallclock_time = origin.wallclock_time + microseconds(lrint((out_pts_double - origin.out_pts) * 1e6 / TIMEBASE));
+ ret.frameno = frameno;
+
+ last_out_pts = ret.out_pts;
+
+ if (in_easing && ret.out_pts >= ease_started_pts + ease_length_out_pts) {
+ // We have ended easing. Add what we need for the entire easing period,
+ // then _actually_ change the speed as we go back into normal mode.
+ origin.out_pts += easing_out_pts_adjustment(out_pts_double);
+ change_master_speed(master_speed_ease_target, ret);
+ in_easing = false;
+ }
+
+ return ret;
+}
+
+void TimelineTracker::change_master_speed(double new_master_speed, Instant now)
+{
+ master_speed = new_master_speed;
+
+ // Reset the origins, since the calculations depend on linear interpolation
+ // based on the master speed.
+ origin = now;
+}
+
+void TimelineTracker::start_easing(double new_master_speed, int64_t length_out_pts, Instant now)
+{
+ if (in_easing) {
+ // Apply whatever we managed to complete of the previous easing.
+ origin.out_pts += easing_out_pts_adjustment(now.out_pts);
+ double reached_speed = master_speed + (master_speed_ease_target - master_speed) * find_ease_t(now.out_pts);
+ change_master_speed(reached_speed, now);
+ }
+ in_easing = true;
+ ease_started_pts = now.out_pts;
+ master_speed_ease_target = new_master_speed;
+ ease_length_out_pts = length_out_pts;
+}
+
+double TimelineTracker::find_ease_t(double out_pts) const
+{
+ return (out_pts - ease_started_pts) / double(ease_length_out_pts);
+}
+
+double TimelineTracker::easing_out_pts_adjustment(double out_pts) const
+{
+ double t = find_ease_t(out_pts);
+ double area_factor = (master_speed_ease_target - master_speed) * ease_length_out_pts;
+ double val = 0.5 * min(t, 1.0) * min(t, 1.0) * area_factor;
+ if (t > 1.0) {
+ val += area_factor * (t - 1.0);
+ }
+ return val;
+}
+
+int64_t TimelineTracker::find_easing_length(double master_speed_target, int64_t desired_length_out_pts, const vector<FrameOnDisk> &frames, Instant now)
+{
+ // Find out what frame we would have hit (approximately) with the given ease length.
+ double in_pts_length = 0.5 * (master_speed_target + master_speed) * desired_length_out_pts * clip->speed;
+ const int input_frame_num = distance(
+ frames.begin(),
+ find_first_frame_at_or_after(frames, lrint(now.in_pts + in_pts_length)));
+
+ // Round length_out_pts to the nearest amount of whole frames.
+ const double frame_length = TIMEBASE / global_flags.output_framerate;
+ const int length_out_frames = lrint(desired_length_out_pts / frame_length);
+
+ // Time the easing so that we aim at 200 ms (or whatever length_out_pts
+ // was), but adjust it so that we hit exactly on a frame. Unless we are
+ // somehow unlucky and run in the middle of a bad fade, this should
+ // lock us nicely into a cadence where we hit original frames (of course
+ // assuming the new speed is a reasonable ratio).
+ //
+ // Assume for a moment that we are easing into a slowdown, and that
+ // we're slightly too late to hit the frame we want to. This means that
+ // we can shorten the ease a bit; this chops some of the total integrated
+ // velocity and arrive at the frame a bit sooner. Solve for the time
+ // we want to shorten the ease by (let's call it x, where the original
+ // length of the ease is called len) such that we hit exactly the in
+ // pts at the right time:
+ //
+ // 0.5 * (mst + ms) * (len - x) * cs + mst * x * cs = desired_len_in_pts
+ //
+ // gives
+ //
+ // x = (2 * desired_len_in_pts / cs - (mst + ms) * len) / (mst - ms)
+ //
+ // Conveniently, this holds even if we are too early; a negative x
+ // (surprisingly!) gives a lenghtening such that we don't hit the desired
+ // frame, but hit one slightly later. (x larger than len means that
+ // it's impossible to hit the desired frame, even if we dropped the ease
+ // altogether and just changed speeds instantly.) We also have sign invariance,
+ // so that these properties hold even if we are speeding up, not slowing
+ // down. Together, these two properties mean that we can cast a fairly
+ // wide net, trying various input and output frames and seeing which ones
+ // can be matched up with a minimal change to easing time. (This lets us
+ // e.g. end the ease close to the midpoint between two endpoint frames
+ // even if we don't know the frame rate, or deal fairly robustly with
+ // dropped input frames.) Many of these will give us the same answer,
+ // but that's fine, because the ease length is the only output.
+ int64_t best_length_out_pts = TIMEBASE * 10; // Infinite.
+ for (int output_frame_offset = -2; output_frame_offset <= 2; ++output_frame_offset) {
+ int64_t aim_length_out_pts = lrint((length_out_frames + output_frame_offset) * frame_length);
+ if (aim_length_out_pts < 0) {
+ continue;
+ }
+
+ for (int input_frame_offset = -2; input_frame_offset <= 2; ++input_frame_offset) {
+ if (input_frame_num + input_frame_offset < 0 ||
+ input_frame_num + input_frame_offset >= int(frames.size())) {
+ continue;
+ }
+ const int64_t in_pts = frames[input_frame_num + input_frame_offset].pts;
+ double shorten_by_out_pts = (2.0 * (in_pts - now.in_pts) / clip->speed - (master_speed_target + master_speed) * aim_length_out_pts) / (master_speed_target - master_speed);
+ int64_t length_out_pts = lrint(aim_length_out_pts - shorten_by_out_pts);
+
+ if (length_out_pts >= 0 &&
+ abs(length_out_pts - desired_length_out_pts) < abs(best_length_out_pts - desired_length_out_pts)) {
+ best_length_out_pts = length_out_pts;
+ }
+ }
+ }
+
+ // If we need more than two seconds of easing, we give up --
+ // this can happen if we're e.g. going from 101% to 100%.
+ // If so, it would be better to let other mechanisms, such as the switch
+ // to the next clip, deal with getting us back into sync.
+ if (best_length_out_pts > TIMEBASE * 2) {
+ return desired_length_out_pts;
+ } else {
+ return best_length_out_pts;
+ }
+}
+
} // namespace
void Player::play_playlist_once()
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.
{
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;
+ TimelineTracker timeline(start_master_speed, pts);
+ timeline.new_clip(origin, &clip_list[0].clip, /*pts_offset=*/0);
for (size_t clip_idx = 0; clip_idx < clip_list.size(); ++clip_idx) {
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_this_clip = double(clip->pts_out - timeline.get_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);
}
lock_guard<mutex> lock(frame_mu);
// Find the first frame such that frame.pts <= in_pts.
- auto it = find_last_frame_before(frames[stream_idx], in_pts_origin);
+ auto it = find_last_frame_before(frames[stream_idx], timeline.get_in_pts_origin());
if (it != frames[stream_idx].end()) {
- in_pts_origin = it->pts;
+ timeline.snap_by(it->pts - timeline.get_in_pts_origin());
}
}
steady_clock::time_point next_frame_start;
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 * master_speed / global_flags.output_framerate);
- pts = lrint(out_pts);
+ TimelineTracker::Instant instant = timeline.advance_to_frame(frameno);
+ int64_t in_pts = instant.in_pts;
+ pts = instant.out_pts;
+ next_frame_start = instant.wallclock_time;
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 (!std::isnan(new_master_speed) && !timeline.in_master_speed(new_master_speed)) {
+ int64_t ease_length_out_pts = TIMEBASE / 5; // 200 ms.
+ int64_t recommended_pts_length = timeline.find_easing_length(new_master_speed, ease_length_out_pts, frames[clip->stream_idx], instant);
+ timeline.start_easing(new_master_speed, recommended_pts_length, instant);
}
if (should_skip_to_next.exchange(false)) { // Test and clear.
// 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;
+ const bool play_audio = timeline.playing_at_normal_speed();
{
lock_guard<mutex> lock(queue_state_mu);
// (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_this_clip = double(clip->pts_out - timeline.get_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);
}
display_single_frame(primary_stream_idx, snap_frame, secondary_stream_idx,
secondary_frame, fade_alpha, next_frame_start, /*snapped=*/true,
subtitle, play_audio);
- in_pts_origin += snap_frame.pts - in_pts;
+ timeline.snap_by(snap_frame.pts - in_pts);
snapped = true;
break;
}
1.0 / 5.0, 2.0 / 5.0, 3.0 / 5.0, 4.0 / 5.0 }) {
double subsnap_pts = frame_lower.pts + fraction * (frame_upper.pts - frame_lower.pts);
if (fabs(subsnap_pts - in_pts) < pts_snap_tolerance) {
- in_pts_origin += lrint(subsnap_pts) - in_pts;
+ timeline.snap_by(lrint(subsnap_pts) - in_pts);
in_pts = lrint(subsnap_pts);
break;
}
// 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);
+ timeline.new_clip(next_frame_start, next_clip, /*pts_start_offset=*/lrint(next_clip_fade_time * TIMEBASE * clip->speed));
}
}
projects / nageru / blobdiff