Merge remote-tracking branch 'upstream/master'

modules/RTC/LocalStream.js

@@ -73,7 +73,9 @@ LocalStream.prototype.setMute = function (mute)
     var isAudio = this.isAudioStream();
     var eventType = isAudio ? RTCEvents.AUDIO_MUTE : RTCEvents.VIDEO_MUTE;
 
-    if ((window.location.protocol != "https:" && this.isGUMStream) ||
+    // Temporarily disable completely turning off the camera because of
+    // simulcast.
+    if (true || (window.location.protocol != "https:" && this.isGUMStream) ||
         (isAudio && this.isGUMStream) || this.videoType === "screen" ||
         // FIXME FF does not support 'removeStream' method used to mute
         RTCBrowserType.isFirefox()) {

modules/xmpp/JingleSessionPC.js

@@ -1274,6 +1274,14 @@ JingleSessionPC.prototype.notifyMySSRCUpdate = function (old_sdp, new_sdp) {
  * contrast to an automatic decision made by the application logic)
  */
 JingleSessionPC.prototype.setVideoMute = function (mute, callback, options) {
+
+    // Temporarily disable completely turning off the camera because of
+    // simulcast.
+    APP.RTC.localVideo.setMute(mute);
+    callback(mute);
+    return;
+
+    /*
     var byUser;
 
     if (options) {
@@ -1311,6 +1319,7 @@ JingleSessionPC.prototype.setVideoMute = function (mute, callback, options) {
         console.log("SDPs", oldSdp, newSdp);
         self.notifyMySSRCUpdate(oldSdp, newSdp);
     });
+    */
 };
 
 JingleSessionPC.prototype.hardMuteVideo = function (muted) {

modules/xmpp/TraceablePeerConnection.js

@@ -167,7 +167,7 @@ var insertRecvOnlySSRC = function (desc) {
             bLine.ssrcs = [{
                 id: ssrc,
                 attribute: 'cname',
-                value: ['recvonly-', ssrc].join(' ')
+                value: ['recvonly-', ssrc].join('')
             }];
         }
     });