From c18585d1f7b4476c74c4c5a064cb3ce357c644ae Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Thu, 27 Dec 2018 23:02:25 +0100 Subject: [PATCH] Move the to-play playlist into Player. This eradicates the ugly callback into MainWindow to get the next clip, gives Player much more control, and in general makes things a lot more predictable. Right now, this means you can no longer edit the playlist while it's playing, but we're going to reintroduce that (in a somewhat limited form) fairly soon. --- futatabi/export.cpp | 9 +- futatabi/mainwindow.cpp | 46 ++-- futatabi/mainwindow.h | 1 + futatabi/player.cpp | 528 +++++++++++++++++++--------------------- futatabi/player.h | 17 +- 5 files changed, 284 insertions(+), 317 deletions(-) diff --git a/futatabi/export.cpp b/futatabi/export.cpp index fe713b4..f371740 100644 --- a/futatabi/export.cpp +++ b/futatabi/export.cpp @@ -237,17 +237,10 @@ void export_interpolated_clip(const string &filename, const vector &clips) done_promise.set_value(); } }); - player.set_next_clip_callback([&clip_idx, &clips]() -> pair { - if (++clip_idx >= clips.size()) { - return make_pair(Clip(), -1); - } else { - return make_pair(clips[clip_idx], clip_idx); - } - }); player.set_progress_callback([¤t_value, &clips, total_length] (const std::map &player_progress) { current_value = 1.0 - compute_time_left(clips, player_progress) / total_length; }); - player.play_clip(clips[0], clip_idx, clips[0].stream_idx); + player.play(clips); while (done.wait_for(std::chrono::milliseconds(100)) != future_status::ready && !progress.wasCanceled()) { progress.setValue(lrint(100000.0 * current_value)); } diff --git a/futatabi/mainwindow.cpp b/futatabi/mainwindow.cpp index 152358b..0537f00 100644 --- a/futatabi/mainwindow.cpp +++ b/futatabi/mainwindow.cpp @@ -189,7 +189,6 @@ MainWindow::MainWindow() live_player_clip_done(); }); }); - live_player->set_next_clip_callback(bind(&MainWindow::live_player_get_next_clip, this)); live_player->set_progress_callback([this](const map &progress) { post_to_main_thread([this, progress] { live_player_clip_progress(progress); @@ -337,7 +336,7 @@ void MainWindow::preview_clicked() if (selected->hasSelection()) { QModelIndex index = selected->currentIndex(); const Clip &clip = *playlist_clips->clip(index.row()); - preview_player->play_clip(clip, index.row(), clip.stream_idx); + preview_player->play({clip}); return; } } @@ -347,18 +346,18 @@ void MainWindow::preview_clicked() QItemSelectionModel *selected = ui->clip_list->selectionModel(); if (!selected->hasSelection()) { - preview_player->play_clip(*cliplist_clips->back(), cliplist_clips->size() - 1, 0); + preview_player->play({*cliplist_clips->back()}); return; } QModelIndex index = selected->currentIndex(); - unsigned stream_idx; + Clip clip = *cliplist_clips->clip(index.row()); if (cliplist_clips->is_camera_column(index.column())) { - stream_idx = index.column() - int(ClipList::Column::CAMERA_1); + clip.stream_idx = index.column() - int(ClipList::Column::CAMERA_1); } else { - stream_idx = ui->preview_display->get_stream_idx(); + clip.stream_idx = ui->preview_display->get_stream_idx(); } - preview_player->play_clip(*cliplist_clips->clip(index.row()), index.row(), stream_idx); + preview_player->play({clip}); } void MainWindow::preview_angle_clicked(unsigned stream_idx) @@ -481,17 +480,23 @@ void MainWindow::play_clicked() return; QItemSelectionModel *selected = ui->playlist->selectionModel(); - int row; + unsigned start_row; if (!selected->hasSelection()) { - row = 0; + start_row = 0; } else { - row = selected->selectedRows(0)[0].row(); + start_row = selected->selectedRows(0)[0].row(); } - const Clip &clip = *playlist_clips->clip(row); - live_player->play_clip(clip, row, clip.stream_idx); - playlist_clips->set_progress({{ row, 0.0f }}); - playlist_clips->set_currently_playing(row, 0.0f); + live_player_index_to_row.clear(); + + vector clips; + for (unsigned row = start_row; row < playlist_clips->size(); ++row) { + live_player_index_to_row.emplace(clips.size(), row); + clips.push_back(*playlist_clips->clip(row)); + } + live_player->play(clips); + playlist_clips->set_progress({{ start_row, 0.0f }}); + playlist_clips->set_currently_playing(start_row, 0.0f); playlist_selection_changed(); ui->stop_btn->setEnabled(true); @@ -504,7 +509,8 @@ void MainWindow::stop_clicked() fake_clip.pts_out = 0; size_t last_row = playlist_clips->size() - 1; playlist_clips->set_currently_playing(last_row, 0.0f); - live_player->play_clip(fake_clip, last_row, 0); + live_player_index_to_row.clear(); + live_player->play({fake_clip}); } void MainWindow::live_player_clip_done() @@ -558,7 +564,13 @@ static string format_duration(double t) void MainWindow::live_player_clip_progress(const map &progress) { - playlist_clips->set_progress(progress); + map converted_progress; + for (const auto &it : progress) { + if (live_player_index_to_row.count(it.first)) { + converted_progress.emplace(live_player_index_to_row[it.first], it.second); + } + } + playlist_clips->set_progress(converted_progress); vector clips; for (size_t row = 0; row < playlist_clips->size(); ++row) { @@ -829,7 +841,7 @@ void MainWindow::preview_single_frame(int64_t pts, unsigned stream_idx, MainWind Clip fake_clip; fake_clip.pts_in = pts; fake_clip.pts_out = pts + 1; - preview_player->play_clip(fake_clip, 0, stream_idx); + preview_player->play({fake_clip}); } void MainWindow::playlist_selection_changed() diff --git a/futatabi/mainwindow.h b/futatabi/mainwindow.h index 2bb880d..669fc0e 100644 --- a/futatabi/mainwindow.h +++ b/futatabi/mainwindow.h @@ -43,6 +43,7 @@ private: QLabel *disk_free_label; std::unique_ptr preview_player, live_player; + std::map live_player_index_to_row; DB db; unsigned num_cameras; diff --git a/futatabi/player.cpp b/futatabi/player.cpp index 4fe42af..7c38821 100644 --- a/futatabi/player.cpp +++ b/futatabi/player.cpp @@ -49,27 +49,29 @@ void Player::thread_func(Player::StreamOutput stream_output, AVFormatContext *fi check_error(); 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; - while (!should_quit) { wait_for_clip: + vector clip_list; bool clip_ready; steady_clock::time_point before_sleep = steady_clock::now(); // Wait until we're supposed to play something. { unique_lock lock(queue_state_mu); + playing = false; clip_ready = new_clip_changed.wait_for(lock, milliseconds(100), [this] { - return should_quit || (new_clip_ready && current_clip.pts_in != -1); + return should_quit || new_clip_ready; }); if (should_quit) { return; } - new_clip_ready = false; - playing = true; + if (clip_ready) { + new_clip_ready = false; + playing = true; + clip_list = move(queued_clip_list); + queued_clip_list.clear(); + assert(!clip_list.empty()); + } } steady_clock::duration time_slept = steady_clock::now() - before_sleep; @@ -83,313 +85,289 @@ wait_for_clip: 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? - int64_t in_pts_origin = clip.pts_in; -got_clip: - int64_t out_pts_origin = pts; - - // Start playing exactly at a frame. - // TODO: Snap secondary (fade-to) clips in the same fashion - // so that we don't get jank here). - { - lock_guard lock(frame_mu); - - // Find the first frame such that frame.pts <= in_pts. - auto it = find_last_frame_before(frames[stream_idx], in_pts_origin); - if (it != frames[stream_idx].end()) { - in_pts_origin = it->pts; + int64_t in_pts_origin = clip_list[0].pts_in; + for (size_t clip_idx = 0; clip_idx < clip_list.size(); ++clip_idx) { + const Clip &clip = clip_list[clip_idx]; + const Clip *next_clip = (clip_idx + 1 < clip_list.size()) ? &clip_list[clip_idx + 1] : nullptr; + int64_t out_pts_origin = pts; + + double next_clip_fade_time = -1.0; + if (next_clip != nullptr) { + double duration_this_clip = double(clip.pts_out - in_pts_origin) / TIMEBASE / clip.speed; + double duration_next_clip = double(next_clip->pts_out - next_clip->pts_in) / TIMEBASE / clip.speed; + next_clip_fade_time = min(min(duration_this_clip, duration_next_clip), clip.fade_time_seconds); } - } - int64_t in_pts_start_next_clip = -1; - steady_clock::time_point next_frame_start; - for (int frameno = 0; !should_quit; ++frameno) { // Ends when the clip ends. - double out_pts = out_pts_origin + TIMEBASE * frameno / global_flags.output_framerate; - next_frame_start = - origin + microseconds(lrint((out_pts - out_pts_origin) * 1e6 / TIMEBASE)); - int64_t in_pts = lrint(in_pts_origin + TIMEBASE * frameno * clip.speed / global_flags.output_framerate); - pts = lrint(out_pts); - - if (in_pts >= clip.pts_out) { - break; - } + int stream_idx = clip.stream_idx; - steady_clock::duration time_behind = steady_clock::now() - next_frame_start; - if (stream_output != FILE_STREAM_OUTPUT && time_behind >= milliseconds(200)) { - fprintf(stderr, "WARNING: %ld ms behind, dropping a frame (no matter the type).\n", - lrint(1e3 * duration(time_behind).count())); - ++metric_dropped_unconditional_frame; - continue; + // Start playing exactly at a frame. + // TODO: Snap secondary (fade-to) clips in the same fashion + // so that we don't get jank here). + { + lock_guard lock(frame_mu); + + // Find the first frame such that frame.pts <= in_pts. + auto it = find_last_frame_before(frames[stream_idx], in_pts_origin); + if (it != frames[stream_idx].end()) { + in_pts_origin = it->pts; + } } - double time_left_this_clip = double(clip.pts_out - in_pts) / TIMEBASE / clip.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. - tie(next_clip, next_clip_idx) = next_clip_callback(); - if (next_clip.pts_in != -1) { - got_next_clip = true; + steady_clock::time_point next_frame_start; + for (int frameno = 0; !should_quit; ++frameno) { // Ends when the clip ends. + double out_pts = out_pts_origin + TIMEBASE * frameno / global_flags.output_framerate; + next_frame_start = + origin + microseconds(lrint((out_pts - out_pts_origin) * 1e6 / TIMEBASE)); + int64_t in_pts = lrint(in_pts_origin + TIMEBASE * frameno * clip.speed / global_flags.output_framerate); + pts = lrint(out_pts); - double duration_next_clip = double(next_clip.pts_out - next_clip.pts_in) / TIMEBASE / clip.speed; - next_clip_fade_time = std::min(time_left_this_clip, duration_next_clip); - in_pts_start_next_clip = next_clip.pts_in + lrint(next_clip_fade_time * TIMEBASE * clip.speed); + if (in_pts >= clip.pts_out) { + break; } - } - // 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; - float fade_alpha = 0.0f; - if (got_next_clip && time_left_this_clip <= next_clip_fade_time) { - secondary_stream_idx = next_clip.stream_idx; - int64_t in_pts_secondary = lrint(next_clip.pts_in + (next_clip_fade_time - time_left_this_clip) * TIMEBASE * clip.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 - // instead of the current one, since it's more visible. - if (fade_alpha >= 0.5f) { - swap(primary_stream_idx, secondary_stream_idx); - swap(in_pts, in_pts_secondary); - fade_alpha = 1.0f - fade_alpha; + steady_clock::duration time_behind = steady_clock::now() - next_frame_start; + if (stream_output != FILE_STREAM_OUTPUT && time_behind >= milliseconds(200)) { + fprintf(stderr, "WARNING: %ld ms behind, dropping a frame (no matter the type).\n", + lrint(1e3 * duration(time_behind).count())); + ++metric_dropped_unconditional_frame; + continue; } - FrameOnDisk frame_lower, frame_upper; - bool ok = find_surrounding_frames(in_pts_secondary, secondary_stream_idx, &frame_lower, &frame_upper); - if (ok) { - secondary_frame = frame_lower; + + // 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; + float fade_alpha = 0.0f; + double time_left_this_clip = double(clip.pts_out - in_pts) / TIMEBASE / clip.speed; + if (next_clip != nullptr && time_left_this_clip <= next_clip_fade_time) { + // We're in a fade to the next clip. + secondary_stream_idx = next_clip->stream_idx; + int64_t in_pts_secondary = lrint(next_clip->pts_in + (next_clip_fade_time - time_left_this_clip) * TIMEBASE * clip.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 + // instead of the current one, since it's more visible. + if (fade_alpha >= 0.5f) { + swap(primary_stream_idx, secondary_stream_idx); + swap(in_pts, in_pts_secondary); + fade_alpha = 1.0f - fade_alpha; + } + + FrameOnDisk frame_lower, frame_upper; + bool ok = find_surrounding_frames(in_pts_secondary, secondary_stream_idx, &frame_lower, &frame_upper); + if (ok) { + 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_for_progress - clip.pts_in) / TIMEBASE / clip.speed; - double total_length = double(clip.pts_out - clip.pts_in) / TIMEBASE / clip.speed; - map progress{{ clip_idx, played_this_clip / total_length }}; + if (progress_callback != nullptr) { + // NOTE: None of this will take into account any snapping done below. + double played_this_clip = double(in_pts_for_progress - clip.pts_in) / TIMEBASE / clip.speed; + double total_length = double(clip.pts_out - clip.pts_in) / TIMEBASE / clip.speed; + 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 / next_clip.speed; - double total_next_length = double(next_clip.pts_out - next_clip.pts_in) / TIMEBASE / next_clip.speed; - progress[next_clip_idx] = played_next_clip / total_next_length; + if (next_clip != nullptr && time_left_this_clip <= next_clip_fade_time) { + double played_next_clip = double(in_pts_secondary_for_progress - next_clip->pts_in) / TIMEBASE / next_clip->speed; + double total_next_length = double(next_clip->pts_out - next_clip->pts_in) / TIMEBASE / next_clip->speed; + progress[clip_idx + 1] = played_next_clip / total_next_length; + } + progress_callback(progress); } - progress_callback(progress); - } - FrameOnDisk frame_lower, frame_upper; - bool ok = find_surrounding_frames(in_pts, primary_stream_idx, &frame_lower, &frame_upper); - if (!ok) { - break; - } + FrameOnDisk frame_lower, frame_upper; + bool ok = find_surrounding_frames(in_pts, primary_stream_idx, &frame_lower, &frame_upper); + if (!ok) { + break; + } - { - unique_lock lock(queue_state_mu); - 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 should_quit || new_clip_ready || override_stream_idx != -1; - }); + // Wait until we should, or (given buffering) can, output the frame. + { + unique_lock lock(queue_state_mu); + 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 should_quit || new_clip_ready || override_stream_idx != -1; + }); + if (should_quit) { + return; + } + } 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 should_quit || new_clip_ready || override_stream_idx != -1; + }); + } if (should_quit) { return; } - } 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; + if (new_clip_ready) { + if (video_stream != nullptr) { + lock.unlock(); // Urg. + video_stream->clear_queue(); + lock.lock(); } - return should_quit || new_clip_ready || override_stream_idx != -1; - }); - } - if (should_quit) { - return; - } - if (new_clip_ready) { - if (video_stream != nullptr) { - lock.unlock(); // Urg. - video_stream->clear_queue(); - lock.lock(); + goto wait_for_clip; } - got_next_clip = false; - goto wait_for_clip; - } - if (override_stream_idx != -1) { - stream_idx = override_stream_idx; - override_stream_idx = -1; - continue; - } - } - - if (frame_lower.pts == frame_upper.pts || global_flags.interpolation_quality == 0) { - auto display_func = [this, primary_stream_idx, frame_lower, secondary_frame, fade_alpha]{ - if (destination != nullptr) { - destination->setFrame(primary_stream_idx, frame_lower, secondary_frame, fade_alpha); - } - }; - if (video_stream == nullptr) { - display_func(); - } else { - if (secondary_stream_idx == -1) { - ++metric_original_frame; - video_stream->schedule_original_frame( - next_frame_start, pts, display_func, QueueSpotHolder(this), - frame_lower); - } else { - assert(secondary_frame.pts != -1); - ++metric_faded_frame; - video_stream->schedule_faded_frame(next_frame_start, pts, display_func, - QueueSpotHolder(this), frame_lower, - secondary_frame, fade_alpha); + // Honor if we got an override request for the camera. + if (override_stream_idx != -1) { + stream_idx = override_stream_idx; + override_stream_idx = -1; + continue; } } - continue; - } - // Snap to input frame: If we can do so with less than 1% jitter - // (ie., move less than 1% of an _output_ frame), do so. - // TODO: Snap secondary (fade-to) clips in the same fashion. - double pts_snap_tolerance = 0.01 * double(TIMEBASE) / global_flags.output_framerate; - bool snapped = false; - for (FrameOnDisk snap_frame : { frame_lower, frame_upper }) { - if (fabs(snap_frame.pts - in_pts) < pts_snap_tolerance) { - auto display_func = [this, primary_stream_idx, snap_frame, secondary_frame, fade_alpha]{ + if (frame_lower.pts == frame_upper.pts || global_flags.interpolation_quality == 0) { + auto display_func = [this, primary_stream_idx, frame_lower, secondary_frame, fade_alpha]{ if (destination != nullptr) { - destination->setFrame(primary_stream_idx, snap_frame, 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) { - ++metric_original_snapped_frame; + ++metric_original_frame; video_stream->schedule_original_frame( - next_frame_start, pts, display_func, - QueueSpotHolder(this), snap_frame); + next_frame_start, pts, display_func, QueueSpotHolder(this), + frame_lower); } else { assert(secondary_frame.pts != -1); - ++metric_faded_snapped_frame; - video_stream->schedule_faded_frame( - next_frame_start, pts, display_func, QueueSpotHolder(this), - snap_frame, secondary_frame, fade_alpha); + ++metric_faded_frame; + video_stream->schedule_faded_frame(next_frame_start, pts, display_func, + QueueSpotHolder(this), frame_lower, + secondary_frame, fade_alpha); } } - in_pts_origin += snap_frame.pts - in_pts; - snapped = true; - break; + last_pts_played = frame_lower.pts; + continue; } - } - if (snapped) { - continue; - } - // The snapping above makes us lock to the input framerate, even in the presence - // of pts drift, for most typical cases where it's needed, like converting 60 → 2x60 - // or 60 → 2x59.94. However, there are some corner cases like 25 → 2x59.94, where we'd - // get a snap very rarely (in the given case, once every 24 output frames), and by - // that time, we'd have drifted out. We could have solved this by changing the overall - // speed ever so slightly, but it requires that we know the actual frame rate (which - // is difficult in the presence of jitter and missed frames), or at least do some kind - // of matching/clustering. Instead, we take the opportunity to lock to in-between rational - // points if we can. E.g., if we are converting 60 → 2x60, we would not only snap to - // an original frame every other frame; we would also snap to exactly alpha=0.5 every - // in-between frame. Of course, we will still need to interpolate, but we get a lot - // closer when we actually get close to an original frame. In other words: Snap more - // often, but snap less each time. Unless the input and output frame rates are completely - // decorrelated with no common factor, of course (e.g. 12.345 → 34.567, which we should - // really never see in practice). - for (double fraction : { 1.0 / 2.0, 1.0 / 3.0, 2.0 / 3.0, 1.0 / 4.0, 3.0 / 4.0, - 1.0 / 5.0, 2.0 / 5.0, 3.0 / 5.0, 4.0 / 5.0 }) { - double subsnap_pts = frame_lower.pts + fraction * (frame_upper.pts - frame_lower.pts); - if (fabs(subsnap_pts - in_pts) < pts_snap_tolerance) { - in_pts_origin += lrint(subsnap_pts) - in_pts; - in_pts = lrint(subsnap_pts); - break; + // Snap to input frame: If we can do so with less than 1% jitter + // (ie., move less than 1% of an _output_ frame), do so. + // TODO: Snap secondary (fade-to) clips in the same fashion. + double pts_snap_tolerance = 0.01 * double(TIMEBASE) / global_flags.output_framerate; + bool snapped = false; + for (FrameOnDisk snap_frame : { frame_lower, frame_upper }) { + if (fabs(snap_frame.pts - in_pts) < pts_snap_tolerance) { + auto display_func = [this, primary_stream_idx, snap_frame, secondary_frame, fade_alpha]{ + if (destination != nullptr) { + destination->setFrame(primary_stream_idx, snap_frame, secondary_frame, fade_alpha); + } + }; + if (video_stream == nullptr) { + display_func(); + } else { + if (secondary_stream_idx == -1) { + ++metric_original_snapped_frame; + video_stream->schedule_original_frame( + next_frame_start, pts, display_func, + QueueSpotHolder(this), snap_frame); + } else { + assert(secondary_frame.pts != -1); + ++metric_faded_snapped_frame; + video_stream->schedule_faded_frame( + next_frame_start, pts, display_func, QueueSpotHolder(this), + snap_frame, secondary_frame, fade_alpha); + } + } + in_pts_origin += snap_frame.pts - in_pts; + snapped = true; + last_pts_played = snap_frame.pts; + break; + } + } + if (snapped) { + continue; } - } - - if (stream_output != FILE_STREAM_OUTPUT && time_behind >= milliseconds(100)) { - fprintf(stderr, "WARNING: %ld ms behind, dropping an interpolated frame.\n", - lrint(1e3 * duration(time_behind).count())); - ++metric_dropped_interpolated_frame; - continue; - } - double alpha = double(in_pts - frame_lower.pts) / (frame_upper.pts - frame_lower.pts); + // The snapping above makes us lock to the input framerate, even in the presence + // of pts drift, for most typical cases where it's needed, like converting 60 → 2x60 + // or 60 → 2x59.94. However, there are some corner cases like 25 → 2x59.94, where we'd + // get a snap very rarely (in the given case, once every 24 output frames), and by + // that time, we'd have drifted out. We could have solved this by changing the overall + // speed ever so slightly, but it requires that we know the actual frame rate (which + // is difficult in the presence of jitter and missed frames), or at least do some kind + // of matching/clustering. Instead, we take the opportunity to lock to in-between rational + // points if we can. E.g., if we are converting 60 → 2x60, we would not only snap to + // an original frame every other frame; we would also snap to exactly alpha=0.5 every + // in-between frame. Of course, we will still need to interpolate, but we get a lot + // closer when we actually get close to an original frame. In other words: Snap more + // often, but snap less each time. Unless the input and output frame rates are completely + // decorrelated with no common factor, of course (e.g. 12.345 → 34.567, which we should + // really never see in practice). + for (double fraction : { 1.0 / 2.0, 1.0 / 3.0, 2.0 / 3.0, 1.0 / 4.0, 3.0 / 4.0, + 1.0 / 5.0, 2.0 / 5.0, 3.0 / 5.0, 4.0 / 5.0 }) { + double subsnap_pts = frame_lower.pts + fraction * (frame_upper.pts - frame_lower.pts); + if (fabs(subsnap_pts - in_pts) < pts_snap_tolerance) { + in_pts_origin += lrint(subsnap_pts) - in_pts; + in_pts = lrint(subsnap_pts); + break; + } + } - if (video_stream == nullptr) { - // Previews don't do any interpolation. - assert(secondary_stream_idx == -1); - if (destination != nullptr) { - destination->setFrame(primary_stream_idx, frame_lower); + if (stream_output != FILE_STREAM_OUTPUT && time_behind >= milliseconds(100)) { + fprintf(stderr, "WARNING: %ld ms behind, dropping an interpolated frame.\n", + lrint(1e3 * duration(time_behind).count())); + ++metric_dropped_interpolated_frame; + continue; } - } else { - auto display_func = [this](shared_ptr frame) { + + 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); if (destination != nullptr) { - destination->setFrame(frame); + destination->setFrame(primary_stream_idx, frame_lower); } - }; - if (secondary_stream_idx == -1) { - ++metric_interpolated_frame; + last_pts_played = frame_lower.pts; } else { - ++metric_interpolated_faded_frame; + auto display_func = [this](shared_ptr frame) { + if (destination != nullptr) { + destination->setFrame(frame); + } + }; + if (secondary_stream_idx == -1) { + ++metric_interpolated_frame; + } else { + ++metric_interpolated_faded_frame; + } + video_stream->schedule_interpolated_frame( + next_frame_start, pts, display_func, QueueSpotHolder(this), + frame_lower, frame_upper, alpha, + secondary_frame, fade_alpha); + last_pts_played = in_pts; // Not really needed; only previews use last_pts_played. } - video_stream->schedule_interpolated_frame( - next_frame_start, pts, display_func, QueueSpotHolder(this), - frame_lower, frame_upper, alpha, - secondary_frame, fade_alpha); } - } - - if (should_quit) { - return; - } - // The clip ended. - - // 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) { - 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; + // The clip ended. + if (should_quit) { + return; } - } - - // 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(); } - got_next_clip = false; // Start the next clip from the point where the fade went out. - origin = next_frame_start; - in_pts_origin = in_pts_start_next_clip; - goto got_clip; + if (next_clip != nullptr) { + origin = next_frame_start; + in_pts_origin = next_clip->pts_in + lrint(next_clip_fade_time * TIMEBASE * clip.speed); + } } - { - unique_lock lock(queue_state_mu); - playing = false; - } if (done_callback != nullptr) { done_callback(); } @@ -447,18 +425,12 @@ Player::~Player() player_thread.join(); } -void Player::play_clip(const Clip &clip, size_t clip_idx, unsigned stream_idx) +void Player::play(const vector &clips) { - { - lock_guard lock(mu); - current_clip = clip; - current_stream_idx = stream_idx; - current_clip_idx = clip_idx; - } - { lock_guard lock(queue_state_mu); new_clip_ready = true; + queued_clip_list = clips; override_stream_idx = -1; new_clip_changed.notify_all(); } @@ -470,36 +442,34 @@ void Player::override_angle(unsigned stream_idx) { unique_lock lock(queue_state_mu); if (new_clip_ready) { - lock_guard lock2(mu); - current_stream_idx = stream_idx; + assert(queued_clip_list.size() == 1); + queued_clip_list[0].stream_idx = stream_idx; return; } - } - // If we are playing a clip, set override_stream_idx, and the player thread will - // pick it up and change its internal index. - { - unique_lock lock(queue_state_mu); + // If we are playing a clip, set override_stream_idx, and the player thread will + // pick it up and change its internal index. if (playing) { override_stream_idx = stream_idx; new_clip_changed.notify_all(); + return; } } // OK, so we're standing still, presumably at the end of a clip. - // Look at the current pts_out (if it exists), and show the closest + // Look at the last frame played (if it exists), and show the closest // thing we've got. - int64_t pts_out; + int64_t last_pts; { - lock_guard lock(mu); - if (current_clip.pts_out < 0) { + lock_guard lock(queue_state_mu); + if (last_pts_played < 0) { return; } - pts_out = current_clip.pts_out; + last_pts = last_pts_played; } lock_guard lock(frame_mu); - auto it = find_first_frame_at_or_after(frames[stream_idx], pts_out); + auto it = find_first_frame_at_or_after(frames[stream_idx], last_pts); if (it == frames[stream_idx].end()) { return; } diff --git a/futatabi/player.h b/futatabi/player.h index 33a83e5..5485bdf 100644 --- a/futatabi/player.h +++ b/futatabi/player.h @@ -32,7 +32,7 @@ public: Player(JPEGFrameView *destination, StreamOutput stream_output, AVFormatContext *file_avctx = nullptr); ~Player(); - void play_clip(const Clip &clip, size_t clip_idx, unsigned stream_idx); + void play(const std::vector &clips); void override_angle(unsigned stream_idx); // For the current clip only. // Not thread-safe to set concurrently with playing. @@ -42,12 +42,7 @@ public: // Not thread-safe to set concurrently with playing. // Will be called back from the player thread. - // The second parameter is the clip's position in the play list. - using next_clip_callback_func = std::function()>; - void set_next_clip_callback(next_clip_callback_func cb) { next_clip_callback = cb; } - - // Not thread-safe to set concurrently with playing. - // Will be called back from the player thread. + // The keys in the given map are indexes in the vector given to play(). using progress_callback_func = std::function &progress)>; void set_progress_callback(progress_callback_func cb) { progress_callback = cb; } @@ -70,19 +65,15 @@ private: JPEGFrameView *destination; done_callback_func done_callback; - next_clip_callback_func next_clip_callback; progress_callback_func progress_callback; - std::mutex mu; - Clip current_clip; // Under mu. Can have pts_in = -1 for no clip. - size_t current_clip_idx; // Under mu. - unsigned current_stream_idx; // Under mu. - std::mutex queue_state_mu; std::condition_variable new_clip_changed; + std::vector queued_clip_list; // Under queue_state_mu. bool new_clip_ready = false; // Under queue_state_mu. bool playing = false; // Under queue_state_mu. int override_stream_idx = -1; // Under queue_state_mu. + int64_t last_pts_played = -1; // Under queue_state_mu. Used by previews only. std::unique_ptr video_stream; // Can be nullptr. -- 2.39.2