diff --git a/modules/RTC/LocalStream.js b/modules/RTC/LocalStream.js index 7129f0b3e..bf30305f1 100644 --- a/modules/RTC/LocalStream.js +++ b/modules/RTC/LocalStream.js @@ -73,9 +73,7 @@ LocalStream.prototype.setMute = function (mute) var isAudio = this.isAudioStream(); var eventType = isAudio ? RTCEvents.AUDIO_MUTE : RTCEvents.VIDEO_MUTE; - // Temporarily disable completely turning off the camera because of - // simulcast. - if (true || (window.location.protocol != "https:" && this.isGUMStream) || + if ((window.location.protocol != "https:" && this.isGUMStream) || (isAudio && this.isGUMStream) || this.videoType === "screen" || // FIXME FF does not support 'removeStream' method used to mute RTCBrowserType.isFirefox()) { diff --git a/modules/xmpp/JingleSessionPC.js b/modules/xmpp/JingleSessionPC.js index 643fca5a5..7b478d3b2 100644 --- a/modules/xmpp/JingleSessionPC.js +++ b/modules/xmpp/JingleSessionPC.js @@ -1274,14 +1274,6 @@ 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) { @@ -1319,7 +1311,6 @@ JingleSessionPC.prototype.setVideoMute = function (mute, callback, options) { console.log("SDPs", oldSdp, newSdp); self.notifyMySSRCUpdate(oldSdp, newSdp); }); - */ }; JingleSessionPC.prototype.hardMuteVideo = function (muted) {