Author: solomax
Date: Tue Mar 18 11:30:54 2014
New Revision: 1578826
URL: http://svn.apache.org/r1578826
Log:
[OPENMEETINGS-957] screensharing is displayed as expected in real time
Modified:
openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/CaptureScreen.java
openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/IScreenEncoder.java
openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/ScreenV1Encoder.java
openmeetings/trunk/singlewebapp/src/screenshare/java/org/apache/openmeetings/screen/webstart/CaptureScreen.java
openmeetings/trunk/singlewebapp/src/screenshare/java/org/apache/openmeetings/screen/webstart/IScreenEncoder.java
openmeetings/trunk/singlewebapp/src/screenshare/java/org/apache/openmeetings/screen/webstart/ScreenV1Encoder.java
Modified:
openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/CaptureScreen.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/CaptureScreen.java?rev=1578826&r1=1578825&r2=1578826&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/CaptureScreen.java
(original)
+++
openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/CaptureScreen.java
Tue Mar 18 11:30:54 2014
@@ -110,7 +110,7 @@ final class CaptureScreen extends Thread
log.trace(String.format("Image was encoded in %s ms",
System.currentTimeMillis() - start));
}
frames.offer(data);
- se.createUnalteredFrame(screen);
+ se.createUnalteredFrame();
} catch (IOException e) {
log.error("Error while
encoding: ", e);
}
Modified:
openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/IScreenEncoder.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/IScreenEncoder.java?rev=1578826&r1=1578825&r2=1578826&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/IScreenEncoder.java
(original)
+++
openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/IScreenEncoder.java
Tue Mar 18 11:30:54 2014
@@ -18,13 +18,12 @@
*/
package org.apache.openmeetings.screen.webstart;
-import java.awt.Rectangle;
import java.io.IOException;
import org.red5.server.net.rtmp.event.VideoData;
public interface IScreenEncoder {
- void createUnalteredFrame(Rectangle area) throws IOException;
+ void createUnalteredFrame() throws IOException;
VideoData getUnalteredFrame();
Modified:
openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/ScreenV1Encoder.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/ScreenV1Encoder.java?rev=1578826&r1=1578825&r2=1578826&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/ScreenV1Encoder.java
(original)
+++
openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/ScreenV1Encoder.java
Tue Mar 18 11:30:54 2014
@@ -78,13 +78,14 @@ public class ScreenV1Encoder extends Bas
return new VideoData(buf);
}
- public void createUnalteredFrame(Rectangle _area) throws IOException {
+ public void createUnalteredFrame() throws IOException {
if (last == null) {
return;
}
if (unalteredFrame == null) {
ByteArrayOutputStream ba = new
ByteArrayOutputStream(200);
+ Rectangle _area = new Rectangle(resizeX, resizeY);
//header
ba.write(getTag(FLAG_FRAMETYPE_INTERFRAME,
FLAG_CODEC_SCREEN));
writeShort(ba, _area.width + ((blockSize / 16 - 1) <<
12));
Modified:
openmeetings/trunk/singlewebapp/src/screenshare/java/org/apache/openmeetings/screen/webstart/CaptureScreen.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/screenshare/java/org/apache/openmeetings/screen/webstart/CaptureScreen.java?rev=1578826&r1=1578825&r2=1578826&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/screenshare/java/org/apache/openmeetings/screen/webstart/CaptureScreen.java
(original)
+++
openmeetings/trunk/singlewebapp/src/screenshare/java/org/apache/openmeetings/screen/webstart/CaptureScreen.java
Tue Mar 18 11:30:54 2014
@@ -110,7 +110,7 @@ final class CaptureScreen extends Thread
log.trace(String.format("Image was encoded in %s ms",
System.currentTimeMillis() - start));
}
frames.offer(data);
- se.createUnalteredFrame(screen);
+ se.createUnalteredFrame();
} catch (IOException e) {
log.error("Error while
encoding: ", e);
}
Modified:
openmeetings/trunk/singlewebapp/src/screenshare/java/org/apache/openmeetings/screen/webstart/IScreenEncoder.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/screenshare/java/org/apache/openmeetings/screen/webstart/IScreenEncoder.java?rev=1578826&r1=1578825&r2=1578826&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/screenshare/java/org/apache/openmeetings/screen/webstart/IScreenEncoder.java
(original)
+++
openmeetings/trunk/singlewebapp/src/screenshare/java/org/apache/openmeetings/screen/webstart/IScreenEncoder.java
Tue Mar 18 11:30:54 2014
@@ -18,13 +18,12 @@
*/
package org.apache.openmeetings.screen.webstart;
-import java.awt.Rectangle;
import java.io.IOException;
import org.red5.server.net.rtmp.event.VideoData;
public interface IScreenEncoder {
- void createUnalteredFrame(Rectangle area) throws IOException;
+ void createUnalteredFrame() throws IOException;
VideoData getUnalteredFrame();
Modified:
openmeetings/trunk/singlewebapp/src/screenshare/java/org/apache/openmeetings/screen/webstart/ScreenV1Encoder.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/screenshare/java/org/apache/openmeetings/screen/webstart/ScreenV1Encoder.java?rev=1578826&r1=1578825&r2=1578826&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/screenshare/java/org/apache/openmeetings/screen/webstart/ScreenV1Encoder.java
(original)
+++
openmeetings/trunk/singlewebapp/src/screenshare/java/org/apache/openmeetings/screen/webstart/ScreenV1Encoder.java
Tue Mar 18 11:30:54 2014
@@ -78,13 +78,14 @@ public class ScreenV1Encoder extends Bas
return new VideoData(buf);
}
- public void createUnalteredFrame(Rectangle _area) throws IOException {
+ public void createUnalteredFrame() throws IOException {
if (last == null) {
return;
}
if (unalteredFrame == null) {
ByteArrayOutputStream ba = new
ByteArrayOutputStream(200);
+ Rectangle _area = new Rectangle(resizeX, resizeY);
//header
ba.write(getTag(FLAG_FRAMETYPE_INTERFRAME,
FLAG_CODEC_SCREEN));
writeShort(ba, _area.width + ((blockSize / 16 - 1) <<
12));
