[jira] [Resolved] (OPENMEETINGS-2581) saving whiteboard content and puttting it back onto it _ error
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2581?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Maxim Solodovnik resolved OPENMEETINGS-2581. Resolution: Fixed > saving whiteboard content and puttting it back onto it _ error > -- > > Key: OPENMEETINGS-2581 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2581 > Project: Openmeetings > Issue Type: Bug > Components: WhiteBoard >Affects Versions: 5.1.0 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 6.0.0 > > > Hello everybody, > Case 1. > STEP 1: I draw a line on the whiteboard. > STEP 2: I save it inside OM. > STEP 3: I put back the saved file onto a new whiteboard. > Result: The content is the same. > Case 2. > STEP 1: I draw a line on the whiteboard. > STEP 2: I draw a car with the "car" tool. > STEP 3: I save the whiteboard. > STEP 4: I put the saved file onto the whiteboard. > STEP 5: I select the line and the car TOGETHER and move them. > STEP 6: I save the whiteboard. > STEP 7: I put back the saved file onto the whiteboard. > Result: the positions of the objects are not correct. > Positions are not maintained because I moved the two objects > together. If I move them one by one it's ok. > I used om 5.1.0 without recompiling. > It seems to be more stable than OM 4.xx. > Any feedback? > Thank you. > Note: I like the main concept of OM. The digital whiteboard is its cutting > edge. -- This message was sent by Atlassian Jira (v8.3.4#803005)
[jira] [Commented] (OPENMEETINGS-2581) saving whiteboard content and puttting it back onto it _ error
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2581?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17290723#comment-17290723 ] ASF subversion and git services commented on OPENMEETINGS-2581: --- Commit 7f5f91a1cf0c77a2a4aa359221da52fa19f6d9fc in openmeetings's branch refs/heads/master from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=7f5f91a ] [OPENMEETINGS-2581] WB contents modification is fixed > saving whiteboard content and puttting it back onto it _ error > -- > > Key: OPENMEETINGS-2581 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2581 > Project: Openmeetings > Issue Type: Bug > Components: WhiteBoard >Affects Versions: 5.1.0 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 6.0.0 > > > Hello everybody, > Case 1. > STEP 1: I draw a line on the whiteboard. > STEP 2: I save it inside OM. > STEP 3: I put back the saved file onto a new whiteboard. > Result: The content is the same. > Case 2. > STEP 1: I draw a line on the whiteboard. > STEP 2: I draw a car with the "car" tool. > STEP 3: I save the whiteboard. > STEP 4: I put the saved file onto the whiteboard. > STEP 5: I select the line and the car TOGETHER and move them. > STEP 6: I save the whiteboard. > STEP 7: I put back the saved file onto the whiteboard. > Result: the positions of the objects are not correct. > Positions are not maintained because I moved the two objects > together. If I move them one by one it's ok. > I used om 5.1.0 without recompiling. > It seems to be more stable than OM 4.xx. > Any feedback? > Thank you. > Note: I like the main concept of OM. The digital whiteboard is its cutting > edge. -- This message was sent by Atlassian Jira (v8.3.4#803005)
[openmeetings] branch master updated: [OPENMEETINGS-2581] WB contents modification is fixed
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 7f5f91a [OPENMEETINGS-2581] WB contents modification is fixed
7f5f91a is described below
commit 7f5f91a1cf0c77a2a4aa359221da52fa19f6d9fc
Author: Maxim Solodovnik
AuthorDate: Thu Feb 25 13:43:31 2021 +0700
[OPENMEETINGS-2581] WB contents modification is fixed
---
openmeetings-web/src/main/front/wb/src/wb-area.js| 9 +++--
openmeetings-web/src/main/front/wb/src/wb.js | 12
.../org/apache/openmeetings/web/app/WhiteboardManager.java | 5 -
.../java/org/apache/openmeetings/web/room/wb/WbPanel.java| 3 ++-
4 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/openmeetings-web/src/main/front/wb/src/wb-area.js
b/openmeetings-web/src/main/front/wb/src/wb-area.js
index 6fb7e2e..4e94fec 100644
--- a/openmeetings-web/src/main/front/wb/src/wb-area.js
+++ b/openmeetings-web/src/main/front/wb/src/wb-area.js
@@ -181,7 +181,12 @@ module.exports = class DrawWbArea extends WbAreaBase {
.confirmation({
confirmationEvent: 'bla'
, onConfirm: function() {
- OmUtil.wbAction({action:
'removeWb', data: {wbId: wbId}});
+ const prevLi = li.prev()
+ , prevWbId =
prevLi.length > 0 ? prevLi.find('a').data('wb-id') : -1;
+ OmUtil.wbAction({action:
'removeWb', data: {
+ wbId: wbId
+ , prevWbId: prevWbId
+ }});
}
});
}
@@ -343,7 +348,7 @@ module.exports = class DrawWbArea extends WbAreaBase {
}
_getWbTab(obj.wbId).parent().remove();
_getWbContent(obj.wbId).remove();
- _actionActivateWb(_getActive().data().id);
+ _actionActivateWb(obj.prevWbId);
};
this.load = (json) => {
if (!_inited) {
diff --git a/openmeetings-web/src/main/front/wb/src/wb.js
b/openmeetings-web/src/main/front/wb/src/wb.js
index b065bd4..8d6a3cf 100644
--- a/openmeetings-web/src/main/front/wb/src/wb.js
+++ b/openmeetings-web/src/main/front/wb/src/wb.js
@@ -147,6 +147,12 @@ module.exports = class Wb {
if (role === Role.NONE && o.omType !== 'pointer') {
return;
}
+ function modifiedAction(items) {
+ OmUtil.wbAction({action: 'modifyObj', data: {
+ wbId: self.id
+ , obj: items
+ }});
+ }
o.includeDefaultValues = false;
if ('activeSelection' === o.type) {
o.clone(function(_o) {
@@ -156,14 +162,12 @@ module.exports = class Wb {
for (let i = 0; i < _items.length; ++i)
{
items.push(self._toOmJson(_items[i]));
}
+ modifiedAction(items);
}, extraProps);
} else {
items.push(self._toOmJson(o));
+ modifiedAction(items);
}
- OmUtil.wbAction({action: 'modifyObj', data: {
- wbId: self.id
- , obj: items
- }});
}
function objSelectedHandler(e) {
tools.updateCoordinates(e.target);
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WhiteboardManager.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WhiteboardManager.java
index 9ab90cd..8af5a6b 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WhiteboardManager.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WhiteboardManager.java
@@ -242,9 +242,12 @@ public class WhiteboardManager implements
IWhiteboardManager {
}
}
- public Whiteboard remove(long roomId, Long wbId) {
+ public Whiteboard remove(long roomId, long wbId, long prevWbId) {
Whiteboards wbs =
[jira] [Created] (OPENMEETINGS-2581) saving whiteboard content and puttting it back onto it _ error
Maxim Solodovnik created OPENMEETINGS-2581: -- Summary: saving whiteboard content and puttting it back onto it _ error Key: OPENMEETINGS-2581 URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2581 Project: Openmeetings Issue Type: Bug Components: WhiteBoard Affects Versions: 5.1.0 Reporter: Maxim Solodovnik Assignee: Maxim Solodovnik Fix For: 6.0.0 Hello everybody, Case 1. STEP 1: I draw a line on the whiteboard. STEP 2: I save it inside OM. STEP 3: I put back the saved file onto a new whiteboard. Result: The content is the same. Case 2. STEP 1: I draw a line on the whiteboard. STEP 2: I draw a car with the "car" tool. STEP 3: I save the whiteboard. STEP 4: I put the saved file onto the whiteboard. STEP 5: I select the line and the car TOGETHER and move them. STEP 6: I save the whiteboard. STEP 7: I put back the saved file onto the whiteboard. Result: the positions of the objects are not correct. Positions are not maintained because I moved the two objects together. If I move them one by one it's ok. I used om 5.1.0 without recompiling. It seems to be more stable than OM 4.xx. Any feedback? Thank you. Note: I like the main concept of OM. The digital whiteboard is its cutting edge. -- This message was sent by Atlassian Jira (v8.3.4#803005)
[jira] [Commented] (OPENMEETINGS-2580) iceCandidates can be incoming before WebRtcEndpoint is ready and requires queueing
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2580?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17290260#comment-17290260 ] ASF subversion and git services commented on OPENMEETINGS-2580: --- Commit f7b743e75af56d250f735ca566df650e22d01bc6 in openmeetings's branch refs/heads/feature/OPENMEETINGS-2580-re-apply-ice-before-sending-ws-candidates from Sebastian Wagner [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=f7b743e ] OPENMEETINGS-2580 Externalise method. > iceCandidates can be incoming before WebRtcEndpoint is ready and requires > queueing > -- > > Key: OPENMEETINGS-2580 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2580 > Project: Openmeetings > Issue Type: New Feature >Affects Versions: 6.0.0 >Reporter: Sebastian Wagner >Assignee: Sebastian Wagner >Priority: Major > Fix For: 6.0.0 > > > Will discuss via mailing list -- This message was sent by Atlassian Jira (v8.3.4#803005)
[openmeetings] branch feature/OPENMEETINGS-2580-re-apply-ice-before-sending-ws-candidates updated: OPENMEETINGS-2580 Externalise method.
This is an automated email from the ASF dual-hosted git repository.
sebawagner pushed a commit to branch
feature/OPENMEETINGS-2580-re-apply-ice-before-sending-ws-candidates
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to
refs/heads/feature/OPENMEETINGS-2580-re-apply-ice-before-sending-ws-candidates
by this push:
new f7b743e OPENMEETINGS-2580 Externalise method.
f7b743e is described below
commit f7b743e75af56d250f735ca566df650e22d01bc6
Author: Sebastian Wagner
AuthorDate: Thu Feb 25 09:50:20 2021 +1300
OPENMEETINGS-2580 Externalise method.
---
.../org/apache/openmeetings/core/remote/KStream.java | 20 +++-
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KStream.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KStream.java
index bfe7175..694fc1f 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KStream.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KStream.java
@@ -308,15 +308,7 @@ public class KStream extends AbstractStream implements
ISipCallbacks {
private WebRtcEndpoint createEndpoint(String sid, String uid, boolean
recv) {
WebRtcEndpoint endpoint = createWebRtcEndpoint(pipeline, recv);
setTags(endpoint, uid);
-
- if (recv) {
- if (!candidatesQueue.isEmpty()) {
- log.trace("addIceCandidate iceCandidate reply
from not ready, uid: {}", uid);
- candidatesQueue.stream()
- .forEach(candidate ->
endpoint.addIceCandidate(candidate));
- candidatesQueue.clear();
- }
- }
+ reApplyIceCandiates(endpoint, recv);
endpoint.addIceCandidateFoundListener(evt ->
kHandler.sendClient(sid
, newKurentoMsg()
@@ -327,6 +319,16 @@ public class KStream extends AbstractStream implements
ISipCallbacks {
return endpoint;
}
+ private void reApplyIceCandiates(WebRtcEndpoint endpoint, boolean recv)
{
+ // sender candidates
+ if (recv && !candidatesQueue.isEmpty()) {
+ log.trace("addIceCandidate iceCandidate reply
from not ready, uid: {}", uid);
+ candidatesQueue.stream()
+ .forEach(candidate ->
endpoint.addIceCandidate(candidate));
+ candidatesQueue.clear();
+ }
+ }
+
public void startRecord() {
log.debug("startRecord outMedia OK ? {}", outgoingMedia !=
null);
if (outgoingMedia == null) {
[openmeetings] 01/01: OPENMEETINGS-2580 Move adding iceCandidates before sending ws notification.
This is an automated email from the ASF dual-hosted git repository.
sebawagner pushed a commit to branch
feature/OPENMEETINGS-2580-re-apply-ice-before-sending-ws-candidates
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit e3ed441ad8707b8094ae9dcb00cc1d390a219b3a
Author: Sebastian Wagner
AuthorDate: Thu Feb 25 09:45:03 2021 +1300
OPENMEETINGS-2580 Move adding iceCandidates before sending ws notification.
---
.../apache/openmeetings/core/remote/KStream.java | 23 --
1 file changed, 13 insertions(+), 10 deletions(-)
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KStream.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KStream.java
index a2f786f..bfe7175 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KStream.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KStream.java
@@ -151,12 +151,6 @@ public class KStream extends AbstractStream implements
ISipCallbacks {
addSipProcessor(1);
} else {
outgoingMedia =
createEndpoint(sd.getSid(), sd.getUid(), true);
- if (!candidatesQueue.isEmpty()) {
- log.trace("addIceCandidate
iceCandidate reply from not ready, uid: {}", sd.getUid());
- candidatesQueue.stream()
- .forEach(candidate ->
((WebRtcEndpoint)outgoingMedia).addIceCandidate(candidate));
- candidatesQueue.clear();
- }
internalStartBroadcast(sd, sdpOffer);
notifyOnNewStream(sd);
}
@@ -243,7 +237,7 @@ public class KStream extends AbstractStream implements
ISipCallbacks {
public void addListener(String sid, String uid, String sdpOffer) {
final boolean self = uid.equals(this.uid);
- log.info("USER {}: have started, sid {}, uid {} in kRoom {}",
sid, uid, self ? "broadcasting" : "receiving", getRoomId());
+ log.info("USER: have started, sid {}, uid {} in kRoom {}", sid,
uid, self ? "broadcasting" : "receiving", getRoomId());
log.trace("USER {}: SdpOffer is {}", uid, sdpOffer);
if (!self && outgoingMedia == null) {
log.warn("Trying to add listener too early, sid {}, uid
{}", sid, uid);
@@ -254,7 +248,7 @@ public class KStream extends AbstractStream implements
ISipCallbacks {
final String sdpAnswer = endpoint.processOffer(sdpOffer);
if (endpoint instanceof WebRtcEndpoint) {
- log.debug("gather candidates");
+ log.debug("gather candidates, sid {}, uid {}", sid,
uid);
((WebRtcEndpoint)endpoint).gatherCandidates(); // this
one might throw Exception
}
log.trace("USER {}: SdpAnswer is {}", this.uid, sdpAnswer);
@@ -315,6 +309,15 @@ public class KStream extends AbstractStream implements
ISipCallbacks {
WebRtcEndpoint endpoint = createWebRtcEndpoint(pipeline, recv);
setTags(endpoint, uid);
+ if (recv) {
+ if (!candidatesQueue.isEmpty()) {
+ log.trace("addIceCandidate iceCandidate reply
from not ready, uid: {}", uid);
+ candidatesQueue.stream()
+ .forEach(candidate ->
endpoint.addIceCandidate(candidate));
+ candidatesQueue.clear();
+ }
+ }
+
endpoint.addIceCandidateFoundListener(evt ->
kHandler.sendClient(sid
, newKurentoMsg()
.put("id", "iceCandidate")
@@ -516,7 +519,7 @@ public class KStream extends AbstractStream implements
ISipCallbacks {
if (this.uid.equals(uid)) {
if (!(outgoingMedia instanceof WebRtcEndpoint)) {
if (!sipClient) {
- log.info("addIceCandidate iceCandidate
while not ready yet, uid: {}", uid);
+ log.info("addIceCandidate iceCandidate
while not ready yet, uid: {}, candidate: {}", uid, candidate.getCandidate());
candidatesQueue.add(candidate);
}
return;
@@ -528,7 +531,7 @@ public class KStream extends AbstractStream implements
ISipCallbacks {
if (endpoint != null) {
[openmeetings] branch feature/OPENMEETINGS-2580-re-apply-ice-before-sending-ws-candidates created (now e3ed441)
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a change to branch feature/OPENMEETINGS-2580-re-apply-ice-before-sending-ws-candidates in repository https://gitbox.apache.org/repos/asf/openmeetings.git. at e3ed441 OPENMEETINGS-2580 Move adding iceCandidates before sending ws notification. This branch includes the following new commits: new e3ed441 OPENMEETINGS-2580 Move adding iceCandidates before sending ws notification. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[jira] [Commented] (OPENMEETINGS-2519) (6.0.0) Library versions need to be updated
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2519?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17289876#comment-17289876 ] ASF subversion and git services commented on OPENMEETINGS-2519: --- Commit 233cff4bfc5f2187a00fa02ee6547aaf729e786c in openmeetings's branch refs/heads/master from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=233cff4 ] [OPENMEETINGS-2519] wicket, db drivers, mockito > (6.0.0) Library versions need to be updated > --- > > Key: OPENMEETINGS-2519 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2519 > Project: Openmeetings > Issue Type: Task > Components: Builds >Affects Versions: 6.0.0 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 6.0.0 > > > Library versions need to be updated -- This message was sent by Atlassian Jira (v8.3.4#803005)
[openmeetings] branch master updated: [OPENMEETINGS-2519] wicket, db drivers, mockito
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 233cff4 [OPENMEETINGS-2519] wicket, db drivers, mockito 233cff4 is described below commit 233cff4bfc5f2187a00fa02ee6547aaf729e786c Author: Maxim Solodovnik AuthorDate: Wed Feb 24 19:02:12 2021 +0700 [OPENMEETINGS-2519] wicket, db drivers, mockito --- pom.xml | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 4570d75..5d662d2 100644 --- a/pom.xml +++ b/pom.xml @@ -79,7 +79,7 @@ 5.7.0 9.2.0 - 9.2.0 + 9.2.1 9.2.0 5.0.3 5.15.2 @@ -104,10 +104,10 @@ 2.1.3 1.15 2.8.0 - 42.2.18 + 42.2.19 8.0.23 9.2.0.jre11 - 19.9.0.0 + 19.10.0.0 4.4 1.4.15 2.0.1 @@ -119,7 +119,7 @@ 9.4.36.v20210114 test 1.68 - 3.7.7 + 3.8.0 2.3.2 6.15.0 1.2.307
[jira] [Commented] (OPENMEETINGS-2493) Build # 117 does not do recording
[
https://issues.apache.org/jira/browse/OPENMEETINGS-2493?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17289868#comment-17289868
]
Ali Alhaidary commented on OPENMEETINGS-2493:
-
I am very much sure that I did not make these comments in the hours before, I
was not online and it is an old one that was resolved long time ago...
> Build # 117 does not do recording
> -
>
> Key: OPENMEETINGS-2493
> URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2493
> Project: Openmeetings
> Issue Type: Bug
> Components: Audio/Video
>Affects Versions: 5.1.0
> Environment: ubuntu 18 LTS, FF
>Reporter: Ali Alhaidary
>Assignee: Maxim Solodovnik
>Priority: Blocker
> Fix For: 5.1.0
>
> Attachments: 2020-10-24T194748.0.pid1370.log,
> 2020-10-24T194748.0.pid1370.log, 2020-10-24T194748.0.pid1370.log,
> catalina.2020-10-24.log, catalina.2020-10-24.log, catalina.2020-10-24.log,
> catalina.2020-10-24.log, catalina.2020-10-24.log, catalina.2020-10-24.log,
> coturn.log, coturn.log, coturn.log, errors.log, errors.log, errors.log,
> openmeetings.log
>
>
> 1. Connection to media server drops after entering the meeting room
> 2. Connection also drops after stating recording
> 3. 'Stop Recording' does not stop the recording, and does not change to
> 'start recording'
> Bellow sample of error, it repeats for each attempt to record. connection
> drops immediately after entering the meeting and will not last only a second
> or so. Recordings are not shown in the list.
> [31mWARN [0;39m 10-23 19:55:00.571
> [36mo.k.c.i.t.j.RomClientJsonRpcClient:243 [ventExec-e3-t19][0;39m -
> [Continuation] error invoking OnSuccess implemented by client
> org.apache.wicket.WicketRuntimeException: There is no application attached to
> current thread AbstractJsonRpcClientWebSocket-reqResEventExec-e3-t19
> at org.apache.wicket.Application.get(Application.java:213)
> [1;31mERROR[0;39m 10-23 19:55:25.479 [36mo.a.o.w.c.OmWebSocketPanel:137
> [nio-5443-exec-8][0;39m - Error while processing incoming message
> java.lang.NullPointerException: null
> at org.apache.openmeetings.core.remote.KRoom.stopRecording(KRoom.java:182)
> [31mWARN [0;39m 10-23 20:05:20.761 [36mo.a.o.c.r.KStream:412
> [ventExec-e3-t51][0;39m - PARTICIPANT ec3582e8-5b54-4b6c-8da9-0a5c74abf002:
> Could not disconnect recorder
> org.kurento.jsonrpc.JsonRpcErrorException: Object
> 'b59519ec-7bc2-4e61-a4c3-2f9b731cd84a_kurento.MediaPipeline/5eb26793-9be1-4db4-86ad-5551f15d0649_kurento.WebRtcEndpoint'
> not found. Code: 40101. Data: \{"type":"MEDIA_OBJECT_NOT_FOUND"}
> at
> org.kurento.jsonrpc.internal.JsonRpcRequestSenderHelper$1.onSuccess(JsonRpcRequestSenderHelper.java:128)
> [1;31mERROR[0;39m 10-23 20:05:29.258 [36mo.a.o.w.c.OmWebSocketPanel:137
> [nio-5443-exec-3][0;39m - Error while processing incoming message
> java.lang.NullPointerException: null
> at org.apache.openmeetings.core.remote.KRoom.stopRecording(KRoom.java:182)
--
This message was sent by Atlassian Jira
(v8.3.4#803005)
[jira] [Commented] (OPENMEETINGS-2580) iceCandidates can be incoming before WebRtcEndpoint is ready and requires queueing
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2580?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17289850#comment-17289850 ] ASF subversion and git services commented on OPENMEETINGS-2580: --- Commit 629974c5bd343b47c8475db3c5cf4692d087461a in openmeetings's branch refs/heads/master from Sebastian Wagner [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=629974c ] OPENMEETINGS-2580 Enable additional logs for making failed attempts to add ice candidate visible (#131) * OPENMEETINGS-2580 Enable additional logs for making failed attempts to add ice candidate visible. * OPENMEETINGS-2580 Queue missing early iceCandidates and re-apply once connection established with WebRtcEndpoint. * [OPENMEETINGS-2580] some improvements Co-authored-by: Maxim Solodovnik > iceCandidates can be incoming before WebRtcEndpoint is ready and requires > queueing > -- > > Key: OPENMEETINGS-2580 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2580 > Project: Openmeetings > Issue Type: New Feature >Affects Versions: 6.0.0 >Reporter: Sebastian Wagner >Assignee: Sebastian Wagner >Priority: Major > Fix For: 6.0.0 > > > Will discuss via mailing list -- This message was sent by Atlassian Jira (v8.3.4#803005)
[jira] [Commented] (OPENMEETINGS-2580) iceCandidates can be incoming before WebRtcEndpoint is ready and requires queueing
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2580?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17289847#comment-17289847 ] ASF subversion and git services commented on OPENMEETINGS-2580: --- Commit 629974c5bd343b47c8475db3c5cf4692d087461a in openmeetings's branch refs/heads/master from Sebastian Wagner [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=629974c ] OPENMEETINGS-2580 Enable additional logs for making failed attempts to add ice candidate visible (#131) * OPENMEETINGS-2580 Enable additional logs for making failed attempts to add ice candidate visible. * OPENMEETINGS-2580 Queue missing early iceCandidates and re-apply once connection established with WebRtcEndpoint. * [OPENMEETINGS-2580] some improvements Co-authored-by: Maxim Solodovnik > iceCandidates can be incoming before WebRtcEndpoint is ready and requires > queueing > -- > > Key: OPENMEETINGS-2580 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2580 > Project: Openmeetings > Issue Type: New Feature >Affects Versions: 6.0.0 >Reporter: Sebastian Wagner >Assignee: Sebastian Wagner >Priority: Major > Fix For: 6.0.0 > > > Will discuss via mailing list -- This message was sent by Atlassian Jira (v8.3.4#803005)
[jira] [Commented] (OPENMEETINGS-2580) iceCandidates can be incoming before WebRtcEndpoint is ready and requires queueing
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2580?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17289849#comment-17289849 ] ASF subversion and git services commented on OPENMEETINGS-2580: --- Commit 629974c5bd343b47c8475db3c5cf4692d087461a in openmeetings's branch refs/heads/master from Sebastian Wagner [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=629974c ] OPENMEETINGS-2580 Enable additional logs for making failed attempts to add ice candidate visible (#131) * OPENMEETINGS-2580 Enable additional logs for making failed attempts to add ice candidate visible. * OPENMEETINGS-2580 Queue missing early iceCandidates and re-apply once connection established with WebRtcEndpoint. * [OPENMEETINGS-2580] some improvements Co-authored-by: Maxim Solodovnik > iceCandidates can be incoming before WebRtcEndpoint is ready and requires > queueing > -- > > Key: OPENMEETINGS-2580 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2580 > Project: Openmeetings > Issue Type: New Feature >Affects Versions: 6.0.0 >Reporter: Sebastian Wagner >Assignee: Sebastian Wagner >Priority: Major > Fix For: 6.0.0 > > > Will discuss via mailing list -- This message was sent by Atlassian Jira (v8.3.4#803005)
[jira] [Commented] (OPENMEETINGS-2580) iceCandidates can be incoming before WebRtcEndpoint is ready and requires queueing
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2580?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17289848#comment-17289848 ] ASF subversion and git services commented on OPENMEETINGS-2580: --- Commit 629974c5bd343b47c8475db3c5cf4692d087461a in openmeetings's branch refs/heads/master from Sebastian Wagner [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=629974c ] OPENMEETINGS-2580 Enable additional logs for making failed attempts to add ice candidate visible (#131) * OPENMEETINGS-2580 Enable additional logs for making failed attempts to add ice candidate visible. * OPENMEETINGS-2580 Queue missing early iceCandidates and re-apply once connection established with WebRtcEndpoint. * [OPENMEETINGS-2580] some improvements Co-authored-by: Maxim Solodovnik > iceCandidates can be incoming before WebRtcEndpoint is ready and requires > queueing > -- > > Key: OPENMEETINGS-2580 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2580 > Project: Openmeetings > Issue Type: New Feature >Affects Versions: 6.0.0 >Reporter: Sebastian Wagner >Assignee: Sebastian Wagner >Priority: Major > Fix For: 6.0.0 > > > Will discuss via mailing list -- This message was sent by Atlassian Jira (v8.3.4#803005)
[openmeetings] branch master updated: OPENMEETINGS-2580 Enable additional logs for making failed attempts to add ice candidate visible (#131)
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 629974c OPENMEETINGS-2580 Enable additional logs for making failed
attempts to add ice candidate visible (#131)
629974c is described below
commit 629974c5bd343b47c8475db3c5cf4692d087461a
Author: Sebastian Wagner
AuthorDate: Wed Feb 24 23:54:43 2021 +1300
OPENMEETINGS-2580 Enable additional logs for making failed attempts to add
ice candidate visible (#131)
* OPENMEETINGS-2580 Enable additional logs for making failed attempts to
add ice candidate visible.
* OPENMEETINGS-2580 Queue missing early iceCandidates and re-apply once
connection established with WebRtcEndpoint.
* [OPENMEETINGS-2580] some improvements
Co-authored-by: Maxim Solodovnik
---
.../org/apache/openmeetings/core/remote/KStream.java | 20 +---
.../core/remote/StreamProcessorActions.java | 8 +---
2 files changed, 22 insertions(+), 6 deletions(-)
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KStream.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KStream.java
index 47d8201..a2f786f 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KStream.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KStream.java
@@ -36,9 +36,10 @@ import java.util.Date;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Optional;
+import java.util.Queue;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.TimeUnit;
import java.util.function.Consumer;
@@ -82,9 +83,10 @@ public class KStream extends AbstractStream implements
ISipCallbacks {
private MediaPipeline pipeline;
private RecorderEndpoint recorder;
private BaseRtpEndpoint outgoingMedia = null;
+ private Queue candidatesQueue = new
ConcurrentLinkedQueue<>();
private RtpEndpoint rtpEndpoint;
private Optional sipProcessor = Optional.empty();
- private final ConcurrentMap listeners = new
ConcurrentHashMap<>();
+ private final Map listeners = new
ConcurrentHashMap<>();
private Optional> flowoutFuture =
Optional.empty();
private ListenerSubscription flowoutSubscription;
private Long chunkId;
@@ -149,6 +151,12 @@ public class KStream extends AbstractStream implements
ISipCallbacks {
addSipProcessor(1);
} else {
outgoingMedia =
createEndpoint(sd.getSid(), sd.getUid(), true);
+ if (!candidatesQueue.isEmpty()) {
+ log.trace("addIceCandidate
iceCandidate reply from not ready, uid: {}", sd.getUid());
+ candidatesQueue.stream()
+ .forEach(candidate ->
((WebRtcEndpoint)outgoingMedia).addIceCandidate(candidate));
+ candidatesQueue.clear();
+ }
internalStartBroadcast(sd, sdpOffer);
notifyOnNewStream(sd);
}
@@ -504,9 +512,13 @@ public class KStream extends AbstractStream implements
ISipCallbacks {
sipProcessor = Optional.empty();
}
- public void addCandidate(IceCandidate candidate, String uid) {
+ public void addIceCandidate(IceCandidate candidate, String uid) {
if (this.uid.equals(uid)) {
if (!(outgoingMedia instanceof WebRtcEndpoint)) {
+ if (!sipClient) {
+ log.info("addIceCandidate iceCandidate
while not ready yet, uid: {}", uid);
+ candidatesQueue.add(candidate);
+ }
return;
}
((WebRtcEndpoint)outgoingMedia).addIceCandidate(candidate);
@@ -515,6 +527,8 @@ public class KStream extends AbstractStream implements
ISipCallbacks {
log.debug("Add candidate for {}, listener found ? {}",
uid, endpoint != null);
if (endpoint != null) {
endpoint.addIceCandidate(candidate);
+ } else {
+ log.warn("addIceCandidate iceCandidate could
not find endpoint, uid: {}", uid);
}
[jira] [Commented] (OPENMEETINGS-2580) iceCandidates can be incoming before WebRtcEndpoint is ready and requires queueing
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2580?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17289793#comment-17289793 ] ASF subversion and git services commented on OPENMEETINGS-2580: --- Commit 65abf8e8af75e723ad72044fa433817ef1fb2da3 in openmeetings's branch refs/heads/feature/OPENMEETINGS-2580-onIceCandidate-queueing from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=65abf8e ] [OPENMEETINGS-2580] some improvements > iceCandidates can be incoming before WebRtcEndpoint is ready and requires > queueing > -- > > Key: OPENMEETINGS-2580 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2580 > Project: Openmeetings > Issue Type: New Feature >Affects Versions: 6.0.0 >Reporter: Sebastian Wagner >Assignee: Sebastian Wagner >Priority: Major > Fix For: 6.0.0 > > > Will discuss via mailing list -- This message was sent by Atlassian Jira (v8.3.4#803005)
[openmeetings] branch feature/OPENMEETINGS-2580-onIceCandidate-queueing updated (477f067 -> 65abf8e)
This is an automated email from the ASF dual-hosted git repository. solomax pushed a change to branch feature/OPENMEETINGS-2580-onIceCandidate-queueing in repository https://gitbox.apache.org/repos/asf/openmeetings.git. from 477f067 OPENMEETINGS-2580 Queue missing early iceCandidates and re-apply once connection established with WebRtcEndpoint. add 65abf8e [OPENMEETINGS-2580] some improvements No new revisions were added by this update. Summary of changes: .../org/apache/openmeetings/core/remote/KStream.java| 17 + 1 file changed, 9 insertions(+), 8 deletions(-)
