From 97ebcebdbedc7214b8b858b61c61f4f4c14e0c5f Mon Sep 17 00:00:00 2001 From: damencho Date: Tue, 15 Dec 2015 16:55:25 -0600 Subject: [PATCH] Revert "Fixes a problem with receiving presence for start muted video before creating the stream element, which will end up that the muted video element will hide the avatar." This reverts commit 303287f7a651cd3a7ad88c62e3e41856ba0973f7. --- modules/RTC/MediaStream.js | 4 ---- modules/UI/videolayout/SmallVideo.js | 7 ------- modules/UI/videolayout/VideoLayout.js | 3 --- 3 files changed, 14 deletions(-) diff --git a/modules/RTC/MediaStream.js b/modules/RTC/MediaStream.js index 343285956..fc500781e 100644 --- a/modules/RTC/MediaStream.js +++ b/modules/RTC/MediaStream.js @@ -54,8 +54,4 @@ MediaStream.prototype.setMute = function (value) { this.muted = value; }; -MediaStream.prototype.getMute = function () { - return this.muted; -}; - module.exports = MediaStream; diff --git a/modules/UI/videolayout/SmallVideo.js b/modules/UI/videolayout/SmallVideo.js index 06fee6ef7..5352b22ee 100644 --- a/modules/UI/videolayout/SmallVideo.js +++ b/modules/UI/videolayout/SmallVideo.js @@ -112,13 +112,6 @@ SmallVideo.createStreamElement = function (stream) { : document.createElement('audio'); if (isVideo) { element.setAttribute("muted", "true"); - - // the presence for muted (start muted) can be received before creating - // the element, so we need to check here and if that is the case - // hide the element - if (stream.getMute()) { - $(element).hide(); - } } if (!RTCBrowserType.isIExplorer()) { diff --git a/modules/UI/videolayout/VideoLayout.js b/modules/UI/videolayout/VideoLayout.js index 021dc5c17..d98a18464 100644 --- a/modules/UI/videolayout/VideoLayout.js +++ b/modules/UI/videolayout/VideoLayout.js @@ -579,9 +579,6 @@ var VideoLayout = (function (my) { remoteVideo.showVideoIndicator(value); var el = remoteVideo.selectVideoElement(); - // the presence and trigger of onVideoMute can be earlier than - // creating the stream element. So show and hide can be ignored - // we need to take care for them also on creating the stream elem if (!value) el.show(); else