jcarr
/
noVNC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add tight zlib stream reset; add error if tight encoding is used w/o true color

This commit is contained in:
Mike Tinglof 2012-01-31 00:15:56 -05:00
parent a14b8fae2a
commit 9b75bcaada
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/rfb.js
View File

@ -1276,6 +1276,11 @@ encHandlers.HEXTILE = function display_hextile() {
encHandlers.TIGHT = function display_tight() { encHandlers.TIGHT = function display_tight() {
Util.Debug(">> display_tight"); Util.Debug(">> display_tight");
if (fb_depth == 1) {
fail("Tight protocol handler only implements true color mode");
}
var ctl, cmode, clength, getCLength, color, img, data; var ctl, cmode, clength, getCLength, color, img, data;
var filterId = -1, resetStreams = 0, streamId = -1; var filterId = -1, resetStreams = 0, streamId = -1;
var rQ = ws.get_rQ(), rQi = ws.get_rQi(); var rQ = ws.get_rQ(), rQi = ws.get_rQi();
@ -1308,10 +1313,15 @@ encHandlers.TIGHT = function display_tight() {
} }
var decompress = function(data) { var decompress = function(data) {
// TODO: process resetStreams here for (var i=0; i<4; i++) {
if ((resetStreams >> i) & 1) {
FBU.zlibs[i].reset();
Util.Info("Reset zlib stream " + i);
}
}
var uncompressed = FBU.zlibs[streamId].uncompress(data, 0); var uncompressed = FBU.zlibs[streamId].uncompress(data, 0);
if (uncompressed.status !== 0) if (uncompressed.status !== 0)
throw("Invalid data in zlib stream"); Util.Error("Invalid data in zlib stream");
//Util.Warn("Decompressed " + data.length + " to " + uncompressed.data.length + " checksums " + //Util.Warn("Decompressed " + data.length + " to " + uncompressed.data.length + " checksums " +
// checksum(data) + ":" + checksum(uncompressed.data)); // checksum(data) + ":" + checksum(uncompressed.data));
@ -1427,7 +1437,6 @@ encHandlers.TIGHT = function display_tight() {
// Keep tight reset bits // Keep tight reset bits
resetStreams = ctl & 0xF; resetStreams = ctl & 0xF;
if (resetStreams) throw ("Tight reset");
// Figure out filter // Figure out filter
ctl = ctl >> 4; ctl = ctl >> 4;