Fix an overflow issue with long (>= 10 min) clips.

[nageru] / futatabi / player.cpp

diff --git a/futatabi/player.cpp b/futatabi/player.cpp
index 30dccc8e4e88132664d26cd4e8f7058586c6c430..9c20278702abcb4a50a6284068667b0dad102602 100644 (file)
--- a/futatabi/player.cpp
+++ b/futatabi/player.cpp
@@ -181,7 +181,7 @@ void Player::play_playlist_once()
                }
 
                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));
@@ -350,7 +350,7 @@ void Player::play_playlist_once()
                        // 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) {