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;
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;
}
Clip clip;
+ size_t clip_idx;
unsigned stream_idx;
{
lock_guard<mutex> lock(mu);
clip = current_clip;
+ clip_idx = current_clip_idx;
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;
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;
}
}
+ // 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
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<size_t, double> 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;
break;
}
- // Sleep until the next frame start, 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]{
- 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();
+ }
goto wait_for_clip;
}
if (override_stream_idx != -1) {
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;
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;
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);
}
}
// 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;
// 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();
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<mutex> lock(mu);
current_clip = clip;
current_stream_idx = stream_idx;
+ current_clip_idx = clip_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();
+}
projects / nageru / blobdiff