X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=player.cpp;h=079f5cf3116d3f603e181d05bdfc3bdc8c930d51;hb=b9583e6a9c726eeee96eb574a81b77f521f9c004;hp=5ff448c4bc239ec2b0975a9b7597e27da81891df;hpb=393a2a974ea26d9eac26b52aabc12f48b0dbfeb2;p=nageru diff --git a/player.cpp b/player.cpp index 5ff448c..079f5cf 100644 --- a/player.cpp +++ b/player.cpp @@ -69,6 +69,7 @@ void Player::thread_func(bool also_output_to_stream) clip = current_clip; stream_idx = current_stream_idx; } +got_clip: steady_clock::time_point origin = steady_clock::now(); int64_t in_pts_origin = clip.pts_in; int64_t out_pts_origin = pts; @@ -89,7 +90,6 @@ void Player::thread_func(bool also_output_to_stream) // TODO: Lock to a rational multiple of the frame rate if possible. double speed = 0.5; - bool aborted = false; 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 = @@ -97,30 +97,18 @@ void Player::thread_func(bool also_output_to_stream) int64_t in_pts = lrint(in_pts_origin + TIMEBASE * frameno * speed / output_framerate); pts = lrint(out_pts); - int64_t in_pts_lower, in_pts_upper; - - // Find the frame immediately before and after this point. - { - lock_guard lock(frame_mu); - - // Find the first frame such that in_pts >= frame.pts. - auto it = lower_bound(frames[stream_idx].begin(), - frames[stream_idx].end(), - in_pts); - if (it == frames[stream_idx].end() || *it >= clip.pts_out) { - break; - } - in_pts_upper = *it; + steady_clock::duration time_behind = steady_clock::now() - next_frame_start; + if (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; + } - // Find the last frame such that in_pts <= frame.pts (if any). - if (it == frames[stream_idx].begin()) { - in_pts_lower = *it; - } else { - in_pts_lower = *(it - 1); - } + int64_t in_pts_lower, in_pts_upper; + bool ok = find_surrounding_frames(in_pts, stream_idx, &in_pts_lower, &in_pts_upper); + if (!ok || in_pts_upper >= clip.pts_out) { + break; } - assert(in_pts >= in_pts_lower); - assert(in_pts <= in_pts_upper); // Sleep until the next frame start, or until there's a new clip we're supposed to play. { @@ -136,31 +124,43 @@ void Player::thread_func(bool also_output_to_stream) } } + 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 total_length = double(clip.pts_out - clip.pts_in) / TIMEBASE / speed; + progress_callback(played_this_clip, total_length); + } + if (in_pts_lower == in_pts_upper) { destination->setFrame(stream_idx, in_pts_lower, /*interpolated=*/false); if (video_stream != nullptr) { - video_stream->schedule_original_frame(lrint(out_pts), stream_idx, in_pts_lower); + video_stream->schedule_original_frame(pts, stream_idx, in_pts_lower); } 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. - double in_pts_lower_as_frameno = (in_pts_lower - in_pts_origin) * output_framerate / TIMEBASE / speed; - double in_pts_upper_as_frameno = (in_pts_upper - in_pts_origin) * output_framerate / TIMEBASE / speed; - if (fabs(in_pts_lower_as_frameno - frameno) < 0.01) { - destination->setFrame(stream_idx, in_pts_lower, /*interpolated=*/false); - if (video_stream != nullptr) { - video_stream->schedule_original_frame(lrint(out_pts), stream_idx, in_pts_lower); + bool snapped = false; + for (int64_t snap_pts : { in_pts_lower, in_pts_upper }) { + double snap_pts_as_frameno = (snap_pts - in_pts_origin) * output_framerate / TIMEBASE / speed; + if (fabs(snap_pts_as_frameno - frameno) < 0.01) { + destination->setFrame(stream_idx, snap_pts, /*interpolated=*/false); + if (video_stream != nullptr) { + video_stream->schedule_original_frame(pts, stream_idx, snap_pts); + } + in_pts_origin += snap_pts - in_pts; + snapped = true; + break; } - in_pts_origin += in_pts_lower - in_pts; + } + if (snapped) { continue; - } else if (fabs(in_pts_upper_as_frameno - frameno) < 0.01) { - destination->setFrame(stream_idx, in_pts_upper, /*interpolated=*/false); - if (video_stream != nullptr) { - video_stream->schedule_original_frame(lrint(out_pts), stream_idx, in_pts_upper); - } - in_pts_origin += in_pts_upper - in_pts; + } + + if (time_behind >= milliseconds(100)) { + fprintf(stderr, "WARNING: %ld ms behind, dropping an interpolated frame.\n", + lrint(1e3 * duration(time_behind).count())); continue; } @@ -172,8 +172,20 @@ void Player::thread_func(bool also_output_to_stream) } else { // Calculate the interpolated frame. When it's done, the destination // will be unblocked. - destination->setFrame(stream_idx, lrint(out_pts), /*interpolated=*/true); - video_stream->schedule_interpolated_frame(lrint(out_pts), stream_idx, in_pts_lower, in_pts_upper, alpha); + destination->setFrame(stream_idx, pts, /*interpolated=*/true); + video_stream->schedule_interpolated_frame(pts, stream_idx, in_pts_lower, in_pts_upper, alpha); + } + } + + if (next_clip_callback != nullptr) { + Clip next_clip = next_clip_callback(); + if (next_clip.pts_in != -1) { + clip = next_clip; + 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(); + } + goto got_clip; } } @@ -181,12 +193,37 @@ void Player::thread_func(bool also_output_to_stream) unique_lock lock(queue_state_mu); playing = false; } - if (done_callback != nullptr && !aborted) { + if (done_callback != nullptr) { done_callback(); } } } +// 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) +{ + 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); + if (it == frames[stream_idx].end()) { + return false; + } + *pts_upper = *it; + + // Find the last frame such that in_pts <= frame.pts (if any). + if (it == frames[stream_idx].begin()) { + *pts_lower = *it; + } else { + *pts_lower = *(it - 1); + } + assert(pts >= *pts_lower); + assert(pts <= *pts_upper); + return true; +} + Player::Player(JPEGFrameView *destination, bool also_output_to_stream) : destination(destination) {