Move transitioning to the next clip away from the done callback.

[nageru] / player.cpp

diff --git a/player.cpp b/player.cpp
index bb2377a643c729cd4c5c8703140f2a4054e30a0b..079f5cf3116d3f603e181d05bdfc3bdc8c930d51 100644 (file)
--- a/player.cpp
+++ b/player.cpp
@@ -69,6 +69,7 @@ void Player::thread_func(bool also_output_to_stream)
                        clip = current_clip;
                        stream_idx = current_stream_idx;
                }
+got_clip:
                steady_clock::time_point origin = steady_clock::now();
                int64_t in_pts_origin = clip.pts_in;
                int64_t out_pts_origin = pts;
@@ -89,7 +90,6 @@ void Player::thread_func(bool also_output_to_stream)
                // TODO: Lock to a rational multiple of the frame rate if possible.
                double speed = 0.5;
 
-               bool aborted = false;
                for (int frameno = 0; ; ++frameno) {  // Ends when the clip ends.
                        double out_pts = out_pts_origin + TIMEBASE * frameno / output_framerate;
                        steady_clock::time_point next_frame_start =
@@ -134,28 +134,27 @@ void Player::thread_func(bool also_output_to_stream)
                        if (in_pts_lower == in_pts_upper) {
                                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);
+                                       video_stream->schedule_original_frame(pts, stream_idx, in_pts_lower);
                                }
                                continue;
                        }
 
                        // 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.
-                       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, /*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, /*interpolated=*/false);
-                               if (video_stream != nullptr) {
-                                       video_stream->schedule_original_frame(lrint(out_pts), stream_idx, in_pts_upper);
+                       bool snapped = false;
+                       for (int64_t snap_pts : { in_pts_lower, in_pts_upper }) {
+                               double snap_pts_as_frameno = (snap_pts - in_pts_origin) * output_framerate / TIMEBASE / speed;
+                               if (fabs(snap_pts_as_frameno - frameno) < 0.01) {
+                                       destination->setFrame(stream_idx, snap_pts, /*interpolated=*/false);
+                                       if (video_stream != nullptr) {
+                                               video_stream->schedule_original_frame(pts, stream_idx, snap_pts);
+                                       }
+                                       in_pts_origin += snap_pts - in_pts;
+                                       snapped = true;
+                                       break;
                                }
-                               in_pts_origin += in_pts_upper - in_pts;
+                       }
+                       if (snapped) {
                                continue;
                        }
 
@@ -173,8 +172,20 @@ void Player::thread_func(bool also_output_to_stream)
                        } 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);
+                               destination->setFrame(stream_idx, pts, /*interpolated=*/true);
+                               video_stream->schedule_interpolated_frame(pts, stream_idx, in_pts_lower, in_pts_upper, alpha);
+                       }
+               }
+
+               if (next_clip_callback != nullptr) {
+                       Clip next_clip = next_clip_callback();
+                       if (next_clip.pts_in != -1) {
+                               clip = next_clip;
+                               stream_idx = next_clip.stream_idx;  // Override is used for previews only, and next_clip is used for live ony.
+                               if (done_callback != nullptr) {
+                                       done_callback();
+                               }
+                               goto got_clip;
                        }
                }
 
@@ -182,7 +193,7 @@ void Player::thread_func(bool also_output_to_stream)
                        unique_lock<mutex> lock(queue_state_mu);
                        playing = false;
                }
-               if (done_callback != nullptr && !aborted) {
+               if (done_callback != nullptr) {
                        done_callback();
                }
        }