Compare commits
3 Commits
configchec
...
bugfix/KAS
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
26f1b52b70 | ||
|
|
8c2c099342 | ||
|
|
314e7e9615 |
2
.gitmodules
vendored
2
.gitmodules
vendored
@@ -1,4 +1,4 @@
|
|||||||
[submodule "kasmweb"]
|
[submodule "kasmweb"]
|
||||||
path = kasmweb
|
path = kasmweb
|
||||||
url = https://github.com/kasmtech/noVNC.git
|
url = https://github.com/kasmtech/noVNC.git
|
||||||
branch = bugfix/KASM-2053_video_quality
|
branch = master
|
||||||
|
|||||||
@@ -211,7 +211,7 @@ void ConnParams::setEncodings(int nEncodings, const rdr::S32* encodings)
|
|||||||
break;
|
break;
|
||||||
case pseudoEncodingPreferBandwidth:
|
case pseudoEncodingPreferBandwidth:
|
||||||
if (!rfb::Server::ignoreClientSettingsKasm && canChangeSettings)
|
if (!rfb::Server::ignoreClientSettingsKasm && canChangeSettings)
|
||||||
Server::preferBandwidth.setParam(true);
|
Server::preferBandwidth.setParam();
|
||||||
break;
|
break;
|
||||||
case pseudoEncodingMaxVideoResolution:
|
case pseudoEncodingMaxVideoResolution:
|
||||||
if (!rfb::Server::ignoreClientSettingsKasm && canChangeSettings)
|
if (!rfb::Server::ignoreClientSettingsKasm && canChangeSettings)
|
||||||
|
|||||||
@@ -356,13 +356,6 @@ void EncodeManager::doUpdate(bool allowLossy, const Region& changed_,
|
|||||||
if (conn->cp.kasmPassed[ConnParams::KASM_MAX_VIDEO_RESOLUTION])
|
if (conn->cp.kasmPassed[ConnParams::KASM_MAX_VIDEO_RESOLUTION])
|
||||||
updateMaxVideoRes(&maxVideoX, &maxVideoY);
|
updateMaxVideoRes(&maxVideoX, &maxVideoY);
|
||||||
|
|
||||||
// The dynamic quality params may have changed
|
|
||||||
if (Server::dynamicQualityMax && Server::dynamicQualityMax <= 9 &&
|
|
||||||
Server::dynamicQualityMax > Server::dynamicQualityMin) {
|
|
||||||
dynamicQualityMin = Server::dynamicQualityMin;
|
|
||||||
dynamicQualityOff = Server::dynamicQualityMax - Server::dynamicQualityMin;
|
|
||||||
}
|
|
||||||
|
|
||||||
prepareEncoders(allowLossy);
|
prepareEncoders(allowLossy);
|
||||||
|
|
||||||
changed = changed_;
|
changed = changed_;
|
||||||
|
|||||||
2
kasmweb
2
kasmweb
Submodule kasmweb updated: 1adce75ee1...170cb81f6f
Reference in New Issue
Block a user