Author: solomax
Date: Fri Mar 22 05:59:34 2013
New Revision: 1459641
URL: http://svn.apache.org/r1459641
Log:
[OPENMEETINGS-583] Ability to disable enhanced microphone is added
Modified:
openmeetings/branches/2.1/WebContent/openmeetings/config.xml
openmeetings/branches/2.1/WebContent/swf10/video/editRecordStreamSWF10.lzx
openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml
openmeetings/trunk/singlewebapp/WebContent/swf10/video/editRecordStreamSWF10.lzx
Modified: openmeetings/branches/2.1/WebContent/openmeetings/config.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/2.1/WebContent/openmeetings/config.xml?rev=1459641&r1=1459640&r2=1459641&view=diff
==============================================================================
--- openmeetings/branches/2.1/WebContent/openmeetings/config.xml (original)
+++ openmeetings/branches/2.1/WebContent/openmeetings/config.xml Fri Mar 22
05:59:34 2013
@@ -242,6 +242,7 @@ of the red5-servlet
Specifies the echo path length (in milliseconds). A longer echo path means
better
echo cancellation but also introduces longer delays and requires more
processing power.
The default value is 128; the only other possible value is 256.
+To disable AEC please specify 0.
-->
<echoPath>128</echoPath>
Modified:
openmeetings/branches/2.1/WebContent/swf10/video/editRecordStreamSWF10.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/2.1/WebContent/swf10/video/editRecordStreamSWF10.lzx?rev=1459641&r1=1459640&r2=1459641&view=diff
==============================================================================
--- openmeetings/branches/2.1/WebContent/swf10/video/editRecordStreamSWF10.lzx
(original)
+++ openmeetings/branches/2.1/WebContent/swf10/video/editRecordStreamSWF10.lzx
Fri Mar 22 05:59:34 2013
@@ -241,7 +241,7 @@
if ($debug) Debug.write("Entering getMic ...", valMic);
var _micro = null;
if (valMic != null) {
- _micro = Microphone.getEnhancedMicrophone(valMic);
+ _micro = canvas.echoPath == 0 ?
Microphone.getMicrophone(valMic) : Microphone.getEnhancedMicrophone(valMic);
if (_micro != null && canvas.echoPath == 256) {
var options:MicrophoneEnhancedOptions = new
MicrophoneEnhancedOptions();
@@ -251,8 +251,6 @@
_micro.enhancedOptions = options;
if ($debug) Debug.write("echoPath set to 256");
if ($debug) Debug.write(_micro.enhancedOptions);
- } else if (_micro == null) {
- _micro = Microphone.getMicrophone(valMic);
}
if (_micro != null) {
Modified: openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml?rev=1459641&r1=1459640&r2=1459641&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml
(original)
+++ openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml Fri Mar
22 05:59:34 2013
@@ -242,6 +242,7 @@ of the red5-servlet
Specifies the echo path length (in milliseconds). A longer echo path means
better
echo cancellation but also introduces longer delays and requires more
processing power.
The default value is 128; the only other possible value is 256.
+To disable AEC please specify 0.
-->
<echoPath>128</echoPath>
Modified:
openmeetings/trunk/singlewebapp/WebContent/swf10/video/editRecordStreamSWF10.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/swf10/video/editRecordStreamSWF10.lzx?rev=1459641&r1=1459640&r2=1459641&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/WebContent/swf10/video/editRecordStreamSWF10.lzx
(original)
+++
openmeetings/trunk/singlewebapp/WebContent/swf10/video/editRecordStreamSWF10.lzx
Fri Mar 22 05:59:34 2013
@@ -241,7 +241,7 @@
if ($debug) Debug.write("Entering getMic ...", valMic);
var _micro = null;
if (valMic != null) {
- _micro = Microphone.getEnhancedMicrophone(valMic);
+ _micro = canvas.echoPath == 0 ?
Microphone.getMicrophone(valMic) : Microphone.getEnhancedMicrophone(valMic);
if (_micro != null && canvas.echoPath == 256) {
var options:MicrophoneEnhancedOptions = new
MicrophoneEnhancedOptions();
@@ -251,8 +251,6 @@
_micro.enhancedOptions = options;
if ($debug) Debug.write("echoPath set to 256");
if ($debug) Debug.write(_micro.enhancedOptions);
- } else if (_micro == null) {
- _micro = Microphone.getMicrophone(valMic);
}
if (_micro != null) {
