From f02bee06aaf19671bb3ad735381e41c85874da91 Mon Sep 17 00:00:00 2001 From: George Politis Date: Fri, 15 Jan 2016 18:50:03 -0600 Subject: [PATCH] Temporarily disable hard video mute. --- modules/RTC/LocalStream.js | 4 +++- modules/xmpp/JingleSessionPC.js | 9 +++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/modules/RTC/LocalStream.js b/modules/RTC/LocalStream.js index bf30305f1..7129f0b3e 100644 --- a/modules/RTC/LocalStream.js +++ b/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()) { diff --git a/modules/xmpp/JingleSessionPC.js b/modules/xmpp/JingleSessionPC.js index 7b478d3b2..643fca5a5 100644 --- a/modules/xmpp/JingleSessionPC.js +++ b/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) {