X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=player.cpp;h=1eea8d706c883d07a6d0592131cc8e7e6a8e15ab;hb=10675d7568e66b0bcf9bfccfd3ae337bcf8860cb;hp=136da21901c44d408a267c27f7c47689b4ca195a;hpb=827d3d830220d96b2c4007b4dce4bf5da985fa9b;p=nageru

diff --git a/player.cpp b/player.cpp
index 136da21..1eea8d7 100644
--- a/player.cpp
+++ b/player.cpp
@@ -136,8 +136,15 @@ void Player::thread_func(bool also_output_to_stream)
 				}
 			}
 
+			if (progress_callback != nullptr) {
+				// NOTE: None of this will take into account any snapping done below.
+				double played_this_clip = double(in_pts - clip.pts_in) / TIMEBASE / speed;
+				double total_length = double(clip.pts_out - clip.pts_in) / TIMEBASE / speed;
+				progress_callback(played_this_clip, total_length);
+			}
+
 			if (in_pts_lower == in_pts_upper) {
-				destination->setFrame(stream_idx, in_pts_lower);
+				destination->setFrame(stream_idx, in_pts_lower, /*interpolated=*/false);
 				if (video_stream != nullptr) {
 					video_stream->schedule_original_frame(lrint(out_pts), stream_idx, in_pts_lower);
 				}
@@ -149,14 +156,14 @@ void Player::thread_func(bool also_output_to_stream)
 			double in_pts_lower_as_frameno = (in_pts_lower - in_pts_origin) * output_framerate / TIMEBASE / speed;
 			double in_pts_upper_as_frameno = (in_pts_upper - in_pts_origin) * output_framerate / TIMEBASE / speed;
 			if (fabs(in_pts_lower_as_frameno - frameno) < 0.01) {
-				destination->setFrame(stream_idx, in_pts_lower);
+				destination->setFrame(stream_idx, in_pts_lower, /*interpolated=*/false);
 				if (video_stream != nullptr) {
 					video_stream->schedule_original_frame(lrint(out_pts), stream_idx, in_pts_lower);
 				}
 				in_pts_origin += in_pts_lower - in_pts;
 				continue;
 			} else if (fabs(in_pts_upper_as_frameno - frameno) < 0.01) {
-				destination->setFrame(stream_idx, in_pts_upper);
+				destination->setFrame(stream_idx, in_pts_upper, /*interpolated=*/false);
 				if (video_stream != nullptr) {
 					video_stream->schedule_original_frame(lrint(out_pts), stream_idx, in_pts_upper);
 				}
@@ -165,10 +172,14 @@ void Player::thread_func(bool also_output_to_stream)
 			}
 
 			double alpha = double(in_pts - in_pts_lower) / (in_pts_upper - in_pts_lower);
-			destination->setFrame(stream_idx, in_pts_lower);  // FIXME
 
-			if (video_stream != nullptr) {
-				// Send the frame to the stream.
+			if (video_stream == nullptr) {
+				// Previews don't do any interpolation.
+				destination->setFrame(stream_idx, in_pts_lower, /*interpolated=*/false);
+			} else {
+				// Calculate the interpolated frame. When it's done, the destination
+				// will be unblocked.
+				destination->setFrame(stream_idx, lrint(out_pts), /*interpolated=*/true);
 				video_stream->schedule_interpolated_frame(lrint(out_pts), stream_idx, in_pts_lower, in_pts_upper, alpha);
 			}
 		}
@@ -244,5 +255,5 @@ void Player::override_angle(unsigned stream_idx)
 	if (it == frames[stream_idx].end()) {
 		return;
 	}
-	destination->setFrame(stream_idx, *it);
+	destination->setFrame(stream_idx, *it, /*interpolated=*/false);
 }