X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=futatabi%2Fplayer.cpp;h=586df48c470bf0ec4a8682df31da60334b2cdccc;hb=c664eca0541eb9e813c0ead7fa596200eb51b45b;hp=30dccc8e4e88132664d26cd4e8f7058586c6c430;hpb=2c9a83aeae44dae6a0bbfbae33719976e6d527af;p=nageru

diff --git a/futatabi/player.cpp b/futatabi/player.cpp
index 30dccc8..586df48 100644
--- a/futatabi/player.cpp
+++ b/futatabi/player.cpp
@@ -151,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) {
@@ -181,7 +182,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));
@@ -195,6 +196,12 @@ void Player::play_playlist_once()
 				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;
 			}
@@ -265,7 +272,7 @@ void Player::play_playlist_once()
 			// NOTE: None of this will take into account any snapping done below.
 			double clip_progress = calc_progress(*clip, in_pts_for_progress);
 			map<uint64_t, double> progress{ { clip_list[clip_idx].id, clip_progress } };
-			double time_remaining;
+			TimeRemaining time_remaining;
 			if (next_clip != nullptr && time_left_this_clip <= next_clip_fade_time) {
 				double next_clip_progress = calc_progress(*next_clip, in_pts_secondary_for_progress);
 				progress[clip_list[clip_idx + 1].id] = next_clip_progress;
@@ -333,7 +340,7 @@ void Player::play_playlist_once()
 				ss.imbue(locale("C"));
 				ss.precision(3);
 				ss << "Futatabi " NAGERU_VERSION ";PLAYING;";
-				ss << fixed << time_remaining;
+				ss << fixed << (time_remaining.num_infinite * 86400.0 + time_remaining.t);
 				ss << ";" << format_duration(time_remaining) << " left";
 				subtitle = ss.str();
 			}
@@ -350,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) {
@@ -596,30 +603,34 @@ void Player::release_queue_spot()
 	new_clip_changed.notify_all();
 }
 
-double compute_time_left(const vector<ClipWithID> &clips, size_t currently_playing_idx, double progress_currently_playing)
+TimeRemaining compute_time_left(const vector<ClipWithID> &clips, size_t currently_playing_idx, double progress_currently_playing)
 {
 	// Look at the last clip and then start counting from there.
-	double remaining = 0.0;
+	TimeRemaining remaining { 0, 0.0 };
 	double last_fade_time_seconds = 0.0;
 	for (size_t row = currently_playing_idx; row < clips.size(); ++row) {
 		const Clip &clip = clips[row].clip;
 		double clip_length = double(clip.pts_out - clip.pts_in) / TIMEBASE / clip.speed;
-		if (row == currently_playing_idx) {
-			// A clip we're playing: Subtract the part we've already played.
-			remaining = clip_length * (1.0 - progress_currently_playing);
+		if (clip_length >= 86400.0) {  // More than one day.
+			++remaining.num_infinite;
 		} else {
-			// A clip we haven't played yet: Subtract the part that's overlapping
-			// with a previous clip (due to fade).
-			remaining += max(clip_length - last_fade_time_seconds, 0.0);
+			if (row == currently_playing_idx) {
+				// A clip we're playing: Subtract the part we've already played.
+				remaining.t = clip_length * (1.0 - progress_currently_playing);
+			} else {
+				// A clip we haven't played yet: Subtract the part that's overlapping
+				// with a previous clip (due to fade).
+				remaining.t += max(clip_length - last_fade_time_seconds, 0.0);
+			}
 		}
 		last_fade_time_seconds = min(clip_length, clip.fade_time_seconds);
 	}
 	return remaining;
 }
 
-string format_duration(double t)
+string format_duration(TimeRemaining t)
 {
-	int t_ms = lrint(t * 1e3);
+	int t_ms = lrint(t.t * 1e3);
 
 	int ms = t_ms % 1000;
 	t_ms /= 1000;
@@ -628,6 +639,16 @@ string format_duration(double t)
 	int m = t_ms;
 
 	char buf[256];
-	snprintf(buf, sizeof(buf), "%d:%02d.%03d", m, s, ms);
+	if (t.num_infinite > 1 && t.t > 0.0) {
+		snprintf(buf, sizeof(buf), "%zu clips + %d:%02d.%03d", t.num_infinite, m, s, ms);
+	} else if (t.num_infinite > 1) {
+		snprintf(buf, sizeof(buf), "%zu clips", t.num_infinite);
+	} else if (t.num_infinite == 1 && t.t > 0.0) {
+		snprintf(buf, sizeof(buf), "%zu clip + %d:%02d.%03d", t.num_infinite, m, s, ms);
+	} else if (t.num_infinite == 1) {
+		snprintf(buf, sizeof(buf), "%zu clip", t.num_infinite);
+	} else {
+		snprintf(buf, sizeof(buf), "%d:%02d.%03d", m, s, ms);
+	}
 	return buf;
 }