You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by se...@apache.org on 2012/12/11 01:33:05 UTC
svn commit: r1419945 -
/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/editRecordStreamSWF10.lzx
Author: sebawagner
Date: Tue Dec 11 00:33:05 2012
New Revision: 1419945
URL: http://svn.apache.org/viewvc?rev=1419945&view=rev
Log:
OPENMEETINGS-489 Start recording test hangs if no webcamera connected
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/editRecordStreamSWF10.lzx
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/editRecordStreamSWF10.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/editRecordStreamSWF10.lzx?rev=1419945&r1=1419944&r2=1419945&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/editRecordStreamSWF10.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/editRecordStreamSWF10.lzx Tue Dec 11 00:33:05 2012
@@ -368,6 +368,7 @@
var _micro = null;
var _camera = null;
+
if (valMic != null) {
_micro = Microphone.getMicrophone(valMic);
if (_micro != null) {
@@ -386,7 +387,6 @@
if ($debug) Debug.write("_camera.setMode: ",videoview.width,videoview.height,canvas.framesPerSecond,true);
- //Microphone.set
if ($debug) Debug.write("canvas.microphoneRateBest: ",canvas.microphoneRateBest);
if (_camera != null) {
if ($debug) Debug.write("_camera.setQuality BEST: ",this.isInterview,(canvas.bandwidthNeededBest*2),canvas.camQualityBest);
@@ -399,15 +399,24 @@
if ($debug) Debug.warn("IS NO INTERVIEW ");
_camera.setQuality(canvas.bandwidthNeededBest,canvas.camQualityBest);
}
- }
- //The First start-timer message will come from the Flash Object
- if ($debug) Debug.warn("_camera.muted ",_camera.muted);
- if ($debug) Debug.warn("_micro.muted ",_micro.muted);
- if (!_camera.muted) {
- this.startTimer();
+ //The First start-timer message will come from the Flash Object
+ if ($debug) Debug.warn("_camera.muted ",_camera.muted);
+ if ($debug) Debug.warn("_micro.muted ",_micro.muted);
+
+ if (!_camera.muted) {
+ this.startTimer();
+ }
+
+ } else {
+ if (_micro != null) {
+ this.startTimer();
+ }
}
+
+
+
//start recording of client stream
var t = new Date();