|
|
@@ -383,7 +383,7 @@ function handleLocalStream(streams, resolution) {
|
|
383
|
383
|
var audioVideo = streams.audioVideo;
|
|
384
|
384
|
if (audioVideo) {
|
|
385
|
385
|
var audioTracks = audioVideo.getAudioTracks();
|
|
386
|
|
- if(audioTracks.length) {
|
|
|
386
|
+ if (audioTracks.length) {
|
|
387
|
387
|
audioStream = new webkitMediaStream();
|
|
388
|
388
|
for (var i = 0; i < audioTracks.length; i++) {
|
|
389
|
389
|
audioStream.addTrack(audioTracks[i]);
|
|
|
@@ -391,7 +391,7 @@ function handleLocalStream(streams, resolution) {
|
|
391
|
391
|
}
|
|
392
|
392
|
|
|
393
|
393
|
var videoTracks = audioVideo.getVideoTracks();
|
|
394
|
|
- if(videoTracks.length) {
|
|
|
394
|
+ if (videoTracks.length) {
|
|
395
|
395
|
videoStream = new webkitMediaStream();
|
|
396
|
396
|
for (var j = 0; j < videoTracks.length; j++) {
|
|
397
|
397
|
videoStream.addTrack(videoTracks[j]);
|
|
|
@@ -399,19 +399,18 @@ function handleLocalStream(streams, resolution) {
|
|
399
|
399
|
}
|
|
400
|
400
|
}
|
|
401
|
401
|
|
|
402
|
|
- if (streams && streams.desktopStream)
|
|
|
402
|
+ // FIXME Checking streams here is unnecessary because there's
|
|
|
403
|
+ // streams.audioVideo above.
|
|
|
404
|
+ if (streams)
|
|
403
|
405
|
desktopStream = streams.desktopStream;
|
|
404
|
406
|
|
|
405
|
407
|
}
|
|
406
|
408
|
else if (RTCBrowserType.isFirefox() || RTCBrowserType.isTemasysPluginUsed()) { // Firefox and Temasys plugin
|
|
407
|
|
- if (streams && streams.audio)
|
|
|
409
|
+ if (streams) {
|
|
408
|
410
|
audioStream = streams.audio;
|
|
409
|
|
-
|
|
410
|
|
- if (streams && streams.video)
|
|
411
|
411
|
videoStream = streams.video;
|
|
412
|
|
-
|
|
413
|
|
- if(streams && streams.desktop)
|
|
414
|
412
|
desktopStream = streams.desktop;
|
|
|
413
|
+ }
|
|
415
|
414
|
}
|
|
416
|
415
|
|
|
417
|
416
|
if (desktopStream)
|
|
|
@@ -755,7 +754,7 @@ var RTCUtils = {
|
|
755
|
754
|
new Error("Unable to get the audio and " +
|
|
756
|
755
|
"video tracks."),
|
|
757
|
756
|
options.devices));
|
|
758
|
|
- return;
|
|
|
757
|
+ return;
|
|
759
|
758
|
}
|
|
760
|
759
|
if(hasDesktop) {
|
|
761
|
760
|
screenObtainer.obtainStream(
|