bool clip_ready;
steady_clock::time_point before_sleep = steady_clock::now();
string pause_status;
- float master_speed = 1.0f;
+ float master_speed = start_master_speed;
// Wait until we're supposed to play something.
{
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;
+ } else {
+ secondary_stream_idx = -1;
}
}
subtitle = ss.str();
}
- // If there's nothing to interpolate between, or if interpolation is turned off,
- // or we're a preview, then just display the frame.
- if (frame_lower.pts == frame_upper.pts || global_flags.interpolation_quality == 0 || video_stream == nullptr) {
- display_single_frame(primary_stream_idx, frame_lower, secondary_stream_idx,
- secondary_frame, fade_alpha, next_frame_start, /*snapped=*/false,
- subtitle, play_audio);
- 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.
continue;
}
+ // If there's nothing to interpolate between, or if interpolation is turned off,
+ // or we're a preview, then just display the frame.
+ if (frame_lower.pts == frame_upper.pts || global_flags.interpolation_quality == 0 || video_stream == nullptr) {
+ display_single_frame(primary_stream_idx, frame_lower, secondary_stream_idx,
+ secondary_frame, fade_alpha, next_frame_start, /*snapped=*/false,
+ subtitle, play_audio);
+ 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
}
// Find the frame immediately before and after this point.
+// If we have an exact match, return it immediately.
bool Player::find_surrounding_frames(int64_t pts, int stream_idx, FrameOnDisk *frame_lower, FrameOnDisk *frame_upper)
{
lock_guard<mutex> lock(frame_mu);
}
*frame_upper = *it;
+ // If we have an exact match, return it immediately.
+ if (frame_upper->pts == pts) {
+ *frame_lower = *it;
+ return true;
+ }
+
// Find the last frame such that in_pts <= frame.pts (if any).
if (it == frames[stream_idx].begin()) {
*frame_lower = *it;
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 (clip_length >= 86400.0) { // More than one day.
+ if (clip_length >= 86400.0 || clip.pts_out == -1) { // More than one day.
++remaining.num_infinite;
} else {
if (row == currently_playing_idx) {