haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Temporarily disable hard video mute." 

This reverts commit f02bee06aa.
This commit is contained in:
George Politis 2016-01-20 17:38:07 -06:00
parent 1dd0fe4bca
commit e0e5de6ec0
2 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/RTC/LocalStream.js
View File

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

9
modules/xmpp/JingleSessionPC.js
View File

@ -1274,14 +1274,6 @@ JingleSessionPC.prototype.notifyMySSRCUpdate = function (old_sdp, new_sdp) {
* contrast to an automatic decision made by the application logic) * contrast to an automatic decision made by the application logic)
*/ */
JingleSessionPC.prototype.setVideoMute = function (mute, callback, options) { 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; var byUser;
if (options) { if (options) {
@ -1319,7 +1311,6 @@ JingleSessionPC.prototype.setVideoMute = function (mute, callback, options) {
console.log("SDPs", oldSdp, newSdp); console.log("SDPs", oldSdp, newSdp);
self.notifyMySSRCUpdate(oldSdp, newSdp); self.notifyMySSRCUpdate(oldSdp, newSdp);
}); });
*/
}; };
JingleSessionPC.prototype.hardMuteVideo = function (muted) { JingleSessionPC.prototype.hardMuteVideo = function (muted) {