KASM-2075 update novnc to head of master

Merge pull request #76 from kasmtech/feature/KASM-2001_mobile_keyboard
KASM-2001 Update noVNC commit
2021-11-09 19:04:07 +00:00 · 2021-11-08 21:05:40 -05:00 · 2021-11-08 20:44:56 -05:00
4 changed files with 3 additions and 10 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "kasmweb"]
 	path = kasmweb
 	url = https://github.com/kasmtech/noVNC.git
-	branch = bugfix/KASM-2053_video_quality
+	branch = master
--- a/common/rfb/ConnParams.cxx
+++ b/common/rfb/ConnParams.cxx
@@ -211,7 +211,7 @@ void ConnParams::setEncodings(int nEncodings, const rdr::S32* encodings)
      break;
    case pseudoEncodingPreferBandwidth:
      if (!rfb::Server::ignoreClientSettingsKasm && canChangeSettings)
-        Server::preferBandwidth.setParam(true);
+        Server::preferBandwidth.setParam();
      break;
    case pseudoEncodingMaxVideoResolution:
      if (!rfb::Server::ignoreClientSettingsKasm && canChangeSettings)
--- a/common/rfb/EncodeManager.cxx
+++ b/common/rfb/EncodeManager.cxx
@@ -356,13 +356,6 @@ void EncodeManager::doUpdate(bool allowLossy, const Region& changed_,
    if (conn->cp.kasmPassed[ConnParams::KASM_MAX_VIDEO_RESOLUTION])
        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);

    changed = changed_;
--- a/2
+++ b/2
Author	SHA1	Message	Date
matt	26f1b52b70	KASM-2075 update novnc to head of master	2021-11-09 19:04:07 +00:00
j-travis	8c2c099342	Merge pull request #76 from kasmtech/feature/KASM-2001_mobile_keyboard KASM-2001 Update noVNC commit	2021-11-08 21:05:40 -05:00
Mariusz Marciniak	314e7e9615	KASM-2001 Update noVNC commit	2021-11-08 20:44:56 -05:00