Author: solomax
Date: Thu Mar 6 18:42:42 2014
New Revision: 1574990
URL: http://svn.apache.org/r1574990
Log:
[OPENMEETINGS-937] recording frame size is now multiple by 16
Modified:
openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/gui/ScreenDimensions.java
openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/gui/ScreenSharerFrame.java
openmeetings/trunk/singlewebapp/src/screenshare/java/org/apache/openmeetings/screen/webstart/gui/ScreenDimensions.java
openmeetings/trunk/singlewebapp/src/screenshare/java/org/apache/openmeetings/screen/webstart/gui/ScreenSharerFrame.java
Modified:
openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/gui/ScreenDimensions.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/gui/ScreenDimensions.java?rev=1574990&r1=1574989&r2=1574990&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/gui/ScreenDimensions.java
(original)
+++
openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/gui/ScreenDimensions.java
Thu Mar 6 18:42:42 2014
@@ -22,6 +22,7 @@ import java.awt.Dimension;
import java.awt.Toolkit;
public class ScreenDimensions {
+ public static final int ROUND_VALUE = 16;
/**
* image recalcing value's from the virtual Screen drawer
*/
Modified:
openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/gui/ScreenSharerFrame.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/gui/ScreenSharerFrame.java?rev=1574990&r1=1574989&r2=1574990&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/gui/ScreenSharerFrame.java
(original)
+++
openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/gui/ScreenSharerFrame.java
Thu Mar 6 18:42:42 2014
@@ -18,6 +18,9 @@
*/
package org.apache.openmeetings.screen.webstart.gui;
+import static
org.apache.openmeetings.screen.webstart.gui.ScreenDimensions.ROUND_VALUE;
+import static
org.apache.openmeetings.screen.webstart.gui.ScreenDimensions.resizeX;
+import static
org.apache.openmeetings.screen.webstart.gui.ScreenDimensions.resizeY;
import static org.slf4j.LoggerFactory.getLogger;
import java.awt.AWTException;
@@ -766,26 +769,30 @@ public class ScreenSharerFrame extends J
*/
void calcRescaleFactors() {
logger.trace("calcRescaleFactors -- ");
- ScreenDimensions.resizeX = spinnerWidth.getValue();
- ScreenDimensions.resizeY = spinnerHeight.getValue();
+ resizeX = spinnerWidth.getValue();
+ resizeY = spinnerHeight.getValue();
switch (ScreenDimensions.quality) {
- case Medium:
- ScreenDimensions.resizeX = (int)(1.0 *
ScreenDimensions.resizeX / 2);
- ScreenDimensions.resizeY = (int)(1.0 *
ScreenDimensions.resizeY / 2);
- break;
case Low:
- ScreenDimensions.resizeX = (int)(3.0 *
ScreenDimensions.resizeX / 8);
- ScreenDimensions.resizeY = (int)(3.0 *
ScreenDimensions.resizeY / 8);
+ resizeX = (int)(2.0 * ScreenDimensions.resizeX
/ 8);
+ resizeY = (int)(2.0 * ScreenDimensions.resizeY
/ 8);
+ break;
+ case Medium:
+ resizeX = (int)(4.0 * ScreenDimensions.resizeX
/ 8);
+ resizeY = (int)(4.0 * ScreenDimensions.resizeY
/ 8);
break;
case High:
- ScreenDimensions.resizeX = (int)(6.0 *
ScreenDimensions.resizeX / 8);
- ScreenDimensions.resizeY = (int)(6.0 *
ScreenDimensions.resizeY / 8);
+ resizeX = (int)(6.0 * ScreenDimensions.resizeX
/ 8);
+ resizeY = (int)(6.0 * ScreenDimensions.resizeY
/ 8);
break;
case VeryHigh:
default:
break;
}
- logger.trace("resize: X:" + ScreenDimensions.resizeX + " Y: " +
ScreenDimensions.resizeY);
+ int dX = resizeX % ROUND_VALUE;
+ int dY = resizeY % ROUND_VALUE;
+ resizeX += dX == 0 ? 0 : ROUND_VALUE - dX;
+ resizeY += dY == 0 ? 0 : ROUND_VALUE - dY;
+ logger.trace("resize: X:" + resizeX + " Y: " + resizeY);
updateVScreenBounds();
}
Modified:
openmeetings/trunk/singlewebapp/src/screenshare/java/org/apache/openmeetings/screen/webstart/gui/ScreenDimensions.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/screenshare/java/org/apache/openmeetings/screen/webstart/gui/ScreenDimensions.java?rev=1574990&r1=1574989&r2=1574990&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/screenshare/java/org/apache/openmeetings/screen/webstart/gui/ScreenDimensions.java
(original)
+++
openmeetings/trunk/singlewebapp/src/screenshare/java/org/apache/openmeetings/screen/webstart/gui/ScreenDimensions.java
Thu Mar 6 18:42:42 2014
@@ -22,6 +22,7 @@ import java.awt.Dimension;
import java.awt.Toolkit;
public class ScreenDimensions {
+ public static final int ROUND_VALUE = 16;
/**
* image recalcing value's from the virtual Screen drawer
*/
Modified:
openmeetings/trunk/singlewebapp/src/screenshare/java/org/apache/openmeetings/screen/webstart/gui/ScreenSharerFrame.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/screenshare/java/org/apache/openmeetings/screen/webstart/gui/ScreenSharerFrame.java?rev=1574990&r1=1574989&r2=1574990&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/screenshare/java/org/apache/openmeetings/screen/webstart/gui/ScreenSharerFrame.java
(original)
+++
openmeetings/trunk/singlewebapp/src/screenshare/java/org/apache/openmeetings/screen/webstart/gui/ScreenSharerFrame.java
Thu Mar 6 18:42:42 2014
@@ -18,6 +18,9 @@
*/
package org.apache.openmeetings.screen.webstart.gui;
+import static
org.apache.openmeetings.screen.webstart.gui.ScreenDimensions.ROUND_VALUE;
+import static
org.apache.openmeetings.screen.webstart.gui.ScreenDimensions.resizeX;
+import static
org.apache.openmeetings.screen.webstart.gui.ScreenDimensions.resizeY;
import static org.slf4j.LoggerFactory.getLogger;
import java.awt.AWTException;
@@ -766,26 +769,30 @@ public class ScreenSharerFrame extends J
*/
void calcRescaleFactors() {
logger.trace("calcRescaleFactors -- ");
- ScreenDimensions.resizeX = spinnerWidth.getValue();
- ScreenDimensions.resizeY = spinnerHeight.getValue();
+ resizeX = spinnerWidth.getValue();
+ resizeY = spinnerHeight.getValue();
switch (ScreenDimensions.quality) {
- case Medium:
- ScreenDimensions.resizeX = (int)(1.0 *
ScreenDimensions.resizeX / 2);
- ScreenDimensions.resizeY = (int)(1.0 *
ScreenDimensions.resizeY / 2);
- break;
case Low:
- ScreenDimensions.resizeX = (int)(3.0 *
ScreenDimensions.resizeX / 8);
- ScreenDimensions.resizeY = (int)(3.0 *
ScreenDimensions.resizeY / 8);
+ resizeX = (int)(2.0 * ScreenDimensions.resizeX
/ 8);
+ resizeY = (int)(2.0 * ScreenDimensions.resizeY
/ 8);
+ break;
+ case Medium:
+ resizeX = (int)(4.0 * ScreenDimensions.resizeX
/ 8);
+ resizeY = (int)(4.0 * ScreenDimensions.resizeY
/ 8);
break;
case High:
- ScreenDimensions.resizeX = (int)(6.0 *
ScreenDimensions.resizeX / 8);
- ScreenDimensions.resizeY = (int)(6.0 *
ScreenDimensions.resizeY / 8);
+ resizeX = (int)(6.0 * ScreenDimensions.resizeX
/ 8);
+ resizeY = (int)(6.0 * ScreenDimensions.resizeY
/ 8);
break;
case VeryHigh:
default:
break;
}
- logger.trace("resize: X:" + ScreenDimensions.resizeX + " Y: " +
ScreenDimensions.resizeY);
+ int dX = resizeX % ROUND_VALUE;
+ int dY = resizeY % ROUND_VALUE;
+ resizeX += dX == 0 ? 0 : ROUND_VALUE - dX;
+ resizeY += dY == 0 ? 0 : ROUND_VALUE - dY;
+ logger.trace("resize: X:" + resizeX + " Y: " + resizeY);
updateVScreenBounds();
}
