diff --git a/bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.8.1.jar b/bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.8.1.jar index e6eefd009f25fc8bf7fe43f77901168f2d9bcd8c..cdf65bf730d30d51241a36d989cdfc95f86ab412 100755 Binary files a/bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.8.1.jar and b/bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.8.1.jar differ diff --git a/bigbluebutton-client/resources/prod/bbb-deskshare-applet-unsigned-0.8.1.jar b/bigbluebutton-client/resources/prod/bbb-deskshare-applet-unsigned-0.8.1.jar index 3a9b62c1e1f75599844f4038428e8b0f77371420..572f9a1e09a6d58a373f197cf7a1e819784eae7f 100755 Binary files a/bigbluebutton-client/resources/prod/bbb-deskshare-applet-unsigned-0.8.1.jar and b/bigbluebutton-client/resources/prod/bbb-deskshare-applet-unsigned-0.8.1.jar differ diff --git a/bigbluebutton-client/resources/prod/lib/bbb_deskshare.js b/bigbluebutton-client/resources/prod/lib/bbb_deskshare.js index ff40515a033950c0b640d3d7107712ea1b987b6e..3b83b5df175f5e16f051b14593c4d7e755174372 100755 --- a/bigbluebutton-client/resources/prod/lib/bbb_deskshare.js +++ b/bigbluebutton-client/resources/prod/lib/bbb_deskshare.js @@ -9,6 +9,7 @@ function startApplet(IP, roomNumber, fullScreen, useSVC2) "<param name=\"ROOM\" value=\"" + roomNumber + "\"/>" + "<param name=\"IP\" value=\"" + IP + "\"/>" + "<param name=\"PORT\" value=\"9123\"/>" + + "<param name=\"SCALE\" value=\"0.8\"/>" + "<param name=\"FULL_SCREEN\" value=\"" + fullScreen + "\"/>" + "<param name=\"SVC2\" value=\"" + useSVC2 + "\"/>" + "<param name=\"permissions\" value=\"all-permissions\"/>" + diff --git a/deskshare/applet/src/main/java/org/bigbluebutton/deskshare/client/DeskShareApplet.java b/deskshare/applet/src/main/java/org/bigbluebutton/deskshare/client/DeskShareApplet.java index 3614bfc6446e6274b87666d9f08abcfe5b52653e..36fa122109a2930eead6819b6d4b3296bfd262d4 100755 --- a/deskshare/applet/src/main/java/org/bigbluebutton/deskshare/client/DeskShareApplet.java +++ b/deskshare/applet/src/main/java/org/bigbluebutton/deskshare/client/DeskShareApplet.java @@ -41,6 +41,7 @@ public class DeskShareApplet extends JApplet implements ClientListener { Integer cHeightValue = new Integer(600); Integer sWidthValue = new Integer(800); Integer sHeightValue = new Integer(600); + Double scale = new Double(0.8); Boolean qualityValue = false; Boolean aspectRatioValue = false; Integer xValue = new Integer(0); @@ -76,6 +77,10 @@ public class DeskShareApplet extends JApplet implements ClientListener { if (port != null) portValue = Integer.parseInt(port); roomValue = getParameter("ROOM"); + String scaleValue = getParameter("SCALE"); + if (scaleValue != null) scale = Double.parseDouble(scaleValue); + + String captureFullScreen = getParameter("FULL_SCREEN"); if (captureFullScreen != null) fullScreenValue = Boolean.parseBoolean(captureFullScreen); @@ -143,7 +148,7 @@ public class DeskShareApplet extends JApplet implements ClientListener { client = new DeskshareClient.NewBuilder().host(hostValue).port(portValue) .room(roomValue).captureWidth(cWidthValue) .captureHeight(cHeightValue).scaleWidth(sWidthValue).scaleHeight(sHeightValue) - .quality(qualityValue).autoScale(0.8) + .quality(qualityValue).autoScale(scale) .x(xValue).y(yValue).fullScreen(fullScreenValue).useSVC2(useSVC2Value) .httpTunnel(tunnelValue).trayIcon(icon).enableTrayIconActions(false).build(); client.addClientListener(this); diff --git a/deskshare/applet/src/main/java/org/bigbluebutton/deskshare/client/DeskshareClient.java b/deskshare/applet/src/main/java/org/bigbluebutton/deskshare/client/DeskshareClient.java index 10fe34310a719aeb0eac9223a0932b7c1510b0ce..156e49f93f12b6137abe98e3210485213c3b7b46 100755 --- a/deskshare/applet/src/main/java/org/bigbluebutton/deskshare/client/DeskshareClient.java +++ b/deskshare/applet/src/main/java/org/bigbluebutton/deskshare/client/DeskshareClient.java @@ -246,12 +246,18 @@ public class DeskshareClient { System.out.println("Check for scaling[" + captureWidth + "," + captureHeight +"][" + scaleWidth + "," + scaleHeight + "]"); - if (scaleWidth > 1280) { - scaleWidth = 1280; - double ratio = (double)captureHeight/(double)captureWidth; - scaleHeight = (int)((double)scaleWidth * ratio); - System.out.println("Scaling[" + captureWidth + "," + captureHeight +"][" + scaleWidth + "," + scaleHeight + "]"); + if (scale == 1) { + scaleWidth = captureWidth; + scaleHeight = captureHeight; + } else { + if (scaleWidth > 1280) { + scaleWidth = 1280; + double ratio = (double)captureHeight/(double)captureWidth; + scaleHeight = (int)((double)scaleWidth * ratio); + System.out.println("Scaling[" + captureWidth + "," + captureHeight +"][" + scaleWidth + "," + scaleHeight + "]"); + } } + } }