X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=futatabi%2Fplayer.cpp;h=263edbfce05590f5b4325c071557bd234eec0cfd;hb=d02bca0f5622abd11b9697b738613f7644c33f59;hp=f342ac57bb60bf8acf682bcff86b02c86dc99314;hpb=4a9e97065dade428e373a83618bc973cd93cbe52;p=nageru

diff --git a/futatabi/player.cpp b/futatabi/player.cpp
index f342ac5..263edbf 100644
--- a/futatabi/player.cpp
+++ b/futatabi/player.cpp
@@ -50,6 +50,9 @@ void Player::thread_func(AVFormatContext *file_avctx)
 
 	while (!should_quit) {
 		play_playlist_once();
+		if (done_callback != nullptr) {
+			done_callback();
+		}
 	}
 }
 
@@ -64,7 +67,7 @@ double calc_progress(const Clip &clip, int64_t pts)
 
 void Player::play_playlist_once()
 {
-	vector<Clip> clip_list;
+	vector<ClipWithID> clip_list;
 	bool clip_ready;
 	steady_clock::time_point before_sleep = steady_clock::now();
 
@@ -99,10 +102,10 @@ void Player::play_playlist_once()
 	}
 
 	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].pts_in;
+	int64_t in_pts_origin = clip_list[0].clip.pts_in;
 	for (size_t clip_idx = 0; clip_idx < clip_list.size(); ++clip_idx) {
-		const Clip &clip = clip_list[clip_idx];
-		const Clip *next_clip = (clip_idx + 1 < clip_list.size()) ? &clip_list[clip_idx + 1] : nullptr;
+		const Clip &clip = clip_list[clip_idx].clip;
+		const Clip *next_clip = (clip_idx + 1 < clip_list.size()) ? &clip_list[clip_idx + 1].clip : nullptr;
 		int64_t out_pts_origin = pts;
 
 		double next_clip_fade_time = -1.0;
@@ -179,11 +182,17 @@ void Player::play_playlist_once()
 
 			if (progress_callback != nullptr) {
 				// NOTE: None of this will take into account any snapping done below.
-				map<size_t, double> progress{ { clip_idx, calc_progress(clip, in_pts_for_progress) } };
+				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;
 				if (next_clip != nullptr && time_left_this_clip <= next_clip_fade_time) {
-					progress[clip_idx + 1] = calc_progress(*next_clip, in_pts_secondary_for_progress);
+					double next_clip_progress = calc_progress(*next_clip, in_pts_secondary_for_progress);
+					progress[clip_list[clip_idx + 1].id] = next_clip_progress;
+					time_remaining = compute_time_left(clip_list, clip_idx + 1, next_clip_progress);
+				} else {
+					time_remaining = compute_time_left(clip_list, clip_idx, clip_progress);
 				}
-				progress_callback(progress);
+				progress_callback(progress, time_remaining);
 			}
 
 			FrameOnDisk frame_lower, frame_upper;
@@ -316,9 +325,6 @@ void Player::play_playlist_once()
 		if (should_quit) {
 			return;
 		}
-		if (done_callback != nullptr) {
-			done_callback();
-		}
 
 		// Start the next clip from the point where the fade went out.
 		if (next_clip != nullptr) {
@@ -326,10 +332,6 @@ void Player::play_playlist_once()
 			in_pts_origin = next_clip->pts_in + lrint(next_clip_fade_time * TIMEBASE * clip.speed);
 		}
 	}
-
-	if (done_callback != nullptr) {
-		done_callback();
-	}
 }
 
 void Player::display_single_frame(int primary_stream_idx, const FrameOnDisk &primary_frame, int secondary_stream_idx, const FrameOnDisk &secondary_frame, double fade_alpha, steady_clock::time_point frame_start, bool snapped)
@@ -419,7 +421,7 @@ Player::~Player()
 	player_thread.join();
 }
 
-void Player::play(const vector<Clip> &clips)
+void Player::play(const vector<ClipWithID> &clips)
 {
 	lock_guard<mutex> lock(queue_state_mu);
 	new_clip_ready = true;
@@ -437,7 +439,7 @@ void Player::override_angle(unsigned stream_idx)
 		lock_guard<mutex> lock(queue_state_mu);
 		if (new_clip_ready) {
 			assert(queued_clip_list.size() == 1);
-			queued_clip_list[0].stream_idx = stream_idx;
+			queued_clip_list[0].clip.stream_idx = stream_idx;
 			return;
 		}
 
@@ -480,20 +482,17 @@ void Player::release_queue_spot()
 	new_clip_changed.notify_all();
 }
 
-double compute_time_left(const vector<Clip> &clips, const map<size_t, double> &progress)
+double 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.
-	assert(!progress.empty());
-	auto last_it = progress.end();
-	--last_it;
 	double remaining = 0.0;
 	double last_fade_time_seconds = 0.0;
-	for (size_t row = last_it->first; row < clips.size(); ++row) {
-		const Clip &clip = clips[row];
+	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 == last_it->first) {
+		if (row == currently_playing_idx) {
 			// A clip we're playing: Subtract the part we've already played.
-			remaining = clip_length * (1.0 - last_it->second);
+			remaining = 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).