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

vo: improve vsync delay detection 

Actually I'm not content with the detection added in commit 44376d2d. It
triggers too often if vsync is very jittery. It's easy to avoid this: we
add more samples to the detection by reusing the drift computation loop.
If there's a significant step in the drift, we consider it a drop.
This commit is contained in:
wm4 2015-11-27 14:35:08 +01:00
parent b250c19a38
commit 85498a0797
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
video/out/vo.c
View File

@ -368,7 +368,19 @@ static void update_vsync_timing_after_swap(struct vo *vo)
MP_STATS(vo, "value %f jitter", in->estimated_vsync_jitter); MP_STATS(vo, "value %f jitter", in->estimated_vsync_jitter);
MP_STATS(vo, "value %f vsync-diff", in->vsync_samples[0] / 1e6); MP_STATS(vo, "value %f vsync-diff", in->vsync_samples[0] / 1e6);
if (llabs(in->base_vsync - now) > in->vsync_interval * 2 / 3) { int window = 4;
int64_t t_r = now, t_e = in->base_vsync, diff = 0, desync_early = 0;
for (int n = 0; n < in->drop_point; n++) {
diff += t_r - t_e;
t_r -= in->vsync_samples[n];
t_e -= in->vsync_interval;
if (n == window + 1)
desync_early = diff / window;
}
int64_t desync = diff / in->num_vsync_samples;
if (in->drop_point > window * 2 &&
labs(desync - desync_early) >= in->vsync_interval * 3 / 4)
{
// Assume a drop. An underflow can technically speaking not be a drop // Assume a drop. An underflow can technically speaking not be a drop
// (it's up to the driver what this is supposed to mean), but no reason // (it's up to the driver what this is supposed to mean), but no reason
// to treat it differently. // to treat it differently.
@ -376,17 +388,11 @@ static void update_vsync_timing_after_swap(struct vo *vo)
in->delayed_count += 1; in->delayed_count += 1;
in->drop_point = 0; in->drop_point = 0;
MP_STATS(vo, "vo-delayed"); MP_STATS(vo, "vo-delayed");
desync = 0;
} }
// Smooth out drift. // Smooth out drift.
int64_t t_r = now, t_e = in->base_vsync, diff = 0;
for (int n = 0; n < in->drop_point - 1; n++) {
diff += t_r - t_e;
t_r -= in->vsync_samples[n];
t_e -= in->vsync_interval;
}
if (in->drop_point > 10) if (in->drop_point > 10)
in->base_vsync += diff * 0.1 / in->num_vsync_samples; in->base_vsync += desync / 10;
} }
// to be called from VO thread only // to be called from VO thread only