[openmeetings] branch master updated: [OPENMEETINGS-2496] sdpAnswer and iceCandidate processing performed in 'stable' state

[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 e3401cb  [OPENMEETINGS-2496] sdpAnswer and iceCandidate processing 
performed in 'stable' state
e3401cb is described below

commit e3401cb8df28a0443d1b7449b406d460092c87a7
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Mon Oct 26 21:17:22 2020 +0700

    [OPENMEETINGS-2496] sdpAnswer and iceCandidate processing performed in 
'stable' state
---
 .../src/main/java/org/apache/openmeetings/web/common/main.js     | 6 ++++--
 .../src/main/java/org/apache/openmeetings/web/room/raw-video.js  | 9 ++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/main.js 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/main.js
index 6faf49c..97129b1 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/main.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/main.js
@@ -44,11 +44,13 @@ var OmUtil = (function() {
                        setTimeout(() => { $(`#${curId}`).alert('close');}, 
autohideAfter);
                }
        }
-       function _error(msg) {
+       function _error(msg, noAlert) {
                if (typeof(msg) === 'object') {
                        msg = msg.name + ': ' + msg.message;
                }
-               __alert('danger', msg, 20000);
+               if (noAlert !== true) {
+                       __alert('danger', msg, 20000);
+               }
                return console.error(msg);
        }
        function _debugEnabled() {
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 01a480b..f600b83 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
@@ -576,7 +576,7 @@ var Video = (function() {
        }
        function _processSdpAnswer(answer) {
                const state = states.length > 0 ? states[0] : null;
-               if (!state || state.disposed || !state.data.rtcPeer || 
state.data.rtcPeer.cleaned || state.data.rtcPeer.peerConnection.signalingState 
=== 'stable') {
+               if (!state || state.disposed || !state.data.rtcPeer || 
state.data.rtcPeer.cleaned) {
                        return;
                }
                state.data.rtcPeer.processAnswer(answer, function (error) {
@@ -595,13 +595,13 @@ var Video = (function() {
                                return;
                        }
                        if (error) {
-                               return OmUtil.error(error);
+                               OmUtil.error(error, true);
                        }
                });
        }
        function _processIceCandidate(candidate) {
                const state = states.length > 0 ? states[0] : null;
-               if (!state || state.disposed || !state.data.rtcPeer || 
state.data.rtcPeer.cleaned || state.data.rtcPeer.peerConnection.signalingState 
=== 'stable') {
+               if (!state || state.disposed || !state.data.rtcPeer || 
state.data.rtcPeer.cleaned) {
                        return;
                }
                state.data.rtcPeer.addIceCandidate(candidate, function (error) {
@@ -609,8 +609,7 @@ var Video = (function() {
                                return;
                        }
                        if (error) {
-                               OmUtil.error('Error adding candidate: ' + 
error);
-                               return;
+                               OmUtil.error('Error adding candidate: ' + 
error, true);
                        }
                });
        }