RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

vo: improve frame drop logic on high playback rate 

Commit f1746741de changed the drop
logic to have more slack (drop more frames but less frequent) to prevent
drops due to timing jitter when the clip and screen have similar rates.

However, if the clip has higher rate than the screen (or just higher
playback rate), then that policy hurts smoothness since these "chunked
drops" look worse than one frame drop at a time.

This patch restores the old drop logic when the playback frame rate is
higher than ~5% above the screen refresh rate, and solves this issue.

Fixes #1897
This commit is contained in:
Avi Halachmi (:avih) 2015-05-01 17:05:28 +03:00
parent d01228058b
commit ffcad1a72b
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
video/out/vo.c
View File

@ -608,14 +608,22 @@ static bool render_frame(struct vo *vo)
if (!in->hasframe_rendered)
duration = -1; // disable framedrop
// if the clip and display have similar/identical fps, it's possible that
// If the clip and display have similar/identical fps, it's possible that
// we'll be very slightly late frequently due to timing jitter, or if the
// clip/container timestamps are not very accurate.
// so if we dropped the previous frame, keep dropping until we're aligned
// So if we dropped the previous frame, keep dropping until we're aligned
// perfectly, else, allow some slack (1 vsync) to let it settle into a rhythm.
// On low clip fps, we don't drop anyway and the slack logic doesn't matter.
// If the clip fps is more than ~5% above screen fps, we remove this slack
// and use "normal" logic to allow more regular drops of 1 frame at a time.
bool use_slack = duration > (0.95 * in->vsync_interval);
in->dropped_frame = duration >= 0 &&
use_slack ?
((in->dropped_frame && end_time < next_vsync) ||
(end_time < prev_vsync)); // hard threshold - 1 vsync late
(end_time < prev_vsync)) // hard threshold - 1 vsync late
:
end_time < next_vsync; // normal frequent drops
in->dropped_frame &= !(vo->driver->caps & VO_CAP_FRAMEDROP);
in->dropped_frame &= (vo->global->opts->frame_dropping & 1);