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

Force BGR

This commit is contained in:
f-trycua 2025-04-27 14:51:19 -07:00
parent 1b9542d7e9
commit 82bd567f6d
1 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
core/decoders/raw.js
View File

@ -12,13 +12,25 @@ import * as Log from '../util/logging.js';
export default class RawDecoder { export default class RawDecoder {
constructor() { constructor() {
this._lines = 0; this._lines = 0;
this._serverName = null;
} }
decodeRect(x, y, width, height, sock, display, depth, bgrMode = false) { decodeRect(x, y, width, height, sock, display, depth, bgrMode = false) {
// Log BGR mode status for the first few rects to debug // Check if we're connecting to a Virtualization server
if (!this._serverName && sock._rfb && sock._rfb._fbName) {
this._serverName = sock._rfb._fbName;
Log.Info("RawDecoder: Connected to server: " + this._serverName);
}
// Special handling for known BGR servers that don't honor pixel format
const forceSwap = this._serverName === 'Virtualization';
// Always log if we're using BGR mode or forcing a swap
if (this._lines === 0) { if (this._lines === 0) {
Log.Debug("RawDecoder: Processing rectangle with " + Log.Info("RawDecoder: Processing rectangle with " +
(bgrMode ? "BGR" : "RGB") + " mode, depth: " + depth); (bgrMode ? "BGR" : "RGB") + " mode" +
(forceSwap ? " (FORCING BGR swap for Virtualization server)" : "") +
", depth: " + depth);
} }
if ((width === 0) || (height === 0)) { if ((width === 0) || (height === 0)) {
@ -52,7 +64,7 @@ export default class RawDecoder {
sample += data[i] + " "; sample += data[i] + " ";
} }
} }
Log.Debug("RawDecoder: First " + Math.min(16, width) + Log.Info("RawDecoder: First " + Math.min(16, width) +
" pixels (before processing): " + sample); " pixels (before processing): " + sample);
} }
@ -66,10 +78,11 @@ export default class RawDecoder {
newdata[i * 4 + 3] = 255; newdata[i * 4 + 3] = 255;
} }
data = newdata; data = newdata;
} else if (bgrMode) { } else if (bgrMode || forceSwap) {
// In bgrMode we need to switch the red and blue bytes // In bgrMode or when forced we need to switch the red and blue bytes
// so that the data is in RGB order // so that the data is in RGB order
Log.Debug("RawDecoder: Applying BGR swap for line " + curY); Log.Info("RawDecoder: Applying BGR swap for line " + curY +
(forceSwap ? " (FORCED)" : ""));
for (let i = 0; i < width; i++) { for (let i = 0; i < width; i++) {
let j = i * 4; let j = i * 4;
let red = data[j]; let red = data[j];
@ -90,7 +103,7 @@ export default class RawDecoder {
sample += "[" + data[i*4] + "," + data[i*4+1] + "," + sample += "[" + data[i*4] + "," + data[i*4+1] + "," +
data[i*4+2] + "," + data[i*4+3] + "] "; data[i*4+2] + "," + data[i*4+3] + "] ";
} }
Log.Debug("RawDecoder: First " + Math.min(16, width) + Log.Info("RawDecoder: First " + Math.min(16, width) +
" pixels (after processing): " + sample); " pixels (after processing): " + sample);
} }