Tight encoding is actually faster than Hextile when bandwidth is less than roughly...

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@84 3789f03b-4d11-0410-bbf8-ca57d06f2519

diff --git a/vncviewer/cview.cxx b/vncviewer/cview.cxx
index 97cb9afed5009d611dc06b0ed077eeffd0a00e5f..fd5d2c5e833ec799087a9d7554788abf013caa17 100644 (file)
--- a/vncviewer/cview.cxx
+++ b/vncviewer/cview.cxx
@@ -1128,7 +1128,7 @@ CView::framebufferUpdateEnd() {
 // to the connection speed:
 //
 //   Above 16Mbps (timing for at least a second), same machine, switch to raw
-//   Above 3Mbps, switch to hextile
+//   Above 16Mbps (timing for at least a second), switch to hextile
 //   Otherwise, switch to Tight
 //
 //   Above 256Kbps, use full colour mode
@@ -1143,7 +1143,7 @@ CView::autoSelectFormatAndEncoding() {
   // Select best encoding
   if (kbitsPerSecond > 16000 && sameMachine && timeWaited >= 10000) {
     newEncoding = encodingRaw;
-  } else if (kbitsPerSecond > 3000 && timeWaited >= 10000) {
+  } else if (kbitsPerSecond > 16000 && timeWaited >= 10000) {
     newEncoding = encodingHextile;
   } else {
     newEncoding = encodingTight;

diff --git a/vncviewer_unix/CConn.cxx b/vncviewer_unix/CConn.cxx
index 8a4e04e806641781537ace23e4d225f52e17eea8..1c104601eb53bc6fa734482fc16704d0708d7dbd 100644 (file)
--- a/vncviewer_unix/CConn.cxx
+++ b/vncviewer_unix/CConn.cxx
@@ -643,7 +643,7 @@ void CConn::reconfigureViewport()
 // to the connection speed:
 //
 //   Above 16Mbps (timing for at least a second), same machine, switch to raw
-//   Above 3Mbps, switch to hextile
+//   Above 16Mbps (timing for at least a second), switch to hextile
 //   Otherwise, switch to Tight
 //
 //   Above 256Kbps, use full colour mode
@@ -658,7 +658,7 @@ void CConn::autoSelectFormatAndEncoding()
   // Select best encoding
   if (kbitsPerSecond > 16000 && sameMachine && timeWaited >= 10000) {
     newEncoding = encodingRaw;
-  } else if (kbitsPerSecond > 3000 && timeWaited >= 10000) {
+  } else if (kbitsPerSecond > 16000 && timeWaited >= 10000) {
     newEncoding = encodingHextile;
   } else {
     newEncoding = encodingTight;