Author: a_horuzhenko
Date: Thu Apr 25 05:50:54 2013
New Revision: 1475638
URL: http://svn.apache.org/r1475638
Log:
Video codec type and echo suppression options can be set in config.xml
Modified:
openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml
openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xsd
openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx
openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainAttributes.lzx
openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainMethods.lzx
openmeetings/trunk/singlewebapp/WebContent/swf10/base/remote/baseVideoStream.lzx
openmeetings/trunk/singlewebapp/WebContent/swf10/video/editRecordStreamSWF10.lzx
Modified: openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml?rev=1475638&r1=1475637&r2=1475638&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml
(original)
+++ openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml Thu Apr
25 05:50:54 2013
@@ -187,7 +187,16 @@ of the red5-servlet
http://code.google.com/p/openmeetings/wiki/AudioVideoTestingApplication
#############################################################################
-->
-
+
+<!-- Camera Settings for codecType
+
+ codecType possible values:
+ h263
+ h264
+ If you want to use red5sip, set value to "h264"
+ -->
+<codecType>h264</codecType>
+
<!-- Camera Settings for the FramesPerSecond
fps:Number [optional] - The requested rate at which the camera should
capture
@@ -247,6 +256,11 @@ To disable AEC please specify 0.
<echoPath>128</echoPath>
<!--
+ Set "true" or "false" to enable/disable microphone echo suppression
+ -->
+<echoSuppression>true</echoSuppression>
+
+<!--
The Size of the Whiteboard
The Whiteboard has scrollbars so you may increase the size without problems
-->
Modified: openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xsd
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xsd?rev=1475638&r1=1475637&r2=1475638&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xsd
(original)
+++ openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xsd Thu Apr
25 05:50:54 2013
@@ -41,6 +41,7 @@
<xs:element ref="showWindowEffect"/>
<xs:element ref="showRecording"/>
<xs:element ref="firstdayinweek"/>
+ <xs:element ref="codecType"/>
<xs:element ref="framesPerSecond"/>
<xs:element ref="bandwidthNeededNormal"/>
<xs:element ref="bandwidthNeededBest"/>
@@ -48,6 +49,7 @@
<xs:element ref="camQualityBest"/>
<xs:element ref="microphoneRateBest"/>
<xs:element ref="echoPath" />
+ <xs:element ref="echoSuppression" />
<xs:element ref="defaultWhiteboardWidth"/>
<xs:element ref="defaultWhiteboardHeight"/>
<xs:element ref="availableCameraResolutions"/>
@@ -131,12 +133,14 @@
<xs:element name="showWindowEffect" type="xs:NCName"/>
<xs:element name="showRecording" type="xs:NCName"/>
<xs:element name="firstdayinweek" type="xs:integer"/>
+ <xs:element name="codecType" type="xs:string"/>
<xs:element name="framesPerSecond" type="xs:integer"/>
<xs:element name="bandwidthNeededNormal" type="xs:integer"/>
<xs:element name="bandwidthNeededBest" type="xs:integer"/>
<xs:element name="camQualityNormal" type="xs:integer"/>
<xs:element name="camQualityBest" type="xs:integer"/>
<xs:element name="microphoneRateBest" type="xs:integer"/>
+ <xs:element name="echoSuppression" type="xs:string"/>
<xs:element name="echoPath">
<xs:annotation>
<xs:documentation>
Modified: openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx?rev=1475638&r1=1475637&r2=1475638&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx
(original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx Thu
Apr 25 05:50:54 2013
@@ -265,6 +265,7 @@ the LAST RoomClient Object that has been
<!--- Audio-Video Quality Settings
overwritten by values from the config.xml
-->
+<attribute name="codecType" value="h264" type="string" />
<attribute name="framesPerSecond" value="30" type="number" />
<attribute name="bandwidthNeededNormal" value="16384" type="number" />
<attribute name="bandwidthNeededBest" value="32768" type="number" />
Modified: openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx?rev=1475638&r1=1475637&r2=1475638&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
(original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx Thu Apr
25 05:50:54 2013
@@ -215,6 +215,7 @@
//this.setAttribute('showmodernWhiteBoard',canvas.myConfigSet.getPointer().xpathQuery('config/showmodernWhiteBoard/text()'));
//Audio-Video-Settings
+
this.setAttribute('codecType',canvas.myConfigSet.getPointer().xpathQuery('config/codecType/text()'));
this.setAttribute('framesPerSecond',Number(canvas.myConfigSet.getPointer().xpathQuery('config/framesPerSecond/text()')));
this.setAttribute('bandwidthNeededNormal',Number(canvas.myConfigSet.getPointer().xpathQuery('config/bandwidthNeededNormal/text()')));
this.setAttribute('bandwidthNeededBest',Number(canvas.myConfigSet.getPointer().xpathQuery('config/bandwidthNeededBest/text()')));
Modified:
openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainAttributes.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainAttributes.lzx?rev=1475638&r1=1475637&r2=1475638&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainAttributes.lzx
(original)
+++ openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainAttributes.lzx
Thu Apr 25 05:50:54 2013
@@ -27,6 +27,7 @@
Audio-Video Quality Settings
overwritten by values from the config.xml
-->
+ <attribute name="codecType" value="h264" type="string" />
<attribute name="framesPerSecond" value="30" type="number" />
<attribute name="bandwidthNeededNormal" value="16384" type="number" />
<attribute name="bandwidthNeededBest" value="32768" type="number" />
@@ -34,6 +35,7 @@
<attribute name="camQualityBest" value="75" type="number" />
<attribute name="microphoneRateBest" value="22" type="number" />
<attribute name="echoPath" value="128" type="number" />
+ <attribute name="echoSuppression" value="true" type="string" />
<!---
Modified: openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainMethods.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainMethods.lzx?rev=1475638&r1=1475637&r2=1475638&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainMethods.lzx
(original)
+++ openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainMethods.lzx Thu
Apr 25 05:50:54 2013
@@ -32,6 +32,7 @@
//Audio-Video-Settings
this.setAttribute('loudnessAcitviation',canvas.myConfigSet.getPointer().xpathQuery('config/loudnessAcitviation/text()'));
+
this.setAttribute('codecType',canvas.myConfigSet.getPointer().xpathQuery('config/codecType/text()'));
this.setAttribute('framesPerSecond',Number(canvas.myConfigSet.getPointer().xpathQuery('config/framesPerSecond/text()')));
this.setAttribute('bandwidthNeededNormal',Number(canvas.myConfigSet.getPointer().xpathQuery('config/bandwidthNeededNormal/text()')));
this.setAttribute('bandwidthNeededBest',Number(canvas.myConfigSet.getPointer().xpathQuery('config/bandwidthNeededBest/text()')));
@@ -39,6 +40,7 @@
this.setAttribute('camQualityBest',Number(canvas.myConfigSet.getPointer().xpathQuery('config/camQualityBest/text()')));
this.setAttribute('microphoneRateBest',Number(canvas.myConfigSet.getPointer().xpathQuery('config/microphoneRateBest/text()')));
this.setAttribute('echoPath',Number(canvas.myConfigSet.getPointer().xpathQuery('config/echoPath/text()')));
+
this.setAttribute('echoSuppression',canvas.myConfigSet.getPointer().xpathQuery('config/echoSuppression/text()'));
//httphostlocal variable is loaded from the SWF8 application, cause it
needs value, SWF10 app
//knows nothing about the rtmphostlocal, and we don't want to parse
the URL from the browser
Modified:
openmeetings/trunk/singlewebapp/WebContent/swf10/base/remote/baseVideoStream.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/swf10/base/remote/baseVideoStream.lzx?rev=1475638&r1=1475637&r2=1475638&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/WebContent/swf10/base/remote/baseVideoStream.lzx
(original)
+++
openmeetings/trunk/singlewebapp/WebContent/swf10/base/remote/baseVideoStream.lzx
Thu Apr 25 05:50:54 2013
@@ -224,12 +224,18 @@
//invokes Method in baseVideoView which shows the cam
this.attachCamera(camReference);
- var h264Settings:H264VideoStreamSettings = new
H264VideoStreamSettings();
- h264Settings.setProfileLevel(H264Profile.BASELINE,
H264Level.LEVEL_5_1);
- h264Settings.setQuality(camReference.bandwidth,
camReference.quality);
-
h264Settings.setKeyFrameInterval(camReference.keyFrameInterval);
- h264Settings.setMode(camReference.width,
camReference.height, camReference.fps);
- this._ns.videoStreamSettings = h264Settings;
+ var videoStreamSettings = null;
+ if ($debug) Debug.write("codecType=" +
canvas.codecType);
+ if (canvas.codecType === "h264") {
+ videoStreamSettings = new
H264VideoStreamSettings();
+
videoStreamSettings.setProfileLevel(H264Profile.BASELINE, H264Level.LEVEL_5_1);
+ } else {
+ videoStreamSettings = new VideoStreamSettings();
+ }
+ videoStreamSettings.setQuality(camReference.bandwidth,
camReference.quality);
+
videoStreamSettings.setKeyFrameInterval(camReference.keyFrameInterval);
+ videoStreamSettings.setMode(camReference.width,
camReference.height, camReference.fps);
+ this._ns.videoStreamSettings = videoStreamSettings;
}
if (micReference != null) {
this.setAttribute('micro', micReference);
Modified:
openmeetings/trunk/singlewebapp/WebContent/swf10/video/editRecordStreamSWF10.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/swf10/video/editRecordStreamSWF10.lzx?rev=1475638&r1=1475637&r2=1475638&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/WebContent/swf10/video/editRecordStreamSWF10.lzx
(original)
+++
openmeetings/trunk/singlewebapp/WebContent/swf10/video/editRecordStreamSWF10.lzx
Thu Apr 25 05:50:54 2013
@@ -262,7 +262,9 @@
_micro.gain = 50;
// this has no effect if enhanced microphone is
obtained
//Microphone setUseEchoSupression(bool)
- _micro.setUseEchoSuppression(true);
+ var enableEchoSupression =
!(canvas.echoSuppression === "false");
+ if ($debug)
Debug.write("canvas.echoSuppression: ",canvas.echoSuppression);
+
_micro.setUseEchoSuppression(enableEchoSupression);
}
}
if ($debug) Debug.write("... getMic DONE", _micro);
