X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=player.cpp;h=b0e862dd89e2b74a7ad6b46524399228f3cca076;hb=3795723be95f2fe82f3c8b8b45b1a905b2c811fd;hp=0d8593878f67445e3dc867dfc0ea2d0719593082;hpb=fca89bd21985639735df96a527d86f8aa05b61fe;p=nageru diff --git a/player.cpp b/player.cpp index 0d85938..b0e862d 100644 --- a/player.cpp +++ b/player.cpp @@ -4,6 +4,7 @@ #include "context.h" #include "defs.h" #include "ffmpeg_raii.h" +#include "frame_on_disk.h" #include "httpd.h" #include "jpeg_frame_view.h" #include "mux.h" @@ -22,8 +23,6 @@ using namespace std; using namespace std::chrono; -extern mutex frame_mu; -extern vector frames[MAX_STREAMS]; extern HTTPD *global_httpd; void Player::thread_func(bool also_output_to_stream) @@ -50,6 +49,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 +73,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? @@ -99,9 +101,10 @@ got_clip: // Find the first frame such that frame.pts <= in_pts. auto it = lower_bound(frames[stream_idx].begin(), frames[stream_idx].end(), - in_pts_origin); + in_pts_origin, + [](const FrameOnDisk &frame, int64_t pts) { return frame.pts < pts; }); if (it != frames[stream_idx].end()) { - in_pts_origin = *it; + in_pts_origin = it->pts; } } @@ -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,17 @@ 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; + FrameOnDisk secondary_frame; 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); + int64_t 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 @@ -158,43 +164,61 @@ got_clip: fade_alpha = 1.0f - fade_alpha; } - int64_t in_pts_lower, in_pts_upper; - bool ok = find_surrounding_frames(in_pts_secondary, secondary_stream_idx, &in_pts_lower, &in_pts_upper); + FrameOnDisk frame_lower, frame_upper; + bool ok = find_surrounding_frames(in_pts_secondary, secondary_stream_idx, &frame_lower, &frame_upper); if (ok) { - secondary_pts = in_pts_lower; - } else { - secondary_stream_idx = -1; + secondary_frame = frame_lower; } } 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; - bool ok = find_surrounding_frames(in_pts, primary_stream_idx, &in_pts_lower, &in_pts_upper); + FrameOnDisk frame_lower, frame_upper; + bool ok = find_surrounding_frames(in_pts, primary_stream_idx, &frame_lower, &frame_upper); if (!ok) { break; } - // 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 lock(queue_state_mu); - 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 (video_stream == nullptr) { + // No queue, just wait until the right time and then show the frame. + new_clip_changed.wait_until(lock, next_frame_start, [this]{ + return new_clip_ready || override_stream_idx != -1; + }); + } else { + // 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. + // + // In this case, we don't sleep until next_frame_start; the displaying is + // done by the queue. + new_clip_changed.wait(lock, [this]{ + if (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(); } + got_next_clip = false; goto wait_for_clip; } if (override_stream_idx != -1) { @@ -204,24 +228,22 @@ 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; + if (frame_lower.pts == frame_upper.pts) { + auto display_func = [this, primary_stream_idx, frame_lower, secondary_frame, fade_alpha]{ + destination->setFrame(primary_stream_idx, frame_lower, secondary_frame, fade_alpha); }; 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), + frame_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; + assert(secondary_frame.pts != -1); + video_stream->schedule_faded_frame(next_frame_start, pts, display_func, + QueueSpotHolder(this), frame_lower, + secondary_frame, fade_alpha); } } continue; @@ -231,26 +253,26 @@ got_clip: // (ie., move less than 1% of an _output_ frame), do so. // TODO: Snap secondary (fade-to) clips in the same fashion. bool snapped = false; - for (int64_t snap_pts : { in_pts_lower, in_pts_upper }) { + for (int64_t snap_pts : { frame_lower.pts, frame_upper.pts }) { double snap_pts_as_frameno = (snap_pts - in_pts_origin) * output_framerate / TIMEBASE / speed; 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; + FrameOnDisk snap_frame = frame_lower; + snap_frame.pts = snap_pts; + auto display_func = [this, primary_stream_idx, snap_frame, secondary_frame, fade_alpha]{ + destination->setFrame(primary_stream_idx, snap_frame, secondary_frame, fade_alpha); }; 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), snap_frame); } 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; + assert(secondary_frame.pts != -1); + video_stream->schedule_faded_frame( + next_frame_start, pts, display_func, QueueSpotHolder(this), + snap_frame, secondary_frame, fade_alpha); } } in_pts_origin += snap_pts - in_pts; @@ -268,21 +290,20 @@ got_clip: continue; } - double alpha = double(in_pts - in_pts_lower) / (in_pts_upper - in_pts_lower); + double alpha = double(in_pts - frame_lower.pts) / (frame_upper.pts - frame_lower.pts); if (video_stream == nullptr) { // Previews don't do any interpolation. assert(secondary_stream_idx == -1); - destination->setFrame(primary_stream_idx, in_pts_lower, /*interpolated=*/false); + destination->setFrame(primary_stream_idx, frame_lower); } 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; + auto display_func = [this](shared_ptr frame) { + destination->setFrame(frame); }; - 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), + frame_lower, frame_upper, alpha, + secondary_frame, fade_alpha); } } @@ -290,7 +311,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; @@ -300,6 +321,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(); @@ -323,27 +345,28 @@ got_clip: } // Find the frame immediately before and after this point. -bool Player::find_surrounding_frames(int64_t pts, int stream_idx, int64_t *pts_lower, int64_t *pts_upper) +bool Player::find_surrounding_frames(int64_t pts, int stream_idx, FrameOnDisk *frame_lower, FrameOnDisk *frame_upper) { lock_guard lock(frame_mu); // Find the first frame such that frame.pts >= pts. auto it = lower_bound(frames[stream_idx].begin(), frames[stream_idx].end(), - pts); + pts, + [](const FrameOnDisk &frame, int64_t pts) { return frame.pts < pts; }); if (it == frames[stream_idx].end()) { return false; } - *pts_upper = *it; + *frame_upper = *it; // Find the last frame such that in_pts <= frame.pts (if any). if (it == frames[stream_idx].begin()) { - *pts_lower = *it; + *frame_lower = *it; } else { - *pts_lower = *(it - 1); + *frame_lower = *(it - 1); } - assert(pts >= *pts_lower); - assert(pts <= *pts_upper); + assert(pts >= frame_lower->pts); + assert(pts <= frame_upper->pts); return true; } @@ -353,12 +376,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; } { @@ -404,9 +428,24 @@ void Player::override_angle(unsigned stream_idx) } lock_guard lock(frame_mu); - auto it = upper_bound(frames[stream_idx].begin(), frames[stream_idx].end(), pts_out); + auto it = upper_bound(frames[stream_idx].begin(), frames[stream_idx].end(), pts_out, + [](int64_t pts, const FrameOnDisk &frame) { return pts < frame.pts; }); if (it == frames[stream_idx].end()) { return; } - destination->setFrame(stream_idx, *it, /*interpolated=*/false); + destination->setFrame(stream_idx, *it); +} + +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(); }