Revision: 4665
Author: seba.wagner
Date: Sat Dec 3 03:41:45 2011
Log: Fixes issue 930
http://code.google.com/p/openmeetings/source/detail?r=4665
Modified:
/trunk/singlewebapp/WebContent/openmeetings/config.xml
/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
/trunk/singlewebapp/WebContent/src/base/remote/baseVideoStream.lzx
/trunk/singlewebapp/WebContent/src/modules/conference/eventuserlist/eventUserList.lzx
/trunk/singlewebapp/WebContent/src/modules/conference/interviewuserlist/interviewUserList.lzx
/trunk/singlewebapp/WebContent/src/modules/conference/participents/participents.lzx
/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserList.lzx
/trunk/singlewebapp/WebContent/src/modules/conference/video/editRecordStream.lzx
/trunk/singlewebapp/WebContent/src/modules/conference/video/videoObjectPlayBroadcast.lzx
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
=======================================
--- /trunk/singlewebapp/WebContent/openmeetings/config.xml Fri Dec 2
05:22:39 2011
+++ /trunk/singlewebapp/WebContent/openmeetings/config.xml Sat Dec 3
03:41:45 2011
@@ -218,14 +218,14 @@
<!-- Available Configurations -->
<availableCameraResolutions>
- <resolution type="4:3" width="40" height="30" isDefault="false" />
- <resolution type="4:3" width="80" height="60" isDefault="false" />
- <resolution type="4:3" width="120" height="90" isDefault="true" />
- <resolution type="QQVGA 4:3" width="160" height="120"
isDefault="false" />
- <resolution type="4:3" width="240" height="160" isDefault="false" />
- <resolution type="HVGA 4:3" width="320" height="240" isDefault="false"
/>
- <resolution type="4:3" width="480" height="320" isDefault="false" />
- <resolution type="4:3" width="640" height="480" isDefault="false" />
+ <resolution type="4:3 (~6 KByte/sec)" width="40" height="30"
isDefault="false" />
+ <resolution type="4:3 (~12 KByte/sec)" width="80" height="60"
isDefault="false" />
+ <resolution type="4:3 (~20 KByte/sec)" width="120" height="90"
isDefault="true" />
+ <resolution type="QQVGA 4:3 (~36 KByte/sec)" width="160" height="120"
isDefault="false" />
+ <resolution type="4:3 (~40 KByte/sec)" width="240" height="180"
isDefault="false" />
+ <resolution type="HVGA 4:3 (~56 KByte/sec)" width="320" height="240"
isDefault="false" />
+ <resolution type="4:3 (~60 KByte/sec)" width="480" height="360"
isDefault="false" />
+ <resolution type="4:3 (~68 KByte/sec)" width="640" height="480"
isDefault="false" />
<resolution type="XGA 4:3" width="1024" height="768" isDefault="false"
/>
<resolution type="16:9" width="256" height="150" isDefault="false" />
<resolution type="WQVGA 9:5" width="432" height="240"
isDefault="false" />
=======================================
--- /trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
Fri Dec 2 03:12:38 2011
+++ /trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
Sat Dec 3 03:41:45 2011
@@ -1061,7 +1061,7 @@
if (value.isScreenClient) {
return;
}
-
canvas._videocontainer.startStream(value.publicSID,value.broadCastID,value.firstname,value.lastname,value.interviewPodId);
+
canvas._videocontainer.startStream(value.publicSID,value.broadCastID,value.firstname,value.lastname,value.interviewPodId,value.VWidth,value.VHeight);
</handler>
</netRemoteCallHib>
=======================================
--- /trunk/singlewebapp/WebContent/src/base/remote/baseVideoStream.lzx Thu
Dec 1 05:41:54 2011
+++ /trunk/singlewebapp/WebContent/src/base/remote/baseVideoStream.lzx Sat
Dec 3 03:41:45 2011
@@ -42,6 +42,8 @@
<!--- @keywords private -->
<method name="createStream">
this._ns = new NetStream(this._findnc());
+ if ($debug) Debug.write("this._ns ",this._ns);
+ if ($debug) Debug.write("this._ns.client ",this._ns.client);
var t = this;
this._ns.onStatus = function(info) {
_root.Debug.write("simpleNetStream onStatus",info);
=======================================
---
/trunk/singlewebapp/WebContent/src/modules/conference/eventuserlist/eventUserList.lzx
Sun Sep 25 03:24:57 2011
+++
/trunk/singlewebapp/WebContent/src/modules/conference/eventuserlist/eventUserList.lzx
Sat Dec 3 03:41:45 2011
@@ -244,6 +244,7 @@
myvideocontainer._chatvideoinner._videostream.playStream(object.broadCastID,-1);
myvideocontainer.setAttribute("visibility","visible");
} else {
+
myvideocontainer.setDefaultVideoSize(object.VWidth,object.VHeight);
myvideocontainer._chatvideoinner._videostream.playStream(object.broadCastID,-1);
myvideocontainer.setAttribute("visibility","visible");
if ($debug) Debug.warn("start play");
@@ -294,7 +295,7 @@
invoked whenever a User starts to Stream Video in this Room,
interviewPodId has only a meaning in the Room Type Interview
-->
- <method name="startStream"
args="publicSID,broadcastId,firstname,lastname,interviewPodId">
+ <method name="startStream"
args="publicSID,broadcastId,firstname,lastname,interviewPodId,width,height">
<![CDATA[
//if ($debug) Debug.write("startStream broadcastId:
",broadcastId);
var obj = this.getVideoObjectByPublicSID(publicSID);
@@ -305,6 +306,7 @@
//if ($debug) Debug.write("startStream obj: ",obj);
if (obj != null ){
+ obj.setDefaultVideoSize(width,height);
obj._chatvideoinner._videostream.playStream(broadcastId,-1);
obj.setAttribute('chatpartnername',firstname+'
'+lastname);
} else {
=======================================
---
/trunk/singlewebapp/WebContent/src/modules/conference/interviewuserlist/interviewUserList.lzx
Sun Sep 25 04:18:39 2011
+++
/trunk/singlewebapp/WebContent/src/modules/conference/interviewuserlist/interviewUserList.lzx
Sat Dec 3 03:41:45 2011
@@ -283,7 +283,7 @@
<!--
invoked whenever a User starts to Stream Video in this Room
-->
- <method name="startStream"
args="publicSID,broadcastId,firstname,lastname,interviewPodId">
+ <method name="startStream"
args="publicSID,broadcastId,firstname,lastname,interviewPodId,width,height">
<![CDATA[
if ($debug) Debug.warn("startStream
broadcastId: ",publicSID,broadcastId,firstname,lastname,interviewPodId);
=======================================
---
/trunk/singlewebapp/WebContent/src/modules/conference/participents/participents.lzx
Fri Dec 2 03:12:38 2011
+++
/trunk/singlewebapp/WebContent/src/modules/conference/participents/participents.lzx
Sat Dec 3 03:41:45 2011
@@ -218,6 +218,7 @@
myvideocontainer._chatvideoinner._videostream.playStream(object.broadCastID,-1);
myvideocontainer.setAttribute("visibility","hidden");
} else {
+
myvideocontainer.setDefaultVideoSize(object.VWidth,object.VHeight);
myvideocontainer._chatvideoinner._videostream.playStream(object.broadCastID,-1);
myvideocontainer.setAttribute("visibility","visible");
if ($debug) Debug.warn("start play");
@@ -265,12 +266,13 @@
invoked whenever a User starts to Stream Video in this Room,
interviewPodId has only a meaning in the Room Type Interview
-->
- <method name="startStream"
args="publicSID,broadcastId,firstname,lastname,interviewPodId">
+ <method name="startStream"
args="publicSID,broadcastId,firstname,lastname,interviewPodId,width,height">
<![CDATA[
//if ($debug) Debug.write("startStream
broadcastId: ",broadcastId);
var obj = this.getVideoObjectByPublicSID(publicSID);
//if ($debug) Debug.write("startStream obj: ",obj);
if (obj != null ){
+ obj.setDefaultVideoSize(width,height);
obj._chatvideoinner._videostream.playStream(broadcastId,-1);
obj.setAttribute('chatpartnername',firstname+' '+lastname);
}
=======================================
---
/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserList.lzx
Sat Sep 17 08:15:38 2011
+++
/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserList.lzx
Sat Dec 3 03:41:45 2011
@@ -246,6 +246,7 @@
myvideocontainer.minimize();
}
} else {
+
myvideocontainer.setDefaultVideoSize(object.VWidth,object.VHeight);
myvideocontainer._chatvideoinner._videostream.playStream(object.broadCastID,-1);
myvideocontainer.setAttribute("visibility","visible");
if ($debug) Debug.warn("start play");
@@ -298,6 +299,7 @@
myvideocontainer.minimize();
}
} else {
+
myvideocontainer.setDefaultVideoSize(object.VWidth,object.VHeight);
myvideocontainer._chatvideoinner._videostream.playStream(object.broadCastID,-1);
myvideocontainer.setAttribute("visibility","visible");
if ($debug) Debug.warn("start play");
@@ -348,7 +350,7 @@
invoked whenever a User starts to Stream Video in this Room,
interviewPodId has only a meaning in the Room Type Interview
-->
- <method name="startStream"
args="publicSID,broadcastId,firstname,lastname,interviewPodId">
+ <method name="startStream"
args="publicSID,broadcastId,firstname,lastname,interviewPodId,width,height">
<![CDATA[
//if ($debug) Debug.write("startStream broadcastId:
",broadcastId);
var obj = this.getVideoObjectByPublicSID(publicSID);
@@ -359,6 +361,7 @@
//if ($debug) Debug.write("startStream obj: ",obj);
if (obj != null ){
+ obj.setDefaultVideoSize(width,height);
obj._chatvideoinner._videostream.playStream(broadcastId,-1);
obj.setAttribute('chatpartnername',firstname+'
'+lastname);
} else {
=======================================
---
/trunk/singlewebapp/WebContent/src/modules/conference/video/editRecordStream.lzx
Fri Dec 2 05:22:39 2011
+++
/trunk/singlewebapp/WebContent/src/modules/conference/video/editRecordStream.lzx
Sat Dec 3 03:41:45 2011
@@ -106,6 +106,8 @@
remotecontext="$once{ canvas.thishib }" >
<netparam><method name="getValue">return
parent.parent.chosenSetting;</method></netparam>
<netparam><method name="getValue">return
parent.parent.remoteMessage;</method></netparam>
+ <netparam><method name="getValue">return
parent.parent.cam_default_width;</method></netparam>
+ <netparam><method name="getValue">return
parent.parent.cam_default_height;</method></netparam>
<handler name="ondata" args="value">
<![CDATA[
if ($debug) Debug.write("setUserAVSettings",value);
=======================================
---
/trunk/singlewebapp/WebContent/src/modules/conference/video/videoObjectPlayBroadcast.lzx
Tue Feb 9 09:38:52 2010
+++
/trunk/singlewebapp/WebContent/src/modules/conference/video/videoObjectPlayBroadcast.lzx
Sat Dec 3 03:41:45 2011
@@ -12,6 +12,10 @@
<attribute name="ratioW" value="1" />
<attribute name="ratioH" value="1" />
+
+ <attribute name="videoInsetX" value="2" type="number" />
+ <attribute name="videoInsetY" value="21" type="number" />
+
<handler name="oninit">
<![CDATA[
if ($debug) Debug.write("Init
videoObjectPlayBroadcast ",this.name);
@@ -23,9 +27,20 @@
this._resizeview.bringToFront();
]]>
</handler>
-
- <view name="_chatvideoinner" x="1" y="20"
- width="${parent.width-2}" height="${parent.height-21}" >
+
+ <!---
+ Change the video resolution by chaning pod size
+ -->
+ <method name="setDefaultVideoSize" args="w,h">
+ this.setAttribute("width",w+this.videoInsetX);
+ this.setAttribute("height",h+this.videoInsetY);
+ if ($debug)
Debug.info("setDefaultVideoSize ",this.width,this.height);
+ </method>
+
+ <view name="_chatvideoinner" x="$once{ parent.videoInsetX-1 }"
+ y="$once{ parent.videoInsetY-1 }"
+ height="${parent.height-parent.videoInsetY}"
+ width="${parent.width-parent.videoInsetX}" >
<attribute name="initH"/>
<attribute name="initW"/>
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
Thu Dec 1 04:45:29 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
Sat Dec 3 03:41:45 2011
@@ -1454,7 +1454,7 @@
* @return
*/
public synchronized RoomClient setUserAVSettings(String avsettings,
- Object newMessage) {
+ Object newMessage, Integer vWidth, Integer vHeight) {
try {
IConnection current = Red5.getConnectionLocal();
@@ -1462,6 +1462,8 @@
RoomClient currentClient = this.clientListManager
.getClientByStreamId(streamid);
currentClient.setAvsettings(avsettings);
+ currentClient.setVWidth(vWidth);
+ currentClient.setVHeight(vHeight);
// Long room_id = currentClient.getRoom_id();
this.clientListManager.updateClientByStreamId(streamid,
currentClient);
--
You received this message because you are subscribed to the Google Groups
"OpenMeetings developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/openmeetings-dev?hl=en.
