Improved configuration of the Tight encoder.

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

diff --git a/rfb/TightEncoder.cxx b/rfb/TightEncoder.cxx
index fb19885ae524086cb16fdd19cb1dbdef6f909954..b6868e4df4013aaa71c855ae04e5d28bf7a04e10 100644 (file)
--- a/rfb/TightEncoder.cxx
+++ b/rfb/TightEncoder.cxx
@@ -31,7 +31,6 @@ using namespace rfb;
 // Adjustable parameters.
 // FIXME: Get rid of #defines
 #define TIGHT_JPEG_MIN_RECT_SIZE 2048
-#define TIGHT_DETECT_SUBROW_WIDTH   7
 #define TIGHT_DETECT_MIN_WIDTH      8
 #define TIGHT_DETECT_MIN_HEIGHT     8
 
@@ -46,16 +45,16 @@ using namespace rfb;
 //
 
 const TIGHT_CONF TightEncoder::conf[10] = {
-  {   512,  32,   6, 0, 0, 0,   4,  5, 10000, 23000 },
-  {   768,  32,   6, 1, 1, 1,   8, 10,  8000, 18000 },
-  {  1024,  32,   8, 3, 3, 2,  24, 15,  6500, 15000 },
-  {  1536,  48,  12, 5, 5, 3,  32, 25,  5000, 12000 },
-  {  2048,  48,  12, 6, 6, 4,  32, 37,  4000, 10000 },
-  {  3072,  64,  12, 7, 7, 5,  32, 50,  3000,  8000 },
-  {  4096,  64,  16, 7, 7, 6,  48, 60,  2000,  5000 },
-  {  6144,  64,  16, 8, 8, 7,  64, 70,  1000,  2500 },
-  {  8192, 128,  24, 9, 9, 8,  64, 75,   500,  1200 },
-  { 10240, 128,  32, 9, 9, 9,  96, 80,   200,   500 }
+  {   512,   32,   6, 0, 0, 0,   4,  5 },
+  {  2048,   64,   6, 1, 1, 1,   8, 10 },
+  {  4096,  128,   8, 3, 3, 2,  24, 15 },
+  {  8192,  256,  12, 5, 5, 3,  32, 25 },
+  { 16384,  512,  12, 6, 6, 4,  32, 37 },
+  { 32768,  512,  12, 7, 7, 5,  32, 50 },
+  { 65536,  512,  16, 7, 7, 6,  48, 60 },
+  { 65536, 1024,  16, 8, 8, 7,  64, 70 },
+  { 65536, 2048,  24, 9, 9, 8,  64, 75 },
+  { 65536, 2048,  32, 9, 9, 9,  96, 80 }
 };
 const int TightEncoder::defaultCompressLevel = 6;
 

diff --git a/rfb/TightEncoder.h b/rfb/TightEncoder.h
index b6e71a19c178c8ca1052af1a9d537e485da01ea0..9c11eaffe21d0d4980f3b46a00e6e13dcd5b8340 100644 (file)
--- a/rfb/TightEncoder.h
+++ b/rfb/TightEncoder.h
@@ -36,7 +36,6 @@ namespace rfb {
     int idxZlibLevel, monoZlibLevel, rawZlibLevel;
     int idxMaxColorsDivisor;
     int jpegQuality;
-    unsigned long jpegThreshold, jpegThreshold24;
   };
 
   //