diff --git a/bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.71.jar b/bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.71.jar index ebe702a8e7..f6bbc5d02f 100644 Binary files a/bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.71.jar and b/bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.71.jar differ diff --git a/deskshare/applet/src/main/java/org/bigbluebutton/deskshare/client/blocks/Block.java b/deskshare/applet/src/main/java/org/bigbluebutton/deskshare/client/blocks/Block.java index 1ff1d62e82..9d811e4639 100755 --- a/deskshare/applet/src/main/java/org/bigbluebutton/deskshare/client/blocks/Block.java +++ b/deskshare/applet/src/main/java/org/bigbluebutton/deskshare/client/blocks/Block.java @@ -100,7 +100,7 @@ public final class Block { System.arraycopy(capturedPixels, 0, pixelsCopy, 0, capturedPixels.length); } - byte[] encodedBlock = ScreenVideoEncoder.encodePixels(pixelsCopy, getWidth(), getHeight(), (sentCount.longValue() > 5) /* send grayscale image */); + byte[] encodedBlock = ScreenVideoEncoder.encodePixels(pixelsCopy, getWidth(), getHeight(), (sentCount.longValue() < 5) /* send grayscale image */); return new EncodedBlockData(position, encodedBlock); } diff --git a/deskshare/common/src/main/java/org/bigbluebutton/deskshare/common/ScreenVideoEncoder.java b/deskshare/common/src/main/java/org/bigbluebutton/deskshare/common/ScreenVideoEncoder.java index faa918660c..f483928499 100755 --- a/deskshare/common/src/main/java/org/bigbluebutton/deskshare/common/ScreenVideoEncoder.java +++ b/deskshare/common/src/main/java/org/bigbluebutton/deskshare/common/ScreenVideoEncoder.java @@ -172,7 +172,7 @@ public final class ScreenVideoEncoder { byte red = (byte) ((pixels[i] >> 16) & 0xff); byte green = (byte) ((pixels[i] >> 8) & 0xff); byte blue = (byte) (pixels[i] & 0xff); - +/* if (grayscale) { byte brightness = convertToGrayScale(red, green, blue); @@ -185,7 +185,12 @@ public final class ScreenVideoEncoder { rgbPixels[position++] = blue; rgbPixels[position++] = green; rgbPixels[position++] = red; - } + } +*/ + // Sequence should be BGR + rgbPixels[position++] = blue; + rgbPixels[position++] = green; + rgbPixels[position++] = red; } long end = System.currentTimeMillis();