GithubStar/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2026-10-29 07:06:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

vo: switch back to system-reported display FPS if possible

Browse Source 
If we switched away from the system FPS, we were remaining in this mode
ssentially forever. There's no reason to do so; switch back if the
estimated FPS gets worse again. Improvement over commit 41f2c653.
This commit is contained in:
wm4
2015-11-27 21:56:29 +01:00
parent c8e0e35709
commit 2bee47fd27
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
video/out/vo.c
+10 -8
View File
@@ -377,6 +377,7 @@ static void update_vsync_timing_after_swap(struct vo *vo)
// Switch to assumed display FPS if it seems "better". (Note that small
// differences are handled as drift instead.)
bool use_estimated = false;
if (in->num_vsync_samples == max_samples &&
fabs((in->nominal_vsync_interval - in->estimated_vsync_interval))
>= 0.01 * in->nominal_vsync_interval &&
@@ -385,15 +386,16 @@ static void update_vsync_timing_after_swap(struct vo *vo)
{
double mjitter = vsync_stddef(vo, in->estimated_vsync_interval);
double njitter = vsync_stddef(vo, in->nominal_vsync_interval);
if (mjitter * 1.01 < njitter) {
if (in->vsync_interval == in->nominal_vsync_interval) {
MP_WARN(vo, "Reported display FPS seems incorrect.\n"
"Assuming a value closer to %.3f Hz.\n",
1e6 / in->estimated_vsync_interval);
}
in->vsync_interval = in->estimated_vsync_interval;
}
if (mjitter * 1.01 < njitter)
use_estimated = true;
}
if (use_estimated && in->vsync_interval == in->nominal_vsync_interval) {
MP_WARN(vo, "Reported display FPS seems incorrect.\n"
"Assuming a value closer to %.3f Hz.\n",
1e6 / in->estimated_vsync_interval);
}
in->vsync_interval = use_estimated ? (int64_t)in->estimated_vsync_interval
: in->nominal_vsync_interval;
MP_STATS(vo, "value %f jitter", in->estimated_vsync_jitter);
MP_STATS(vo, "value %f vsync-diff", in->vsync_samples[0] / 1e6);