You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2020/10/30 03:02:37 UTC
[openmeetings] branch master updated: [OPENMEETINGS-2502]
audio/video should start in one step
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 b330164 [OPENMEETINGS-2502] audio/video should start in one step
b330164 is described below
commit b330164cb1055d3c5f19bcc0f982a77942ab5e1b
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Fri Oct 30 09:38:49 2020 +0700
[OPENMEETINGS-2502] audio/video should start in one step
---
.../org/apache/openmeetings/core/remote/StreamProcessor.java | 2 +-
.../java/org/apache/openmeetings/db/entity/basic/Client.java | 12 ++++++++++--
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/StreamProcessor.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/StreamProcessor.java
index 300f77a..60c0030 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/StreamProcessor.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/StreamProcessor.java
@@ -267,7 +267,7 @@ public class StreamProcessor implements IStreamProcessor {
log.debug("User {}: has started broadcast", sd.getUid());
kHandler.sendClient(sd.getSid(), newKurentoMsg()
.put("id", "broadcast")
- .put("stream", sd.toJson())
+ .put("stream", sd.toJson(true))
.put("cleanup", new JSONArray(closed))
.put(PARAM_ICE, kHandler.getTurnServers(c, false)));
}
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java
index c069f14..06082fd 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java
@@ -558,13 +558,21 @@ public class Client implements IDataProviderEntity, IWsClient {
}
public JSONObject toJson() {
- return addUserJson(new JSONObject()
+ return toJson(false);
+ }
+
+ public JSONObject toJson(boolean self) {
+ JSONObject o = new JSONObject()
.put("uid", uuid)
.put("type", type.name())
.put("width", swidth)
.put("height", sheight)
.put("activities", new JSONArray(sactivities))
- .put("cuid", uid));
+ .put("cuid", uid);
+ if (self) {
+ o.put("cam", cam).put("mic", mic);
+ }
+ return addUserJson(o);
}
@Override