X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=futatabi%2Fplayer.cpp;h=ce165d03f90461066e38cd312a76ef27948b0eea;hb=46ab69c1586b8920ce2735bdf2a0bbc811ee48fd;hp=cebc317801c4588f81170dcf02b82b0c8cbe167f;hpb=0403c737e76f127d046fcdf9eec7b2e3258833d8;p=nageru

diff --git a/futatabi/player.cpp b/futatabi/player.cpp
index cebc317..ce165d0 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.
 	{
@@ -184,9 +185,16 @@ void Player::play_playlist_once()
 			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 (in_pts >= clip->pts_out) {
 				break;
 			}
@@ -194,7 +202,6 @@ void Player::play_playlist_once()
 			{
 				lock_guard<mutex> lock(queue_state_mu);
 				if (splice_ready) {
-					fprintf(stderr, "splicing\n");
 					if (next_clip == nullptr) {
 						do_splice(to_splice_clip_list, clip_idx, -1, &clip_list);
 					} else {
@@ -343,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) {
@@ -506,11 +513,12 @@ Player::Player(JPEGFrameView *destination, Player::StreamOutput stream_output, A
 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)