X-Git-Url: https://git.sesse.net/?p=nageru;a=blobdiff_plain;f=futatabi%2Fplayer.cpp;h=6f329ef506e7ae3df18865d685ef92682b538ae7;hp=6320d37b54883a96aae3a207a628c330bb66664c;hb=72f2abe1fe64ad62dfd6c7fa7b3435a5d4aa111b;hpb=4b0234d5b2bce39ce701d0bf264ab2257e7ddd01 diff --git a/futatabi/player.cpp b/futatabi/player.cpp index 6320d37..6f329ef 100644 --- a/futatabi/player.cpp +++ b/futatabi/player.cpp @@ -1,13 +1,13 @@ #include "player.h" #include "clip_list.h" -#include "shared/context.h" #include "defs.h" -#include "shared/ffmpeg_raii.h" #include "flags.h" #include "frame_on_disk.h" -#include "shared/httpd.h" #include "jpeg_frame_view.h" +#include "shared/context.h" +#include "shared/ffmpeg_raii.h" +#include "shared/httpd.h" #include "shared/metrics.h" #include "shared/mux.h" #include "shared/timebase.h" @@ -60,11 +60,57 @@ double calc_progress(const Clip &clip, int64_t pts) return double(pts - clip.pts_in) / (clip.pts_out - clip.pts_in); } +void do_splice(const vector &new_list, size_t playing_index1, ssize_t playing_index2, vector *old_list) +{ + assert(playing_index2 == -1 || size_t(playing_index2) == playing_index1 + 1); + + // First see if we can do the simple thing; find an element in the new + // list that we are already playing, which will serve as our splice point. + int splice_start_new_list = -1; + for (size_t clip_idx = 0; clip_idx < new_list.size(); ++clip_idx) { + if (new_list[clip_idx].id == (*old_list)[playing_index1].id) { + splice_start_new_list = clip_idx + 1; + } else if (playing_index2 != -1 && new_list[clip_idx].id == (*old_list)[playing_index2].id) { + splice_start_new_list = clip_idx + 1; + } + } + if (splice_start_new_list == -1) { + // OK, so the playing items are no longer in the new list. Most likely, + // that means we deleted some range that included them. But the ones + // before should stay put -- and we don't want to play them. So find + // the ones that we've already played, and ignore them. Hopefully, + // they're contiguous; the last one that's not seen will be our cut point. + // + // Keeping track of the playlist range explicitly in the UI would remove + // the need for these heuristics, but it would probably also mean we'd + // have to lock the playing clip, which sounds annoying. + unordered_map played_ids; + for (size_t clip_idx = 0; clip_idx < playing_index1; ++old_list) { + played_ids.emplace((*old_list)[clip_idx].id, clip_idx); + } + for (size_t clip_idx = 0; clip_idx < new_list.size(); ++clip_idx) { + if (played_ids.count(new_list[clip_idx].id)) { + splice_start_new_list = clip_idx + 1; + } + } + + if (splice_start_new_list == -1) { + // OK, we didn't find any matches; the lists are totally distinct. + // So probably the entire thing was deleted; leave it alone. + return; + } + } + + size_t splice_start_old_list = ((playing_index2 == -1) ? playing_index1 : playing_index2) + 1; + old_list->erase(old_list->begin() + splice_start_old_list, old_list->end()); + old_list->insert(old_list->end(), new_list.begin() + splice_start_new_list, new_list.end()); +} + } // namespace void Player::play_playlist_once() { - vector clip_list; + vector clip_list; bool clip_ready; steady_clock::time_point before_sleep = steady_clock::now(); @@ -84,6 +130,7 @@ void Player::play_playlist_once() clip_list = move(queued_clip_list); queued_clip_list.clear(); assert(!clip_list.empty()); + assert(!splice_ready); // This corner case should have been handled in splice_play(). } } @@ -99,20 +146,20 @@ void Player::play_playlist_once() } steady_clock::time_point origin = steady_clock::now(); // TODO: Add a 100 ms buffer for ramp-up? - int64_t in_pts_origin = clip_list[0].pts_in; + int64_t in_pts_origin = clip_list[0].clip.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; + const Clip *clip = &clip_list[clip_idx].clip; + const Clip *next_clip = (clip_idx + 1 < clip_list.size()) ? &clip_list[clip_idx + 1].clip : 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); + 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); } - int stream_idx = clip.stream_idx; + int stream_idx = clip->stream_idx; // Start playing exactly at a frame. // TODO: Snap secondary (fade-to) clips in the same fashion @@ -132,22 +179,47 @@ void Player::play_playlist_once() 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); + 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) { + if (in_pts >= clip->pts_out) { break; } + { + lock_guard lock(queue_state_mu); + if (splice_ready) { + fprintf(stderr, "splicing\n"); + if (next_clip == nullptr) { + do_splice(to_splice_clip_list, clip_idx, -1, &clip_list); + } else { + do_splice(to_splice_clip_list, clip_idx, clip_idx + 1, &clip_list); + } + to_splice_clip_list.clear(); + splice_ready = false; + + // Refresh the clip pointer, since the clip list may have been reallocated. + clip = &clip_list[clip_idx].clip; + + // Recompute next_clip and any needed fade times, since the next clip may have changed + // (or we may have gone from no new clip to having one, or the other way). + next_clip = (clip_idx + 1 < clip_list.size()) ? &clip_list[clip_idx + 1].clip : nullptr; + if (next_clip != nullptr) { + double duration_this_clip = double(clip->pts_out - in_pts) / 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); + } + } + } + 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())); + lrint(1e3 * duration(time_behind).count())); ++metric_dropped_unconditional_frame; continue; } - // pts not affected by the swapping below. int64_t in_pts_for_progress = in_pts, in_pts_secondary_for_progress = -1; @@ -155,11 +227,11 @@ void Player::play_playlist_once() 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; + 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. + // 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); + 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; @@ -180,11 +252,17 @@ void Player::play_playlist_once() if (progress_callback != nullptr) { // NOTE: None of this will take into account any snapping done below. - map progress{{ clip_idx, calc_progress(clip, in_pts_for_progress) }}; + double clip_progress = calc_progress(*clip, in_pts_for_progress); + map progress{ { clip_list[clip_idx].id, clip_progress } }; + double time_remaining; if (next_clip != nullptr && time_left_this_clip <= next_clip_fade_time) { - progress[clip_idx + 1] = calc_progress(*next_clip, in_pts_secondary_for_progress); + double next_clip_progress = calc_progress(*next_clip, in_pts_secondary_for_progress); + progress[clip_list[clip_idx + 1].id] = next_clip_progress; + time_remaining = compute_time_left(clip_list, clip_idx + 1, next_clip_progress); + } else { + time_remaining = compute_time_left(clip_list, clip_idx, clip_progress); } - progress_callback(progress); + progress_callback(progress, time_remaining); } FrameOnDisk frame_lower, frame_upper; @@ -198,7 +276,7 @@ void Player::play_playlist_once() 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]{ + new_clip_changed.wait_until(lock, next_frame_start, [this] { return should_quit || new_clip_ready || override_stream_idx != -1; }); if (should_quit) { @@ -211,7 +289,7 @@ void Player::play_playlist_once() // // In this case, we don't sleep until next_frame_start; the displaying is // done by the queue. - new_clip_changed.wait(lock, [this]{ + new_clip_changed.wait(lock, [this] { if (num_queued_frames < max_queued_frames) { return true; } @@ -253,7 +331,7 @@ void Player::play_playlist_once() for (FrameOnDisk snap_frame : { frame_lower, frame_upper }) { if (fabs(snap_frame.pts - in_pts) < pts_snap_tolerance) { display_single_frame(primary_stream_idx, snap_frame, secondary_stream_idx, - secondary_frame, fade_alpha, next_frame_start, /*snapped=*/true); + secondary_frame, fade_alpha, next_frame_start, /*snapped=*/true); in_pts_origin += snap_frame.pts - in_pts; snapped = true; break; @@ -279,7 +357,7 @@ void Player::play_playlist_once() // 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 }) { + 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; @@ -290,7 +368,7 @@ void Player::play_playlist_once() 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())); + lrint(1e3 * duration(time_behind).count())); ++metric_dropped_interpolated_frame; continue; } @@ -317,14 +395,11 @@ void Player::play_playlist_once() if (should_quit) { return; } - if (done_callback != nullptr) { - done_callback(); - } // Start the next clip from the point where the fade went out. if (next_clip != nullptr) { origin = next_frame_start; - in_pts_origin = next_clip->pts_in + lrint(next_clip_fade_time * TIMEBASE * clip.speed); + in_pts_origin = next_clip->pts_in + lrint(next_clip_fade_time * TIMEBASE * clip->speed); } } @@ -335,7 +410,7 @@ void Player::play_playlist_once() void Player::display_single_frame(int primary_stream_idx, const FrameOnDisk &primary_frame, int secondary_stream_idx, const FrameOnDisk &secondary_frame, double fade_alpha, steady_clock::time_point frame_start, bool snapped) { - auto display_func = [this, primary_stream_idx, primary_frame, secondary_frame, fade_alpha]{ + auto display_func = [this, primary_stream_idx, primary_frame, secondary_frame, fade_alpha] { if (destination != nullptr) { destination->setFrame(primary_stream_idx, primary_frame, secondary_frame, fade_alpha); } @@ -362,8 +437,8 @@ void Player::display_single_frame(int primary_stream_idx, const FrameOnDisk &pri ++metric_faded_frame; } video_stream->schedule_faded_frame(frame_start, pts, display_func, - QueueSpotHolder(this), primary_frame, - secondary_frame, fade_alpha); + QueueSpotHolder(this), primary_frame, + secondary_frame, fade_alpha); } } last_pts_played = primary_frame.pts; @@ -398,15 +473,15 @@ Player::Player(JPEGFrameView *destination, Player::StreamOutput stream_output, A player_thread = thread(&Player::thread_func, this, file_avctx); if (stream_output == HTTPD_STREAM_OUTPUT) { - global_metrics.add("http_output_frames", {{ "type", "original" }, { "reason", "edge_frame_or_no_interpolation" }}, &metric_original_frame); - global_metrics.add("http_output_frames", {{ "type", "faded" }, { "reason", "edge_frame_or_no_interpolation" }}, &metric_faded_frame); - global_metrics.add("http_output_frames", {{ "type", "original" }, { "reason", "snapped" }}, &metric_original_snapped_frame); - global_metrics.add("http_output_frames", {{ "type", "faded" }, { "reason", "snapped" }}, &metric_faded_snapped_frame); - global_metrics.add("http_output_frames", {{ "type", "interpolated" }}, &metric_interpolated_frame); - global_metrics.add("http_output_frames", {{ "type", "interpolated_faded" }}, &metric_interpolated_faded_frame); - global_metrics.add("http_output_frames", {{ "type", "refresh" }}, &metric_refresh_frame); - global_metrics.add("http_dropped_frames", {{ "type", "interpolated" }}, &metric_dropped_interpolated_frame); - global_metrics.add("http_dropped_frames", {{ "type", "unconditional" }}, &metric_dropped_unconditional_frame); + global_metrics.add("http_output_frames", { { "type", "original" }, { "reason", "edge_frame_or_no_interpolation" } }, &metric_original_frame); + global_metrics.add("http_output_frames", { { "type", "faded" }, { "reason", "edge_frame_or_no_interpolation" } }, &metric_faded_frame); + global_metrics.add("http_output_frames", { { "type", "original" }, { "reason", "snapped" } }, &metric_original_snapped_frame); + global_metrics.add("http_output_frames", { { "type", "faded" }, { "reason", "snapped" } }, &metric_faded_snapped_frame); + global_metrics.add("http_output_frames", { { "type", "interpolated" } }, &metric_interpolated_frame); + global_metrics.add("http_output_frames", { { "type", "interpolated_faded" } }, &metric_interpolated_faded_frame); + global_metrics.add("http_output_frames", { { "type", "refresh" } }, &metric_refresh_frame); + global_metrics.add("http_dropped_frames", { { "type", "interpolated" } }, &metric_dropped_interpolated_frame); + global_metrics.add("http_dropped_frames", { { "type", "unconditional" } }, &metric_dropped_unconditional_frame); } } @@ -420,15 +495,29 @@ Player::~Player() player_thread.join(); } -void Player::play(const vector &clips) +void Player::play(const vector &clips) { lock_guard lock(queue_state_mu); new_clip_ready = true; queued_clip_list = clips; + splice_ready = false; override_stream_idx = -1; new_clip_changed.notify_all(); } +void Player::splice_play(const vector &clips) +{ + lock_guard lock(queue_state_mu); + if (new_clip_ready) { + queued_clip_list = clips; + assert(!splice_ready); + return; + } + + splice_ready = true; + to_splice_clip_list = clips; // Overwrite any queued but not executed splice. +} + void Player::override_angle(unsigned stream_idx) { int64_t last_pts; @@ -438,7 +527,7 @@ void Player::override_angle(unsigned stream_idx) lock_guard lock(queue_state_mu); if (new_clip_ready) { assert(queued_clip_list.size() == 1); - queued_clip_list[0].stream_idx = stream_idx; + queued_clip_list[0].clip.stream_idx = stream_idx; return; } @@ -481,20 +570,17 @@ void Player::release_queue_spot() new_clip_changed.notify_all(); } -double compute_time_left(const vector &clips, const map &progress) +double compute_time_left(const vector &clips, size_t currently_playing_idx, double progress_currently_playing) { // Look at the last clip and then start counting from there. - assert(!progress.empty()); - auto last_it = progress.end(); - --last_it; double remaining = 0.0; double last_fade_time_seconds = 0.0; - for (size_t row = last_it->first; row < clips.size(); ++row) { - const Clip &clip = clips[row]; + for (size_t row = currently_playing_idx; row < clips.size(); ++row) { + const Clip &clip = clips[row].clip; double clip_length = double(clip.pts_out - clip.pts_in) / TIMEBASE / clip.speed; - if (row == last_it->first) { + if (row == currently_playing_idx) { // A clip we're playing: Subtract the part we've already played. - remaining = clip_length * (1.0 - last_it->second); + remaining = clip_length * (1.0 - progress_currently_playing); } else { // A clip we haven't played yet: Subtract the part that's overlapping // with a previous clip (due to fade).