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 2019/12/26 09:28:49 UTC
[openmeetings] branch master updated: [OPENMEETINGS-2151]
kurento-utils are updated
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 65dc06f [OPENMEETINGS-2151] kurento-utils are updated
65dc06f is described below
commit 65dc06fb8cc580dec402c7dfc7a99b641d0254c9
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Thu Dec 26 16:28:34 2019 +0700
[OPENMEETINGS-2151] kurento-utils are updated
---
.../apache/openmeetings/web/room/kurento-utils.js | 26 +++++++++-------------
1 file changed, 10 insertions(+), 16 deletions(-)
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/kurento-utils.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/kurento-utils.js
index 11a607f..4820987 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/kurento-utils.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/kurento-utils.js
@@ -302,24 +302,18 @@ function WebRtcPeer(mode, options, callback) {
};
this.generateOffer = function (callback) {
callback = callback.bind(this);
- var offerAudio = true;
- var offerVideo = true;
+ var useAudio = true;
+ var useVideo = true;
if (mediaConstraints) {
- offerAudio = typeof mediaConstraints.audio === 'boolean' ? mediaConstraints.audio : true;
- offerVideo = typeof mediaConstraints.video === 'boolean' ? mediaConstraints.video : true;
+ useAudio = typeof mediaConstraints.audio === 'boolean' ? mediaConstraints.audio : true;
+ useVideo = typeof mediaConstraints.video === 'boolean' ? mediaConstraints.video : true;
}
- var browserDependantConstraints = {
- offerToReceiveAudio: mode !== 'sendonly' && offerAudio,
- offerToReceiveVideo: mode !== 'sendonly' && offerVideo
- };
- if (mode === 'recvonly' && pc.addTransceiver && browserDependantConstraints.offerToReceiveAudio) {
- pc.addTransceiver('audio');
+ if (useAudio) {
+ pc.addTransceiver('audio', { direction: mode });
}
- if (mode === 'recvonly' && pc.addTransceiver && browserDependantConstraints.offerToReceiveVideo) {
- pc.addTransceiver('video');
+ if (useVideo) {
+ pc.addTransceiver('video', { direction: mode });
}
- var constraints = browserDependantConstraints;
- logger.debug('constraints: ' + JSON.stringify(constraints));
if (typeof AdapterJS !== 'undefined' && AdapterJS.webrtcDetectedBrowser === 'IE' && AdapterJS.webrtcDetectedVersion >= 9) {
var setLocalDescriptionOnSuccess = function () {
sleep(1000);
@@ -336,9 +330,9 @@ function WebRtcPeer(mode, options, callback) {
logger.debug('Local description set', pc.localDescription);
pc.setLocalDescription(offer, setLocalDescriptionOnSuccess, callback);
};
- pc.createOffer(createOfferOnSuccess, callback, constraints);
+ pc.createOffer(createOfferOnSuccess, callback);
} else {
- pc.createOffer(constraints).then(function (offer) {
+ pc.createOffer().then(function (offer) {
logger.debug('Created SDP offer');
offer = mangleSdpToAddSimulcast(offer);
return pc.setLocalDescription(offer);