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

[nageru] / player.cpp

diff --git a/player.cpp b/player.cpp
index af443078c81dce95b17c4cadf66427aae8164b00..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 =
@@ -177,11 +177,23 @@ void Player::thread_func(bool also_output_to_stream)
                        }
                }
 
+               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;
+                       }
+               }
+
                {
                        unique_lock<mutex> lock(queue_state_mu);
                        playing = false;
                }
-               if (done_callback != nullptr && !aborted) {
+               if (done_callback != nullptr) {
                        done_callback();
                }
        }