Author: solomax
Date: Wed Aug 3 06:52:15 2016
New Revision: 1755030
URL: http://svn.apache.org/viewvc?rev=1755030&view=rev
Log:
[OPENMEETINGS-1030] WB video is fixed
Modified:
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/remote/baseVideoStream.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/whiteboardVideoPlayer.lzx
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
Modified:
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java?rev=1755030&r1=1755029&r2=1755030&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
Wed Aug 3 06:52:15 2016
@@ -1425,13 +1425,13 @@ public class ScopeApplicationAdapter ext
, false // 3: false //playRemote
, size.x // 4: 416
, size.y // 5: 240
- , fi.getOwnerId() // 6: 1
+ , 1 // 6: 1 // z-index
, null // 7: null //TODO
- , 0 // 8: 0 //TODO
- , 0 // 9: 0 //TODO
- , 0 // 10: 0 //TODO
- , 0 // 11: 749 //TODO
- , 0 // 12: 739 //TODO
+ , 0 // 8: 0 //TODO // counter
+ , 0 // 9: 0 //TODO // x
+ , 0 // 10: 0 //TODO // y
+ , size.x // 11: 749 // width
+ , size.y // 12: 739 // height
, fuid // 13: 'flv_1469602000351'
);
}
Modified:
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/remote/baseVideoStream.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/remote/baseVideoStream.lzx?rev=1755030&r1=1755029&r2=1755030&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/remote/baseVideoStream.lzx
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/remote/baseVideoStream.lzx
Wed Aug 3 06:52:15 2016
@@ -169,26 +169,26 @@
@param number delay The time it should seek, for Live-Streams
this value should be -1
-->
<method name="playStream" args="_streamName, delay">
- <![CDATA[
- this.streamName = "" + _streamName;
- this.delay=delay;
- if (this._ns!=null){
- this._stop();
- }
- this.mode = "play";
- this.createStream();
- //invokes Method in baseVideoView which shows the stream
- this.attachVideo(this._ns);
- //FIXME: Commented out, cause this leads to
Buffer-Full/Buffer-Empty Events
- //after re-syncing the stream
- //this.setBuffer(0.1);
- if ($debug) Debug.write("Play Stream '" + streamName +
"'");
- if (delay == 0) {
- this._ns.play(streamName);
- } else {
- this._ns.play(streamName,delay);
- }
- ]]>
+ <![CDATA[
+ this.streamName = "" + _streamName;
+ this.delay = delay;
+ if (this._ns != null){
+ this._stop();
+ }
+ this.mode = "play";
+ this.createStream();
+ //invokes Method in baseVideoView which shows the stream
+ this.attachVideo(this._ns);
+ //FIXME: Commented out, cause this leads to
Buffer-Full/Buffer-Empty Events
+ //after re-syncing the stream
+ //this.setBuffer(0.1);
+ if ($debug) Debug.write("Play Stream '" + streamName + "'");
+ if (delay == 0) {
+ this._ns.play(streamName);
+ } else {
+ this._ns.play(streamName,delay);
+ }
+ ]]>
</method>
<method name="justPlayStream" args="_streamName, delay">
Modified:
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/whiteboardVideoPlayer.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/whiteboardVideoPlayer.lzx?rev=1755030&r1=1755029&r2=1755030&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/whiteboardVideoPlayer.lzx
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/whiteboardVideoPlayer.lzx
Wed Aug 3 06:52:15 2016
@@ -85,7 +85,6 @@
<method name="startStreamPlay">
parent.playFLV(this,true);
- this.startStream();
</method>
<method name="stopStreamPlay">
@@ -227,8 +226,8 @@
this.timerDelegate = new LzDelegate( this,
"calcProgressBar" );
</handler>
- <method name="playVideoStream" args="streamName,delay">
- this.playStream(streamName,delay);
+ <method name="playVideoStream" args="streamName, delay">
+ this.playStream(streamName, delay);
this.timerDelegateStarted = true;
lz.Timer.addTimer(this.timerDelegate , 1000);
</method>
Modified:
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java?rev=1755030&r1=1755029&r2=1755030&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
(original)
+++
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
Wed Aug 3 06:52:15 2016
@@ -1425,13 +1425,13 @@ public class ScopeApplicationAdapter ext
, false // 3: false //playRemote
, size.x // 4: 416
, size.y // 5: 240
- , fi.getOwnerId() // 6: 1
+ , 1 // 6: 1 // z-index
, null // 7: null //TODO
- , 0 // 8: 0 //TODO
- , 0 // 9: 0 //TODO
- , 0 // 10: 0 //TODO
- , 0 // 11: 749 //TODO
- , 0 // 12: 739 //TODO
+ , 0 // 8: 0 //TODO // counter
+ , 0 // 9: 0 //TODO // x
+ , 0 // 10: 0 //TODO // y
+ , size.x // 11: 749 // width
+ , size.y // 12: 739 // height
, fuid // 13: 'flv_1469602000351'
);
}
