// TODO: Lock to a rational multiple of the frame rate if possible.
double speed = 0.5;
- bool aborted = false;
for (int frameno = 0; ; ++frameno) { // Ends when the clip ends.
double out_pts = out_pts_origin + TIMEBASE * frameno / output_framerate;
steady_clock::time_point next_frame_start =
if (in_pts_lower == in_pts_upper) {
destination->setFrame(stream_idx, in_pts_lower, /*interpolated=*/false);
if (video_stream != nullptr) {
- video_stream->schedule_original_frame(lrint(out_pts), stream_idx, in_pts_lower);
+ video_stream->schedule_original_frame(pts, stream_idx, in_pts_lower);
}
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.
- double in_pts_lower_as_frameno = (in_pts_lower - in_pts_origin) * output_framerate / TIMEBASE / speed;
- double in_pts_upper_as_frameno = (in_pts_upper - in_pts_origin) * output_framerate / TIMEBASE / speed;
- if (fabs(in_pts_lower_as_frameno - frameno) < 0.01) {
- destination->setFrame(stream_idx, in_pts_lower, /*interpolated=*/false);
- if (video_stream != nullptr) {
- video_stream->schedule_original_frame(lrint(out_pts), stream_idx, in_pts_lower);
- }
- in_pts_origin += in_pts_lower - in_pts;
- continue;
- } else if (fabs(in_pts_upper_as_frameno - frameno) < 0.01) {
- destination->setFrame(stream_idx, in_pts_upper, /*interpolated=*/false);
- if (video_stream != nullptr) {
- video_stream->schedule_original_frame(lrint(out_pts), stream_idx, in_pts_upper);
+ bool snapped = false;
+ for (int64_t snap_pts : { in_pts_lower, in_pts_upper }) {
+ double snap_pts_as_frameno = (snap_pts - in_pts_origin) * output_framerate / TIMEBASE / speed;
+ if (fabs(snap_pts_as_frameno - frameno) < 0.01) {
+ destination->setFrame(stream_idx, snap_pts, /*interpolated=*/false);
+ if (video_stream != nullptr) {
+ video_stream->schedule_original_frame(pts, stream_idx, snap_pts);
+ }
+ in_pts_origin += snap_pts - in_pts;
+ snapped = true;
+ break;
}
- in_pts_origin += in_pts_upper - in_pts;
+ }
+ if (snapped) {
continue;
}
} else {
// Calculate the interpolated frame. When it's done, the destination
// will be unblocked.
- destination->setFrame(stream_idx, lrint(out_pts), /*interpolated=*/true);
- video_stream->schedule_interpolated_frame(lrint(out_pts), stream_idx, in_pts_lower, in_pts_upper, alpha);
+ destination->setFrame(stream_idx, pts, /*interpolated=*/true);
+ video_stream->schedule_interpolated_frame(pts, stream_idx, in_pts_lower, in_pts_upper, alpha);
}
}
unique_lock<mutex> lock(queue_state_mu);
playing = false;
}
- if (done_callback != nullptr && !aborted) {
+ if (done_callback != nullptr) {
done_callback();
}
}