From e7bb146f92c66f6a7526b77ca95d099881d6fd7d Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Tue, 20 Nov 2018 21:47:08 -0800 Subject: [PATCH] Allow streaming to match the refresh rate in unsupported mode --- app/gui/SettingsView.qml | 11 ++++++++++- app/settings/streamingpreferences.cpp | 4 +--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/app/gui/SettingsView.qml b/app/gui/SettingsView.qml index b1cabe56..da6b2e0e 100644 --- a/app/gui/SettingsView.qml +++ b/app/gui/SettingsView.qml @@ -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 diff --git a/app/settings/streamingpreferences.cpp b/app/settings/streamingpreferences.cpp index 9afb1e60..56aa7fc8 100644 --- a/app/settings/streamingpreferences.cpp +++ b/app/settings/streamingpreferences.cpp @@ -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); } }