Revert "Disable SOPS for streams over 60 FPS for GFE 3.20.3"

This reverts commit d6b5c5f63eef0d191fe4c2d1f00bf6c112a91ebc.
This commit is contained in:
Cameron Gutman 2020-05-25 18:46:34 -07:00
parent 728377cba3
commit 02cfd8d978
2 changed files with 4 additions and 13 deletions

View File

@ -163,7 +163,10 @@ NvHTTP::launchApp(int appId,
"appid="+QString::number(appId)+
"&mode="+QString::number(streamConfig->width)+"x"+
QString::number(streamConfig->height)+"x"+
QString::number(streamConfig->fps)+
// Using an FPS value over 60 causes SOPS to default to 720p60,
// so force it to 60 when starting. This won't impact our ability
// to get > 60 FPS while actually streaming though.
QString::number(streamConfig->fps > 60 ? 60 : streamConfig->fps)+
"&additionalStates=1&sops="+QString::number(sops ? 1 : 0)+
"&rikey="+QByteArray(streamConfig->remoteInputAesKey, sizeof(streamConfig->remoteInputAesKey)).toHex()+
"&rikeyid="+QString::number(riKeyId)+

View File

@ -967,18 +967,6 @@ void Session::exec(int displayOriginX, int displayOriginY)
}
}
if (prefs.fps > 60) {
// Using SOPS with FPS values over 60 causes GFE to fall back
// to 720p60. On previous GFE versions, we could avoid this by
// forcing the FPS value to 60 when launching the stream, but
// now on GFE 3.20.3 that seems to trigger some sort of
// frame rate limiter that locks the game to 60 FPS.
SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
"Disabling SOPS for %d FPS stream",
prefs.fps);
enableGameOptimizations = false;
}
try {
NvHTTP http(m_Computer->activeAddress, m_Computer->serverCert);
if (m_Computer->currentGameId != 0) {