X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=futatabi%2Fplayer.cpp;h=876c8dcac6b95684e54a4cfb3f354eed8331806c;hb=b3fa9338f37e8c7e2bb9ca07d3417a909fcc6d6e;hp=6a8612f86e43be0f0f2e1740edd31a0c53ec61d9;hpb=2f717d07dd9c87e45e1de6bac6b64d83982f6246;p=nageru

diff --git a/futatabi/player.cpp b/futatabi/player.cpp
index 6a8612f..876c8dc 100644
--- a/futatabi/player.cpp
+++ b/futatabi/player.cpp
@@ -114,6 +114,7 @@ void Player::play_playlist_once()
 	bool clip_ready;
 	steady_clock::time_point before_sleep = steady_clock::now();
 	string pause_status;
+	float master_speed = 1.0f;
 
 	// Wait until we're supposed to play something.
 	{
@@ -150,6 +151,7 @@ void Player::play_playlist_once()
 		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) {
@@ -180,13 +182,26 @@ 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));
-			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);
 
+			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.
+				fprintf(stderr, "pts_out moving to first of %ld and %ld (currently at %f)\n", clip->pts_out, lrint(out_pts + clip->fade_time_seconds * TIMEBASE), out_pts);
+				clip->pts_out = std::min(clip->pts_out, lrint(in_pts + clip->fade_time_seconds * clip->speed * TIMEBASE));
+			}
+
 			if (in_pts >= clip->pts_out) {
 				break;
 			}
@@ -342,7 +357,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) {