diff options
Diffstat (limited to 'video/out/vo.c')
-rw-r--r-- | video/out/vo.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/video/out/vo.c b/video/out/vo.c index f31f55f378..139b840c23 100644 --- a/video/out/vo.c +++ b/video/out/vo.c @@ -344,9 +344,7 @@ static void check_estimated_display_fps(struct vo *vo) struct vo_internal *in = vo->in; bool use_estimated = false; - if (in->num_total_vsync_samples >= MAX_VSYNC_SAMPLES * 2 && - fabs((in->nominal_vsync_interval - in->estimated_vsync_interval)) - >= 0.01 * in->nominal_vsync_interval && + if (in->num_total_vsync_samples >= MAX_VSYNC_SAMPLES / 2 && in->estimated_vsync_interval <= 1e6 / 20.0 && in->estimated_vsync_interval >= 1e6 / 99.0) { @@ -363,12 +361,11 @@ static void check_estimated_display_fps(struct vo *vo) } if (use_estimated == (in->vsync_interval == in->nominal_vsync_interval)) { if (use_estimated) { - MP_WARN(vo, "Reported display FPS seems incorrect.\n" - "Assuming a value closer to %.3f Hz.\n", - 1e6 / in->estimated_vsync_interval); + MP_VERBOSE(vo, "adjusting display FPS to a value closer to %.3f Hz\n", + 1e6 / in->estimated_vsync_interval); } else { - MP_WARN(vo, "Switching back to assuming %.3f Hz.\n", - 1e6 / in->nominal_vsync_interval); + MP_VERBOSE(vo, "switching back to assuming display fps = %.3f Hz\n", + 1e6 / in->nominal_vsync_interval); } } in->vsync_interval = use_estimated ? (int64_t)in->estimated_vsync_interval |