diff options
| author | James Ross-Gowan <rossymiles@gmail.com> | 2016-09-18 15:40:18 +1000 |
|---|---|---|
| committer | James Ross-Gowan <rossymiles@gmail.com> | 2016-09-18 22:15:25 +1000 |
| commit | f8659d0013504bed2d8ae728ef16056003aa41d6 (patch) | |
| tree | 991591e7ef01ca074d866b4f32d761a55145ffc2 | |
| parent | 554c3a1bda4b3274b7861c3a2c31bbce03a9fa7e (diff) | |
| download | mpv-f8659d0013504bed2d8ae728ef16056003aa41d6.tar.bz2 mpv-f8659d0013504bed2d8ae728ef16056003aa41d6.tar.xz | |
displayconfig: treat a refresh rate of 1 as invalid
Found in Windows 8.1/VirtualBox.
| -rw-r--r-- | video/out/win32/displayconfig.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/video/out/win32/displayconfig.c b/video/out/win32/displayconfig.c index cc91450b75..4ebe2a1761 100644 --- a/video/out/win32/displayconfig.c +++ b/video/out/win32/displayconfig.c @@ -94,6 +94,12 @@ static LONG (WINAPI *pQueryDisplayConfig)(UINT32, UINT32*, DISPLAYCONFIG_PATH_INFO*, UINT32*, DISPLAYCONFIG_MODE_INFO*, DISPLAYCONFIG_TOPOLOGY_ID*); +static bool is_valid_refresh_rate(DISPLAYCONFIG_RATIONAL rr) +{ + // DisplayConfig sometimes reports a rate of 1 when the rate is not known + return rr.Denominator != 0 && rr.Numerator / rr.Denominator > 1; +} + static void displayconfig_load(void) { HMODULE user32 = GetModuleHandleW(L"user32.dll"); @@ -189,7 +195,7 @@ static double get_refresh_rate_from_mode(DISPLAYCONFIG_MODE_INFO *mode) DISPLAYCONFIG_VIDEO_SIGNAL_INFO *info = &mode->targetMode.targetVideoSignalInfo; - if (info->vSyncFreq.Denominator == 0) + if (!is_valid_refresh_rate(info->vSyncFreq)) return 0.0; return ((double)info->vSyncFreq.Numerator) / @@ -225,7 +231,7 @@ double mp_w32_displayconfig_get_refresh_rate(const wchar_t *device) freq = get_refresh_rate_from_mode(&modes[path->targetInfo.modeInfoIdx]); // If the mode didn't contain a valid refresh rate, try the path - if (freq == 0.0 && path->targetInfo.refreshRate.Denominator != 0) { + if (freq == 0.0 && is_valid_refresh_rate(path->targetInfo.refreshRate)) { freq = ((double)path->targetInfo.refreshRate.Numerator) / ((double)path->targetInfo.refreshRate.Denominator); } |