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 2018/10/05 01:21:34 UTC
[openmeetings] branch master updated: [OPENMEETINGS-1649] turn
server seems to work
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 7ea2dbf [OPENMEETINGS-1649] turn server seems to work
7ea2dbf is described below
commit 7ea2dbfaccc326fa6d8c95e202a152a39a9c3582
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Fri Oct 5 08:21:17 2018 +0700
[OPENMEETINGS-1649] turn server seems to work
---
.../openmeetings/core/remote/KurentoHandler.java | 6 +++
.../apache/openmeetings/web/room/raw-settings.js | 56 ++++++++++++----------
2 files changed, 38 insertions(+), 24 deletions(-)
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 9d8eeda..6e52c7b 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
@@ -236,6 +236,12 @@ public class KurentoHandler {
}
}
break;
+ case "wannaPlay":
+ WebSocketHelper.sendClient(_c, newTestKurentoMsg()
+ .put("id", "canPlay")
+ .put("configuration", new JSONObject().put("iceServers", getTurnServers(true)))
+ );
+ break;
case "play":
user.play(_c, msg, createTestPipeline());
break;
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-settings.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-settings.js
index fa51418..4292a20 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-settings.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-settings.js
@@ -167,30 +167,9 @@ var VideoSettings = (function() {
.click(function() {
recBtn.prop('disabled', true).button('refresh');
_setEnabled(true);
- _clear();
- rtcPeer = new kurentoUtils.WebRtcPeer.WebRtcPeerRecvonly(
- {
- remoteVideo: vid[0]
- , mediaConstraints: {
- audio: true
- , video: true
- }
- , onicecandidate: _onIceCandidate
- }
- , function(error) {
- if (error) {
- return OmUtil.error(error);
- }
- rtcPeer.generateOffer(function(error, offerSdp) {
- if (error) {
- return OmUtil.error('Error generating the offer');
- }
- OmUtil.sendMessage({
- id : 'play'
- , sdpOffer: offerSdp
- }, MsgBase);
- });
- });
+ OmUtil.sendMessage({
+ id : 'wannaPlay'
+ }, MsgBase);
});
vs.dialog({
classes: {
@@ -441,6 +420,35 @@ var VideoSettings = (function() {
rtcPeer.on('icecandidate', _onIceCandidate);
});
break;
+ case 'canPlay':
+ {
+ const options = {
+ remoteVideo: vid[0]
+ , mediaConstraints: {audio: true, video: true}
+ , onicecandidate: _onIceCandidate
+ };
+ if (m && m.configuration) {
+ options.configuration = m.configuration;
+ }
+ _clear();
+ rtcPeer = new kurentoUtils.WebRtcPeer.WebRtcPeerRecvonly(
+ options
+ , function(error) {
+ if (error) {
+ return OmUtil.error(error);
+ }
+ rtcPeer.generateOffer(function(error, offerSdp) {
+ if (error) {
+ return OmUtil.error('Error generating the offer');
+ }
+ OmUtil.sendMessage({
+ id : 'play'
+ , sdpOffer: offerSdp
+ }, MsgBase);
+ });
+ });
+ }
+ break;
case 'playResponse':
case 'startResponse':
OmUtil.log('SDP answer received from server. Processing ...');