Skip to content

libvncserver: use zlib stream for Tight level zero #712

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
marcofortina wants to merge 1 commit into
base: master
Choose a base branch
from
+3 −20
Open

libvncserver: use zlib stream for Tight level zero #712

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 3 additions & 20 deletions src/libvncserver/tight.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -820,12 +820,7 @@ SendMonoRect(rfbClientPtr cl,
dataLen = (w + 7) / 8;
dataLen *= h;

if (tightConf[cl->tightCompressLevel].monoZlibLevel == 0 &&
cl->tightEncoding != rfbEncodingTightPng)
cl->updateBuf[cl->ublen++] =
(char)((rfbTightNoZlib | rfbTightExplicitFilter) << 4);
else
cl->updateBuf[cl->ublen++] = (streamId | rfbTightExplicitFilter) << 4;
cl->updateBuf[cl->ublen++] = (streamId | rfbTightExplicitFilter) << 4;
cl->updateBuf[cl->ublen++] = rfbTightFilterPalette;
cl->updateBuf[cl->ublen++] = 1;

Expand Down Expand Up @@ -897,12 +892,7 @@ SendIndexedRect(palettePtr palette,
}

/* Prepare tight encoding header. */
if (tightConf[cl->tightCompressLevel].idxZlibLevel == 0 &&
cl->tightEncoding != rfbEncodingTightPng)
cl->updateBuf[cl->ublen++] =
(char)((rfbTightNoZlib | rfbTightExplicitFilter) << 4);
else
cl->updateBuf[cl->ublen++] = (streamId | rfbTightExplicitFilter) << 4;
cl->updateBuf[cl->ublen++] = (streamId | rfbTightExplicitFilter) << 4;
cl->updateBuf[cl->ublen++] = rfbTightFilterPalette;
cl->updateBuf[cl->ublen++] = (char)(palette->numColors - 1);

Expand Down Expand Up @@ -973,11 +963,7 @@ SendFullColorRect(rfbClientPtr cl,
return FALSE;
}

if (tightConf[cl->tightCompressLevel].rawZlibLevel == 0 &&
cl->tightEncoding != rfbEncodingTightPng)
cl->updateBuf[cl->ublen++] = (char)(rfbTightNoZlib << 4);
else
cl->updateBuf[cl->ublen++] = 0x00; /* stream id = 0, no flushing, no filter */
cl->updateBuf[cl->ublen++] = 0x00; /* stream id = 0, no flushing, no filter */
rfbStatRecordEncodingSentAdd(cl, cl->tightEncoding, 1);

if (cl->tightUsePixelFormat24) {
Expand Down Expand Up @@ -1008,9 +994,6 @@ CompressData(rfbClientPtr cl,
return TRUE;
}

if (zlibLevel == 0)
return rfbSendCompressedDataTight(cl, cl->beforeEncBuf, dataLen);

pz = &cl->zsStruct[streamId];

/* Initialize compression stream if needed. */
Expand Down
Loading