X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=player.cpp;h=1c26f60ddf184578273b99cf94f01c73f7700f6b;hb=60232cc3b83499d67ade40cbd403e04747b64795;hp=1432f04bad93d2b5df348755e0b7e5349d0f038a;hpb=ec2ed287e7271f81fb7cce5170fbce62cac79e82;p=nageru diff --git a/player.cpp b/player.cpp index 1432f04..1c26f60 100644 --- a/player.cpp +++ b/player.cpp @@ -50,6 +50,7 @@ void Player::thread_func(bool also_output_to_stream) constexpr double output_framerate = 60000.0 / 1001.0; // FIXME: make configurable int64_t pts = 0; Clip next_clip; + size_t next_clip_idx = size_t(-1); bool got_next_clip = false; double next_clip_fade_time = -1.0; @@ -73,16 +74,18 @@ wait_for_clip: if (!clip_ready) { if (video_stream != nullptr) { - video_stream->schedule_refresh_frame(steady_clock::now(), pts, /*display_func=*/nullptr); + video_stream->schedule_refresh_frame(steady_clock::now(), pts, /*display_func=*/nullptr, QueueSpotHolder()); } continue; } Clip clip; + size_t clip_idx; unsigned stream_idx; { lock_guard lock(mu); clip = current_clip; + clip_idx = current_clip_idx; stream_idx = current_stream_idx; } steady_clock::time_point origin = steady_clock::now(); // TODO: Add a 100 ms buffer for ramp-up? @@ -130,7 +133,7 @@ got_clip: double time_left_this_clip = double(clip.pts_out - in_pts) / TIMEBASE / speed; if (!got_next_clip && next_clip_callback != nullptr && time_left_this_clip <= clip.fade_time_seconds) { // Find the next clip so that we can begin a fade. - next_clip = next_clip_callback(); + tie(next_clip, next_clip_idx) = next_clip_callback(); if (next_clip.pts_in != -1) { got_next_clip = true; @@ -140,14 +143,18 @@ got_clip: } } + // pts not affected by the swapping below. + int64_t in_pts_for_progress = in_pts, in_pts_secondary_for_progress = -1; + int primary_stream_idx = stream_idx; int secondary_stream_idx = -1; 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); + in_pts_secondary_for_progress = in_pts_secondary; fade_alpha = 1.0f - time_left_this_clip / next_clip_fade_time; // If more than half-way through the fade, interpolate the next clip @@ -169,9 +176,16 @@ got_clip: 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 played_this_clip = double(in_pts_for_progress - clip.pts_in) / TIMEBASE / speed; double total_length = double(clip.pts_out - clip.pts_in) / TIMEBASE / speed; - progress_callback(played_this_clip, total_length); + map progress{{ clip_idx, played_this_clip / total_length }}; + + if (got_next_clip && time_left_this_clip <= next_clip_fade_time) { + double played_next_clip = double(in_pts_secondary_for_progress - next_clip.pts_in) / TIMEBASE / speed; + double total_next_length = double(next_clip.pts_out - next_clip.pts_in) / TIMEBASE / speed; + progress[next_clip_idx] = played_next_clip / total_next_length; + } + progress_callback(progress); } int64_t in_pts_lower, in_pts_upper; @@ -193,8 +207,9 @@ got_clip: }); if (new_clip_ready) { if (video_stream != nullptr) { + lock.unlock(); // Urg. video_stream->clear_queue(); - num_queued_frames = 0; + lock.lock(); } goto wait_for_clip; } @@ -208,22 +223,18 @@ got_clip: if (in_pts_lower == in_pts_upper) { auto display_func = [this, primary_stream_idx, in_pts_lower, secondary_stream_idx, secondary_pts, fade_alpha]{ destination->setFrame(primary_stream_idx, in_pts_lower, /*interpolated=*/false, secondary_stream_idx, secondary_pts, fade_alpha); - unique_lock lock(queue_state_mu); - assert(num_queued_frames > 0); - --num_queued_frames; - new_clip_changed.notify_all(); }; if (video_stream == nullptr) { display_func(); } else { if (secondary_stream_idx == -1) { - video_stream->schedule_original_frame(next_frame_start, pts, display_func, primary_stream_idx, in_pts_lower); - unique_lock lock(queue_state_mu); - ++num_queued_frames; + video_stream->schedule_original_frame( + next_frame_start, pts, display_func, QueueSpotHolder(this), + primary_stream_idx, in_pts_lower); } else { - bool ok = video_stream->schedule_faded_frame(next_frame_start, pts, display_func, primary_stream_idx, in_pts_lower, secondary_stream_idx, secondary_pts, fade_alpha); - unique_lock lock(queue_state_mu); - if (ok) ++num_queued_frames; + 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; @@ -238,22 +249,18 @@ got_clip: if (fabs(snap_pts_as_frameno - frameno) < 0.01) { auto display_func = [this, primary_stream_idx, snap_pts, secondary_stream_idx, secondary_pts, fade_alpha]{ destination->setFrame(primary_stream_idx, snap_pts, /*interpolated=*/false, secondary_stream_idx, secondary_pts, fade_alpha); - unique_lock lock(queue_state_mu); - assert(num_queued_frames > 0); - --num_queued_frames; - new_clip_changed.notify_all(); }; if (video_stream == nullptr) { display_func(); } else { if (secondary_stream_idx == -1) { - video_stream->schedule_original_frame(next_frame_start, pts, display_func, primary_stream_idx, snap_pts); - unique_lock lock(queue_state_mu); - ++num_queued_frames; + video_stream->schedule_original_frame( + next_frame_start, pts, display_func, + QueueSpotHolder(this), primary_stream_idx, snap_pts); } else { - bool ok = video_stream->schedule_faded_frame(next_frame_start, pts, display_func, primary_stream_idx, snap_pts, secondary_stream_idx, secondary_pts, fade_alpha); - unique_lock lock(queue_state_mu); - if (ok) ++num_queued_frames; + 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; @@ -280,13 +287,11 @@ got_clip: } else { 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); - assert(num_queued_frames > 0); - --num_queued_frames; - new_clip_changed.notify_all(); }; - bool ok = video_stream->schedule_interpolated_frame(next_frame_start, pts, display_func, primary_stream_idx, in_pts_lower, in_pts_upper, alpha, secondary_stream_idx, secondary_pts, fade_alpha); - unique_lock lock(queue_state_mu); - if (ok) ++num_queued_frames; + 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); } } @@ -294,7 +299,7 @@ got_clip: // Last-ditch effort to get the next clip (if e.g. the fade time was zero seconds). if (!got_next_clip && next_clip_callback != nullptr) { - next_clip = next_clip_callback(); + tie(next_clip, next_clip_idx) = next_clip_callback(); if (next_clip.pts_in != -1) { got_next_clip = true; in_pts_start_next_clip = next_clip.pts_in; @@ -304,6 +309,7 @@ got_clip: // Switch to next clip if we got it. if (got_next_clip) { clip = next_clip; + clip_idx = next_clip_idx; 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(); @@ -357,12 +363,13 @@ Player::Player(JPEGFrameView *destination, bool also_output_to_stream) thread(&Player::thread_func, this, also_output_to_stream).detach(); } -void Player::play_clip(const Clip &clip, unsigned stream_idx) +void Player::play_clip(const Clip &clip, size_t clip_idx, unsigned stream_idx) { { lock_guard lock(mu); current_clip = clip; current_stream_idx = stream_idx; + current_clip_idx = clip_idx; } { @@ -414,3 +421,17 @@ void Player::override_angle(unsigned stream_idx) } destination->setFrame(stream_idx, *it, /*interpolated=*/false); } + +void Player::take_queue_spot() +{ + unique_lock lock(queue_state_mu); + ++num_queued_frames; +} + +void Player::release_queue_spot() +{ + unique_lock lock(queue_state_mu); + assert(num_queued_frames > 0); + --num_queued_frames; + new_clip_changed.notify_all(); +}