[Pkg-voip-commits] [janus] 49/163: Honor trickle configuration when using ext. stream

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to annotated tag debian/0.2.5-1
in repository janus.

commit fd956977a8f74d1e5e895734c3d3ef5cfea07753
Author: Simon Eisenmann <s.eisenmann at kopano.com>
Date:   Mon Jul 31 14:52:23 2017 +0200

    Honor trickle configuration when using ext. stream
---
 html/janus.js          | 2 +-
 html/janus.nojquery.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/html/janus.js b/html/janus.js
index 0e0fc13..fdb3673 100644
--- a/html/janus.js
+++ b/html/janus.js
@@ -1374,6 +1374,7 @@ function Janus(gatewayCallbacks) {
 			}
 			return;
 		}
+		config.trickle = isTrickleEnabled(callbacks.trickle);
 		// Was a MediaStream object passed, or do we need to take care of that?
 		if(callbacks.stream !== null && callbacks.stream !== undefined) {
 			var stream = callbacks.stream;
@@ -1384,7 +1385,6 @@ function Janus(gatewayCallbacks) {
 			streamsDone(handleId, jsep, media, callbacks, stream);
 			return;
 		}
-		config.trickle = isTrickleEnabled(callbacks.trickle);
 		if(isAudioSendEnabled(media) || isVideoSendEnabled(media)) {
 			var constraints = { mandatory: {}, optional: []};
 			pluginHandle.consentDialog(true);
diff --git a/html/janus.nojquery.js b/html/janus.nojquery.js
index 7988197..789c932 100644
--- a/html/janus.nojquery.js
+++ b/html/janus.nojquery.js
@@ -1425,6 +1425,7 @@ function Janus(gatewayCallbacks) {
 			}
 			return;
 		}
+		config.trickle = isTrickleEnabled(callbacks.trickle);
 		// Was a MediaStream object passed, or do we need to take care of that?
 		if(callbacks.stream !== null && callbacks.stream !== undefined) {
 			var stream = callbacks.stream;
@@ -1435,7 +1436,6 @@ function Janus(gatewayCallbacks) {
 			streamsDone(handleId, jsep, media, callbacks, stream);
 			return;
 		}
-		config.trickle = isTrickleEnabled(callbacks.trickle);
 		if(isAudioSendEnabled(media) || isVideoSendEnabled(media)) {
 			var constraints = { mandatory: {}, optional: []};
 			pluginHandle.consentDialog(true);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/janus.git