This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch OPENMEETINGS-1649-kurento
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit b0d77a67ea50885145e998066bcbc1645d0bd626
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Thu Mar 8 00:48:48 2018 +0700
[OPENMEETINGS-1836] basic video send/receive is implemented
---
.../src/main/java/org/apache/openmeetings/core/remote/KUser.java | 6 +++---
.../java/org/apache/openmeetings/core/remote/KurentoHandler.java | 2 +-
.../org/apache/openmeetings/web/room/sidebar/RoomSidebar.java | 3 +--
.../main/java/org/apache/openmeetings/web/room/video-manager.js | 8 ++++----
.../src/main/webapp/WEB-INF/classes/logback-config.xml | 2 +-
5 files changed, 10 insertions(+), 11 deletions(-)
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KUser.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KUser.java
index 85b4e95..e2bbb2a 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KUser.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KUser.java
@@ -90,13 +90,13 @@ public class KUser implements Closeable {
log.trace("USER {}: SdpOffer for {} is {}", this.uid,
sender.getUid(), sdpOffer);
- final String ipSdpAnswer = this.getEndpointForUser(h,
sender).processOffer(sdpOffer);
+ final String sdpAnswer = this.getEndpointForUser(h,
sender).processOffer(sdpOffer);
final JSONObject scParams = newKurentoMsg();
scParams.put("id", "videoResponse");
scParams.put("uid", sender.getUid());
- scParams.put("sdpAnswer", ipSdpAnswer);
+ scParams.put("sdpAnswer", sdpAnswer);
- log.trace("USER {}: SdpAnswer for {} is {}", this.uid,
sender.getUid(), ipSdpAnswer);
+ log.trace("USER {}: SdpAnswer for {} is {}", this.uid,
sender.getUid(), sdpAnswer);
h.sendClient(uid, scParams);
log.debug("gather candidates");
this.getEndpointForUser(h, sender).gatherCandidates();
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KurentoHandler.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KurentoHandler.java
index 607238f..c403209 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KurentoHandler.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KurentoHandler.java
@@ -76,7 +76,7 @@ public class KurentoHandler {
}
IceCandidate cand = new
IceCandidate(candidate.getString("candidate"),
candidate.getString("sdpMid"),
candidate.getInt("sdpMLineIndex"));
- user.addCandidate(cand, msg.getString("name"));
+ user.addCandidate(cand, msg.getString("uid"));
break;
default:
break;
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
index 3a1b38e..843e4ea 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
@@ -18,7 +18,6 @@
*/
package org.apache.openmeetings.web.room.sidebar;
-import static org.apache.openmeetings.web.app.Application.getBean;
import static org.apache.openmeetings.web.app.Application.kickUser;
import static
org.apache.openmeetings.web.room.RoomBroadcaster.sendUpdatedClient;
import static
org.apache.openmeetings.web.util.CallbackFunctionHelper.getNamedFunction;
@@ -283,7 +282,7 @@ public class RoomSidebar extends Panel {
}
private ListView<Client> updateUsers() {
-
users.setList(getBean(ClientManager.class).listByRoom(room.getRoom().getId()));
+ users.setList(cm.listByRoom(room.getRoom().getId()));
return users;
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/video-manager.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/video-manager.js
index fd05ab1..35b616c 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/video-manager.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/video-manager.js
@@ -37,13 +37,13 @@ var VideoManager = (function() {
}
}*/
}
- , onicecandidate: v.onIceCandidate.bind(v)
+ , onicecandidate: v.onIceCandidate
}
, function (error) {
if (error) {
return console.error(error);
}
-
this.generateOffer(v.offerToReceiveVideo.bind(v));
+ this.generateOffer(v.offerToReceiveVideo);
}));
}
@@ -54,13 +54,13 @@ var VideoManager = (function() {
v.setPeer(new kurentoUtils.WebRtcPeer.WebRtcPeerRecvonly(
{
remoteVideo: v.video()
- , onicecandidate: v.onIceCandidate.bind(v)
+ , onicecandidate: v.onIceCandidate
}
, function (error) {
if(error) {
return console.error(error);
}
-
this.generateOffer(v.offerToReceiveVideo.bind(v));
+ this.generateOffer(v.offerToReceiveVideo);
}
));
}
diff --git
a/openmeetings-web/src/main/webapp/WEB-INF/classes/logback-config.xml
b/openmeetings-web/src/main/webapp/WEB-INF/classes/logback-config.xml
index cd7cb85..ea11795 100644
--- a/openmeetings-web/src/main/webapp/WEB-INF/classes/logback-config.xml
+++ b/openmeetings-web/src/main/webapp/WEB-INF/classes/logback-config.xml
@@ -36,7 +36,7 @@
</layout>
<rollingPolicy
class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- daily rollover -->
-
<fileNamePattern>log\${current_openmeetings_context_name}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+
<fileNamePattern>${current_openmeetings_log_dir}/${current_openmeetings_context_name}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
<timeBasedFileNamingAndTriggeringPolicy
class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<!-- or whenever the file size reaches 100MB -->
<maxFileSize>50MB</maxFileSize>
--
To stop receiving notification emails like this one, please contact
solo...@apache.org.
