Skip to content

libvncclient: avoid Tight JPEG for deep pixel formats #707

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
+16 −2
Open

libvncclient: avoid Tight JPEG for deep pixel formats #707

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
18 changes: 16 additions & 2 deletions src/libvncclient/rfbclient.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,20 @@ SupportsServer2Client(rfbClient* client, int messageType)
return (client->supportedMessages.server2client[((messageType & 0xFF)/8)] & (1<<(messageType % 8)) ? TRUE : FALSE);
}

static rfbBool
CanUseTightJPEG(rfbClient* client)
{
if (!client->appData.enableJPEG)
return FALSE;

if (!client->format.trueColour || client->format.bitsPerPixel <= 8)
return FALSE;

return client->format.redMax <= 0xFF &&
client->format.greenMax <= 0xFF &&
client->format.blueMax <= 0xFF;
}

void
SetClient2Server(rfbClient* client, int messageType)
{
Expand Down Expand Up @@ -1304,7 +1318,7 @@ SetFormatAndEncodings(rfbClient* client)
requestLastRectEncoding = TRUE;
if (client->appData.compressLevel >= 0 && client->appData.compressLevel <= 9)
requestCompressLevel = TRUE;
if (client->appData.enableJPEG)
if (CanUseTightJPEG(client))
requestQualityLevel = TRUE;
#endif
#endif
Expand Down Expand Up @@ -1397,7 +1411,7 @@ SetFormatAndEncodings(rfbClient* client)
encs[se->nEncodings++] = rfbClientSwap32IfLE(rfbEncodingCompressLevel1);
}

if (client->appData.enableJPEG) {
if (CanUseTightJPEG(client)) {
if (client->appData.qualityLevel < 0 || client->appData.qualityLevel > 9)
client->appData.qualityLevel = 5;
encs[se->nEncodings++] = rfbClientSwap32IfLE(client->appData.qualityLevel +
Expand Down
Loading