X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=futatabi%2Fplayer.cpp;h=c4ed8972135e24df4e817f47dcd001ac77cffdec;hb=0b5087af0916e8b887a8a8d319500ba0a6fcec4f;hp=918b61dbef6cf64ebede07abfd7502a63202425c;hpb=b563b8903fa84bb7fd62d7d0b84b70cb26843dbf;p=nageru diff --git a/futatabi/player.cpp b/futatabi/player.cpp index 918b61d..c4ed897 100644 --- a/futatabi/player.cpp +++ b/futatabi/player.cpp @@ -1,14 +1,15 @@ #include "player.h" #include "clip_list.h" -#include "context.h" +#include "shared/context.h" #include "defs.h" #include "shared/ffmpeg_raii.h" +#include "flags.h" #include "frame_on_disk.h" -#include "httpd.h" +#include "shared/httpd.h" #include "jpeg_frame_view.h" -#include "mux.h" -#include "timebase.h" +#include "shared/mux.h" +#include "shared/timebase.h" #include "video_stream.h" #include @@ -25,7 +26,7 @@ using namespace std::chrono; extern HTTPD *global_httpd; -void Player::thread_func(bool also_output_to_stream) +void Player::thread_func(Player::StreamOutput stream_output, AVFormatContext *file_avctx) { pthread_setname_np(pthread_self(), "Player"); @@ -39,21 +40,20 @@ void Player::thread_func(bool also_output_to_stream) check_error(); // Create the VideoStream object, now that we have an OpenGL context. - if (also_output_to_stream) { - video_stream.reset(new VideoStream); + if (stream_output != NO_STREAM_OUTPUT) { + video_stream.reset(new VideoStream(file_avctx)); video_stream->start(); } check_error(); - 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; - for ( ;; ) { + while (!should_quit) { wait_for_clip: bool clip_ready; steady_clock::time_point before_sleep = steady_clock::now(); @@ -62,8 +62,11 @@ wait_for_clip: { unique_lock lock(queue_state_mu); clip_ready = new_clip_changed.wait_for(lock, milliseconds(100), [this] { - return new_clip_ready && current_clip.pts_in != -1; + return should_quit || (new_clip_ready && current_clip.pts_in != -1); }); + if (should_quit) { + return; + } new_clip_ready = false; playing = true; } @@ -99,24 +102,19 @@ got_clip: lock_guard lock(frame_mu); // 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, - [](const FrameOnDisk &frame, int64_t pts) { return frame.pts < pts; }); + auto it = find_last_frame_before(frames[stream_idx], in_pts_origin); if (it != frames[stream_idx].end()) { in_pts_origin = it->pts; } } - // TODO: Lock to a rational multiple of the frame rate if possible. - double speed = 0.5; - int64_t in_pts_start_next_clip = -1; - for (int frameno = 0; ; ++frameno) { // Ends when the clip ends. - double out_pts = out_pts_origin + TIMEBASE * frameno / output_framerate; - steady_clock::time_point next_frame_start = + 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 * speed / 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) { @@ -124,22 +122,22 @@ got_clip: } steady_clock::duration time_behind = steady_clock::now() - next_frame_start; - if (time_behind >= milliseconds(200)) { + 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())); continue; } - double time_left_this_clip = double(clip.pts_out - in_pts) / TIMEBASE / speed; + 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; - double duration_next_clip = (next_clip.pts_out - next_clip.pts_in) / TIMEBASE / speed; + 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 * speed); + in_pts_start_next_clip = next_clip.pts_in + lrint(next_clip_fade_time * TIMEBASE * clip.speed); } } @@ -152,7 +150,7 @@ got_clip: 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 * 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; @@ -173,13 +171,13 @@ 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_for_progress - clip.pts_in) / TIMEBASE / speed; - double total_length = double(clip.pts_out - clip.pts_in) / TIMEBASE / speed; + 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 / speed; - double total_next_length = double(next_clip.pts_out - next_clip.pts_in) / TIMEBASE / speed; + 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; } progress_callback(progress); @@ -196,8 +194,11 @@ got_clip: 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; + 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 @@ -209,9 +210,12 @@ got_clip: if (num_queued_frames < max_queued_frames) { return true; } - return new_clip_ready || override_stream_idx != -1; + 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. @@ -228,9 +232,11 @@ got_clip: } } - if (frame_lower.pts == frame_upper.pts) { + 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]{ - destination->setFrame(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(); @@ -252,14 +258,14 @@ got_clip: // 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 (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) { - FrameOnDisk snap_frame = frame_lower; - snap_frame.pts = snap_pts; + 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]{ - destination->setFrame(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(); @@ -275,7 +281,7 @@ got_clip: snap_frame, secondary_frame, fade_alpha); } } - in_pts_origin += snap_pts - in_pts; + in_pts_origin += snap_frame.pts - in_pts; snapped = true; break; } @@ -284,7 +290,32 @@ got_clip: continue; } - if (time_behind >= milliseconds(100)) { + // 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 (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())); continue; @@ -295,10 +326,14 @@ got_clip: if (video_stream == nullptr) { // Previews don't do any interpolation. assert(secondary_stream_idx == -1); - destination->setFrame(primary_stream_idx, frame_lower); + if (destination != nullptr) { + destination->setFrame(primary_stream_idx, frame_lower); + } } else { auto display_func = [this](shared_ptr frame) { - destination->setFrame(frame); + if (destination != nullptr) { + destination->setFrame(frame); + } }; video_stream->schedule_interpolated_frame( next_frame_start, pts, display_func, QueueSpotHolder(this), @@ -307,6 +342,10 @@ got_clip: } } + if (should_quit) { + return; + } + // The clip ended. // Last-ditch effort to get the next clip (if e.g. the fade time was zero seconds). @@ -329,7 +368,7 @@ got_clip: got_next_clip = false; // Start the next clip from the point where the fade went out. - origin = steady_clock::now(); + origin = next_frame_start; in_pts_origin = in_pts_start_next_clip; goto got_clip; } @@ -350,10 +389,7 @@ bool Player::find_surrounding_frames(int64_t pts, int stream_idx, FrameOnDisk *f 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, - [](const FrameOnDisk &frame, int64_t pts) { return frame.pts < pts; }); + auto it = find_last_frame_before(frames[stream_idx], pts); if (it == frames[stream_idx].end()) { return false; } @@ -370,10 +406,20 @@ bool Player::find_surrounding_frames(int64_t pts, int stream_idx, FrameOnDisk *f return true; } -Player::Player(JPEGFrameView *destination, bool also_output_to_stream) +Player::Player(JPEGFrameView *destination, Player::StreamOutput stream_output, AVFormatContext *file_avctx) : destination(destination) { - thread(&Player::thread_func, this, also_output_to_stream).detach(); + player_thread = thread(&Player::thread_func, this, stream_output, file_avctx); +} + +Player::~Player() +{ + should_quit = true; + if (video_stream != nullptr) { + video_stream->stop(); + } + new_clip_changed.notify_all(); + player_thread.join(); } void Player::play_clip(const Clip &clip, size_t clip_idx, unsigned stream_idx) @@ -428,8 +474,7 @@ 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, - [](int64_t pts, const FrameOnDisk &frame) { return pts < frame.pts; }); + auto it = find_first_frame_at_or_after(frames[stream_idx], pts_out); if (it == frames[stream_idx].end()) { return; } @@ -449,3 +494,27 @@ void Player::release_queue_spot() --num_queued_frames; new_clip_changed.notify_all(); } + +double compute_time_left(const vector &clips, const map &progress) +{ + // 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]; + double clip_length = double(clip.pts_out - clip.pts_in) / TIMEBASE / clip.speed; + if (row == last_it->first) { + // A clip we're playing: Subtract the part we've already played. + remaining = clip_length * (1.0 - last_it->second); + } else { + // A clip we haven't played yet: Subtract the part that's overlapping + // with a previous clip (due to fade). + remaining += max(clip_length - last_fade_time_seconds, 0.0); + } + last_fade_time_seconds = min(clip_length, clip.fade_time_seconds); + } + return remaining; +}