Merge pull request #108 from jitsi/remove-browser-type-check

Remove browser type check

JitsiConferenceEvents.js

@@ -4,11 +4,17 @@
  */
 var JitsiConferenceEvents = {
     /**
-     * A new media track was added to the conference.
+     * A new media track was added to the conference. The event provides the
+     * following parameters to its listeners:
+     *
+     * @param {JitsiTrack} track the added JitsiTrack
      */
     TRACK_ADDED: "conference.trackAdded",
     /**
-     * The media track was removed from the conference.
+     * The media track was removed from the conference. The event provides the
+     * following parameters to its listeners:
+     *
+     * @param {JitsiTrack} track the removed JitsiTrack
      */
     TRACK_REMOVED: "conference.trackRemoved",
     /**

modules/RTC/JitsiLocalTrack.js

@@ -359,7 +359,8 @@ JitsiLocalTrack.prototype.getSSRC = function () {
 };
 
 /**
- * Return true;
+ * Returns <tt>true</tt>.
+ * @returns {boolean} <tt>true</tt>
  */
 JitsiLocalTrack.prototype.isLocal = function () {
     return true;

modules/RTC/JitsiRemoteTrack.js

@@ -32,7 +32,6 @@ JitsiRemoteTrack.prototype.constructor = JitsiRemoteTrack;
  * @param value the muted status.
  */
 JitsiRemoteTrack.prototype.setMute = function (value) {
-
     if(this.muted === value)
         return;
 
@@ -69,7 +68,8 @@ JitsiRemoteTrack.prototype.isLocal = function () {
 };
 
 /**
- * Return false;
+ * Returns the synchronization source identifier (SSRC) of this remote track.
+ * @returns {string} the SSRC of this remote track
  */
 JitsiRemoteTrack.prototype.getSSRC = function () {
     return this.ssrc;

modules/RTC/JitsiTrack.js

@@ -237,8 +237,7 @@ JitsiTrack.prototype.dispose = function () {
  * Returns true if this is a video track and the source of the video is a
  * screen capture as opposed to a camera.
  */
-JitsiTrack.prototype.isScreenSharing = function(){
-
+JitsiTrack.prototype.isScreenSharing = function() {
 };
 
 /**
@@ -268,7 +267,7 @@ JitsiTrack.prototype.getId = function () {
  * @returns {boolean} whether MediaStream is active.
  */
 JitsiTrack.prototype.isActive = function () {
-    if((typeof this.stream.active !== "undefined"))
+    if(typeof this.stream.active !== "undefined")
         return this.stream.active;
     else
         return true;
@@ -299,7 +298,6 @@ JitsiTrack.prototype.off = function (eventId, handler) {
 JitsiTrack.prototype.addEventListener = JitsiTrack.prototype.on;
 JitsiTrack.prototype.removeEventListener = JitsiTrack.prototype.off;
 
-
 /**
  * Sets the audio level for the stream
  * @param audioLevel the new audio level

modules/RTC/RTCUtils.js

@@ -483,9 +483,17 @@ function obtainDevices(options) {
  */
 function handleLocalStream(streams, resolution) {
     var audioStream, videoStream, desktopStream, res = [];
-    // If this is FF, the stream parameter is *not* a MediaStream object, it's
-    // an object with two properties: audioStream, videoStream.
-    if (window.webkitMediaStream) {
+
+    // XXX The function obtainAudioAndVideoPermissions has examined the type of
+    // the browser, its capabilities, etc. and has taken the decision whether to
+    // invoke getUserMedia per device (e.g. Firefox) or once for both audio and
+    // video (e.g. Chrome). In order to not duplicate the logic here, examine
+    // the specified streams and figure out what we've received based on
+    // obtainAudioAndVideoPermissions' decision.
+    if (streams) {
+        // As mentioned above, certian types of browser (e.g. Chrome) support
+        // (with a result which meets our requirements expressed bellow) calling
+        // getUserMedia once for both audio and video.
         var audioVideo = streams.audioVideo;
         if (audioVideo) {
             var audioTracks = audioVideo.getAudioTracks();
@@ -503,39 +511,34 @@ function handleLocalStream(streams, resolution) {
                     videoStream.addTrack(videoTracks[j]);
                 }
             }
+        } else {
+          // On other types of browser (e.g. Firefox) we choose (namely,
+          // obtainAudioAndVideoPermissions) to call getUsermedia per device
+          // (type).
+          audioStream = streams.audio;
+          videoStream = streams.video;
         }
-
-        // FIXME Checking streams here is unnecessary because there's
-        // streams.audioVideo above.
-        if (streams)
-            desktopStream = streams.desktopStream;
-
-    }
-    else if (RTCBrowserType.isFirefox() || RTCBrowserType.isTemasysPluginUsed()) {   // Firefox and Temasys plugin
-        if (streams) {
-            audioStream = streams.audio;
-            videoStream = streams.video;
-            desktopStream = streams.desktop;
-        }
+        // Again, different choices on different types of browser.
+        desktopStream = streams.desktopStream || streams.desktop;
     }
 
-    if (desktopStream)
+    if (desktopStream) {
         res.push({
             stream: desktopStream,
             track: desktopStream.getVideoTracks()[0],
             mediaType: MediaType.VIDEO,
             videoType: VideoType.DESKTOP
         });
-
-    if(audioStream)
+    }
+    if (audioStream) {
         res.push({
             stream: audioStream,
             track: audioStream.getAudioTracks()[0],
             mediaType: MediaType.AUDIO,
             videoType: null
         });
-
-    if(videoStream)
+    }
+    if (videoStream) {
         res.push({
             stream: videoStream,
             track: videoStream.getVideoTracks()[0],
@@ -543,6 +546,7 @@ function handleLocalStream(streams, resolution) {
             videoType: VideoType.CAMERA,
             resolution: resolution
         });
+    }
 
     return res;
 }
@@ -653,21 +657,16 @@ var RTCUtils = {
                     return element;
                 });
                 this.getStreamID = function (stream) {
-                    // streams from FF endpoints have the characters '{' and '}'
+                    // Streams from FF endpoints have the characters '{' and '}'
                     // that make jQuery choke.
                     return SDPUtil.filter_special_chars(stream.id);
                 };
                 this.getVideoSrc = function (element) {
-                    if (!element)
-                        return null;
-                    return element.getAttribute("src");
+                    return element ? element.getAttribute("src") : null;
                 };
                 this.setVideoSrc = function (element, src) {
-                    if (!src) {
-                        src = '';
-                    }
                     if (element)
-                        element.setAttribute("src", src);
+                        element.setAttribute("src", src || '');
                 };
                 // DTLS should now be enabled by default but..
                 this.pc_constraints = {'optional': [

modules/xmpp/ChatRoom.js

@@ -704,8 +704,8 @@ ChatRoom.prototype.removeListener = function (type, listener) {
 ChatRoom.prototype.remoteTrackAdded = function(data) {
     // Will figure out current muted status by looking up owner's presence
     var pres = this.lastPresences[data.owner];
-    var mediaType = data.mediaType;
     if(pres) {
+        var mediaType = data.mediaType;
         var mutedNode = null;
         if (mediaType === MediaType.AUDIO) {
             mutedNode = filterNodeFromPresenceJSON(pres, "audiomuted");

modules/xmpp/JingleSessionPC.js

@@ -1257,7 +1257,7 @@ JingleSessionPC.prototype.remoteTrackAdded = function (stream, track) {
     }
 
     var remoteSDP = new SDP(this.peerconnection.remoteDescription.sdp);
-    var medialines = remoteSDP.media.filter(function (mediaLines){
+    var medialines = remoteSDP.media.filter(function (mediaLines) {
         return mediaLines.startsWith("m=" + mediaType);
     });
 
@@ -1268,11 +1268,8 @@ JingleSessionPC.prototype.remoteTrackAdded = function (stream, track) {
 
     var ssrclines = SDPUtil.find_lines(medialines[0], 'a=ssrc:');
     ssrclines = ssrclines.filter(function (line) {
-        if (RTCBrowserType.isTemasysPluginUsed()) {
-            return ((line.indexOf('mslabel:' + streamId) !== -1));
-        } else {
-            return ((line.indexOf('msid:' + streamId) !== -1));
-        }
+        var msid = RTCBrowserType.isTemasysPluginUsed() ? 'mslabel' : 'msid';
+        return line.indexOf(msid + ':' + streamId) !== -1;
     });
 
     var thessrc;