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

Moves local video thumb initializations where they belong. 

Moves local video thumb initializations where they belong in the local video constructor. Fixes a problem when there is no video device, then audio levels and gsm bars are missing. We were doing this initializations every time a video device is changed.
This commit is contained in:
damencho 2016-08-31 14:18:09 -05:00
parent 9ba62c320b
commit bb705e32d9
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/UI/videolayout/LocalVideo.js
View File

@ -24,6 +24,11 @@ function LocalVideo(VideoLayout, emitter) {
this.initBrowserSpecificProperties(); this.initBrowserSpecificProperties();
SmallVideo.call(this, VideoLayout); SmallVideo.call(this, VideoLayout);
// Set default display name.
this.setDisplayName();
this.createConnectionIndicator();
} }
LocalVideo.prototype = Object.create(SmallVideo.prototype); LocalVideo.prototype = Object.create(SmallVideo.prototype);

11
modules/UI/videolayout/VideoLayout.js
View File

@ -107,7 +107,9 @@ var VideoLayout = {
localVideoThumbnail.setVideoType(VIDEO_CONTAINER_TYPE); localVideoThumbnail.setVideoType(VIDEO_CONTAINER_TYPE);
// if we do not resize the thumbs here, if there is no video device // if we do not resize the thumbs here, if there is no video device
// the local video thumb maybe one pixel // the local video thumb maybe one pixel
this.resizeThumbnails(false, true, false); let {thumbWidth, thumbHeight}
= this.resizeThumbnails(false, true, false);
AudioLevels.updateAudioLevelCanvas(null, thumbWidth, thumbHeight);
emitter.addListener(UIEvents.CONTACT_CLICKED, onContactClicked); emitter.addListener(UIEvents.CONTACT_CLICKED, onContactClicked);
this.lastNCount = config.channelLastN; this.lastNCount = config.channelLastN;
@ -158,16 +160,9 @@ var VideoLayout = {
}, },
changeLocalVideo (stream) { changeLocalVideo (stream) {
// Set default display name.
localVideoThumbnail.setDisplayName();
localVideoThumbnail.createConnectionIndicator();
let localId = APP.conference.getMyUserId(); let localId = APP.conference.getMyUserId();
this.onVideoTypeChanged(localId, stream.videoType); this.onVideoTypeChanged(localId, stream.videoType);
let {thumbWidth, thumbHeight} = this.resizeThumbnails(false, true);
AudioLevels.updateAudioLevelCanvas(null, thumbWidth, thumbHeight);
if (!stream.isMuted()) { if (!stream.isMuted()) {
localVideoThumbnail.changeVideo(stream); localVideoThumbnail.changeVideo(stream);
} }