[openmeetings] branch master updated: [OPENMEETINGS-2101] audio/video seems to work as expected in secured environment

[solomax]

This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


The following commit(s) were added to refs/heads/master by this push:
     new 51767fe  [OPENMEETINGS-2101] audio/video seems to work as expected in 
secured environment
51767fe is described below

commit 51767fe31d7c848ea2c17ab77220771ea5d83c21
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Wed Aug 21 18:52:00 2019 +0700

    [OPENMEETINGS-2101] audio/video seems to work as expected in secured 
environment
---
 .../main/java/org/apache/openmeetings/web/room/raw-video.js   | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video.js 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video.js
index c183978..e60baf3 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video.js
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video.js
@@ -2,7 +2,7 @@
 var Video = (function() {
        const self = {}
                , AudioCtx = window.AudioContext || window.webkitAudioContext;
-       let sd, v, vc, t, f, size, vol, slider, handle, video
+       let sd, v, vc, t, f, size, vol, slider, handle, video, iceServers
                , lastVolume = 50, muted = false
                , lm, level, userSpeaks = false, muteOthers;
 
@@ -339,6 +339,7 @@ var Video = (function() {
        }
        function _init(msg) {
                sd = msg.stream;
+               iceServers = msg.iceServers;
                sd.activities = sd.activities.sort();
                size = {width: sd.width, height: sd.height};
                const _id = VideoUtil.getVid(sd.uid)
@@ -409,7 +410,7 @@ var Video = (function() {
                        .width(vc.width()).height(vc.height())
                        .prop('autoplay', true).prop('controls', false);
                if (hasVideo) {
-                       vc.removeClass('audio-only');
+                       vc.removeClass('audio-only').css('background-image', 
'');;
                        vc.parents('.ui-dialog').removeClass('audio-only');
                        video.attr('poster', sd.user.pictureUri);
                } else {
@@ -417,9 +418,8 @@ var Video = (function() {
                        vc.addClass('audio-only').css('background-image', 
'url(' + sd.user.pictureUri + ')');
                }
                vc.append(video);
-               const hasAudio = VideoUtil.hasAudio(sd);
                if (vol) {
-                       if (hasAudio) {
+                       if (VideoUtil.hasAudio(sd)) {
                                vol.show();
                                _mute(muted);
                        } else {
@@ -428,7 +428,8 @@ var Video = (function() {
                        }
                }
        }
-       function _refresh(msg) {
+       function _refresh(_msg) {
+               const msg = _msg || {iceServers: iceServers};
                _cleanup();
                const hasAudio = VideoUtil.hasAudio(sd);
                if (sd.self) {