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 fb19885..b6868e4 100644
--- a/rfb/TightEncoder.cxx
+++ b/rfb/TightEncoder.cxx
@@ -31,7 +31,6 @@
// 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 @@
//
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;