Fix fades into overly short clips.

[nageru] / player.cpp

diff --git a/player.cpp b/player.cpp
index a6a8056b53290b9746abac5beec0f45d38f8135d..2fef0735c24d0a817357244b8cd3c9c671b4913f 100644 (file)
--- a/player.cpp
+++ b/player.cpp
@@ -73,7 +73,7 @@ wait_for_clip:
 
                if (!clip_ready) {
                        if (video_stream != nullptr) {
-                               video_stream->schedule_refresh_frame(pts, /*display_func=*/nullptr);
+                               video_stream->schedule_refresh_frame(steady_clock::now(), pts, /*display_func=*/nullptr, QueueSpotHolder());
                        }
                        continue;
                }
@@ -85,7 +85,7 @@ wait_for_clip:
                        clip = current_clip;
                        stream_idx = current_stream_idx;
                }
-               steady_clock::time_point origin = steady_clock::now();
+               steady_clock::time_point origin = steady_clock::now();  // TODO: Add a 100 ms buffer for ramp-up?
                int64_t in_pts_origin = clip.pts_in;
 got_clip:
                int64_t out_pts_origin = pts;
@@ -145,7 +145,7 @@ got_clip:
                        int64_t secondary_pts = -1;
                        int64_t in_pts_secondary = -1;
                        float fade_alpha = 0.0f;
-                       if (got_next_clip) {
+                       if (got_next_clip && time_left_this_clip <= next_clip_fade_time) {
                                secondary_stream_idx = next_clip.stream_idx;
                                in_pts_secondary = lrint(next_clip.pts_in + (next_clip_fade_time - time_left_this_clip) * TIMEBASE * speed);
                                fade_alpha = 1.0f - time_left_this_clip / next_clip_fade_time;
@@ -180,13 +180,23 @@ got_clip:
                                break;
                        }
 
-                       // Sleep until the next frame start, or until there's a new clip we're supposed to play.
+                       // If the queue is full (which is really the state we'd like to be in),
+                       // wait until there's room for one more frame (ie., one was output from
+                       // VideoStream), or until or until there's a new clip we're supposed to play.
                        {
                                unique_lock<mutex> lock(queue_state_mu);
-                               new_clip_changed.wait_until(lock, next_frame_start, [this]{
+                               new_clip_changed.wait(lock, [this]{
+                                       if (video_stream != nullptr && num_queued_frames < max_queued_frames) {
+                                               return true;
+                                       }
                                        return new_clip_ready || override_stream_idx != -1;
                                });
                                if (new_clip_ready) {
+                                       if (video_stream != nullptr) {
+                                               lock.unlock();  // Urg.
+                                               video_stream->clear_queue();
+                                               lock.lock();
+                                       }
                                        goto wait_for_clip;
                                }
                                if (override_stream_idx != -1) {
@@ -204,9 +214,13 @@ got_clip:
                                        display_func();
                                } else {
                                        if (secondary_stream_idx == -1) {
-                                               video_stream->schedule_original_frame(pts, display_func, primary_stream_idx, in_pts_lower);
+                                               video_stream->schedule_original_frame(
+                                                       next_frame_start, pts, display_func, QueueSpotHolder(this),
+                                                       primary_stream_idx, in_pts_lower);
                                        } else {
-                                               video_stream->schedule_faded_frame(pts, display_func, primary_stream_idx, in_pts_lower, secondary_stream_idx, secondary_pts, fade_alpha);
+                                               video_stream->schedule_faded_frame(next_frame_start, pts, display_func,
+                                                       QueueSpotHolder(this), primary_stream_idx, in_pts_lower,
+                                                       secondary_stream_idx, secondary_pts, fade_alpha);
                                        }
                                }
                                continue;
@@ -226,9 +240,13 @@ got_clip:
                                                display_func();
                                        } else {
                                                if (secondary_stream_idx == -1) {
-                                                       video_stream->schedule_original_frame(pts, display_func, primary_stream_idx, snap_pts);
+                                                       video_stream->schedule_original_frame(
+                                                               next_frame_start, pts, display_func,
+                                                               QueueSpotHolder(this), primary_stream_idx, snap_pts);
                                                } else {
-                                                       video_stream->schedule_faded_frame(pts, display_func, primary_stream_idx, snap_pts, secondary_stream_idx, secondary_pts, fade_alpha);
+                                                       video_stream->schedule_faded_frame(
+                                                               next_frame_start, pts, display_func, QueueSpotHolder(this),
+                                                               primary_stream_idx, snap_pts, secondary_stream_idx, secondary_pts, fade_alpha);
                                                }
                                        }
                                        in_pts_origin += snap_pts - in_pts;
@@ -253,12 +271,13 @@ got_clip:
                                assert(secondary_stream_idx == -1);
                                destination->setFrame(primary_stream_idx, in_pts_lower, /*interpolated=*/false);
                        } else {
-                               // Calculate the interpolated frame. When it's done, the destination
-                               // will be unblocked.
                                auto display_func = [this, primary_stream_idx, pts, secondary_stream_idx, secondary_pts, fade_alpha]{
                                        destination->setFrame(primary_stream_idx, pts, /*interpolated=*/true, secondary_stream_idx, secondary_pts, fade_alpha);
                                };
-                               video_stream->schedule_interpolated_frame(pts, display_func, primary_stream_idx, in_pts_lower, in_pts_upper, alpha, secondary_stream_idx, secondary_pts, fade_alpha);
+                               video_stream->schedule_interpolated_frame(
+                                       next_frame_start, pts, display_func, QueueSpotHolder(this),
+                                       primary_stream_idx, in_pts_lower, in_pts_upper, alpha,
+                                       secondary_stream_idx, secondary_pts, fade_alpha);
                        }
                }
 
@@ -386,3 +405,17 @@ void Player::override_angle(unsigned stream_idx)
        }
        destination->setFrame(stream_idx, *it, /*interpolated=*/false);
 }
+
+void Player::take_queue_spot()
+{
+       unique_lock<mutex> lock(queue_state_mu);
+       ++num_queued_frames;
+}
+
+void Player::release_queue_spot()
+{
+       unique_lock<mutex> lock(queue_state_mu);
+       assert(num_queued_frames > 0);
+       --num_queued_frames;
+       new_clip_changed.notify_all();
+}