KASM-2053 update novnc commit

.gitlab-ci.yml

@@ -51,9 +51,6 @@ build_ubuntu_bionic:
     - *prepare_artfacts
   script:
     - bash builder/build-package ubuntu bionic
-  only:
-    variables:
-      - $CI_COMMIT_MESSAGE =~ /\[full [Cc][Ii]\]/
   artifacts:
     paths:
       - output/
@@ -70,9 +67,6 @@ build_ubuntu_bionic_arm:
     - *prepare_artfacts
   script:
     - bash builder/build-package ubuntu bionic
-  only:
-    variables:
-      - $CI_COMMIT_MESSAGE =~ /\[full [Cc][Ii]\]/
   artifacts:
     paths:
       - output/
@@ -86,7 +80,7 @@ build_ubuntu_bionic_libjpeg_turbo:
   after_script:
     - *prepare_artfacts
   script:
-    - bash builder/build-package ubuntu focal +libjpeg-turbo_latest
+    - bash builder/build-package ubuntu bionic +libjpeg-turbo_latest
   artifacts:
     paths:
       - output/
@@ -120,6 +114,9 @@ build_ubuntu_focal_arm:
     - *prepare_artfacts
   script:
     - bash builder/build-package ubuntu focal;
+  only:
+    variables:
+      - $CI_COMMIT_MESSAGE =~ /\[full [Cc][Ii]\]/
   artifacts:
     paths:
       - output/

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "kasmweb"]
 	path = kasmweb
 	url = https://github.com/kasmtech/noVNC.git
-	branch = master
+	branch = bugfix/KASM-2053_video_quality

builder/dockerfile.ubuntu_bionic+libjpeg-turbo_latest.build

@@ -1,15 +1,14 @@
-FROM ubuntu:20.04
+FROM ubuntu:18.04
 
 ENV KASMVNC_BUILD_OS ubuntu
-ENV KASMVNC_BUILD_OS_CODENAME focal
+ENV KASMVNC_BUILD_OS_CODENAME bionic
-ENV XORG_VER 1.20.8
+ENV XORG_VER 1.20.10
 
 RUN sed -i 's$# deb-src$deb-src$' /etc/apt/sources.list
 
 RUN apt-get update && \
       apt-get -y install sudo
 
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata
 RUN apt-get update && apt-get -y build-dep xorg-server libxfont-dev
 RUN apt-get update && apt-get -y install cmake git libgnutls28-dev vim wget tightvncserver
 RUN apt-get update && apt-get -y install libpng-dev libtiff-dev libgif-dev libavcodec-dev libssl-dev
@@ -26,6 +25,12 @@ RUN cd /tmp/libwebp-1.0.2 && \
     ./configure --enable-static --disable-shared && \
     make && make install
 
+# Fix for older required libs
+#RUN cd /tmp && wget http://launchpadlibrarian.net/347526424/libxfont1-dev_1.5.2-4ubuntu2_amd64.deb && \
+#    wget http://launchpadlibrarian.net/347526425/libxfont1_1.5.2-4ubuntu2_amd64.deb && \
+#    dpkg -i libxfont1_1.5.2-4ubuntu2_amd64.deb && \
+#    dpkg -i libxfont1-dev_1.5.2-4ubuntu2_amd64.deb
+
 RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo
 
 COPY --chown=docker:docker . /src

builder/dockerfile.ubuntu_bionic+libjpeg-turbo_latest.deb.build

@@ -1,7 +1,5 @@
-FROM ubuntu:20.04
+FROM ubuntu:bionic
 
-RUN apt-get update && \
-      DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata
 RUN apt-get update && \
       apt-get -y install vim build-essential devscripts equivs
 

builder/dockerfile.ubuntu_bionic+libjpeg-turbo_latest.deb.test

@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:bionic
 
 ENV DISPLAY=:1 \
     VNC_PORT=8443 \

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();
+        Server::preferBandwidth.setParam(true);
       break;
     case pseudoEncodingMaxVideoResolution:
       if (!rfb::Server::ignoreClientSettingsKasm && canChangeSettings)

common/rfb/EncodeManager.cxx

@@ -356,6 +356,13 @@ 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_;