Allow streaming to match the refresh rate in unsupported mode

This commit is contained in:
Cameron Gutman 2018-11-20 21:47:08 -08:00
parent 688c4a90d9
commit e7bb146f92
2 changed files with 11 additions and 4 deletions

View file

@ -226,7 +226,16 @@ Flickable {
// Use 64 as the cutoff for adding a separate option to
// handle wonky displays that report just over 60 Hz.
if (max_fps > 64) {
fpsListModel.append({"text": max_fps+" FPS", "video_fps": ""+max_fps})
// Mark any FPS value greater than 120 as unsupported
if (prefs.unsupportedFps && max_fps > 120) {
fpsListModel.append({"text": max_fps+" FPS (Unsupported)", "video_fps": ""+max_fps})
}
else if (max_fps > 120) {
fpsListModel.append({"text": "120 FPS", "video_fps": "120"})
}
else {
fpsListModel.append({"text": max_fps+" FPS", "video_fps": ""+max_fps})
}
}
// Add unsupported FPS values that come after the display max FPS

View file

@ -136,9 +136,7 @@ int StreamingPreferences::getMaximumStreamingFrameRate()
}
}
// Cap the frame rate at 120 FPS. Past this, the encoders start
// to max out and drop frames.
maxFrameRate = qMax(maxFrameRate, qMin(120, bestMode.refresh_rate));
maxFrameRate = qMax(maxFrameRate, bestMode.refresh_rate);
}
}