[Pkg-voip-commits] [janus] 146/163: Use supplied WebRTC adapter throughout file

[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 c4db28288bcc626e201cb3bd7f92dd2f7f900d1e
Author: Örjan Fors <o at 42mm.org>
Date:   Fri Oct 20 16:55:26 2017 +0200

    Use supplied WebRTC adapter throughout file
---
 html/janus.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/html/janus.js b/html/janus.js
index db724ab..0e8c5b2 100644
--- a/html/janus.js
+++ b/html/janus.js
@@ -854,8 +854,8 @@ function Janus(gatewayCallbacks) {
 		if(apisecret !== null && apisecret !== undefined)
 			request["apisecret"] = apisecret;
 		// If we know the browser supports BUNDLE and/or rtcp-mux, let's advertise those right away
-		if(adapter.browserDetails.browser == "chrome" || adapter.browserDetails.browser == "firefox" ||
-				adapter.browserDetails.browser == "safari") {
+		if(Janus.webRTCAdapter.browserDetails.browser == "chrome" || Janus.webRTCAdapter.browserDetails.browser == "firefox" ||
+				Janus.webRTCAdapter.browserDetails.browser == "safari") {
 			request["force-bundle"] = true;
 			request["force-rtcp-mux"] = true;
 		}
@@ -1812,7 +1812,7 @@ function Janus(gatewayCallbacks) {
 		Janus.debug(mediaConstraints);
 		// Check if this is Firefox and we've been asked to do simulcasting
 		var sendVideo = isVideoSendEnabled(media);
-		if(sendVideo && simulcast && adapter.browserDetails.browser === "firefox") {
+		if(sendVideo && simulcast && Janus.webRTCAdapter.browserDetails.browser === "firefox") {
 			// FIXME Based on https://gist.github.com/voluntas/088bc3cc62094730647b
 			Janus.log("Enabling Simulcasting for Firefox (RID)");
 			var sender = config.pc.getSenders()[1];
@@ -1832,10 +1832,10 @@ function Janus(gatewayCallbacks) {
 					Janus.log("Setting local description");
 					if(sendVideo && simulcast) {
 						// This SDP munging only works with Chrome
-						if(adapter.browserDetails.browser === "chrome") {
+						if(Janus.webRTCAdapter.browserDetails.browser === "chrome") {
 							Janus.log("Enabling Simulcasting for Chrome (SDP munging)");
 							offer.sdp = mungeSdpForSimulcasting(offer.sdp);
-						} else if(adapter.browserDetails.browser !== "firefox") {
+						} else if(Janus.webRTCAdapter.browserDetails.browser !== "firefox") {
 							Janus.warn("simulcast=true, but this is not Chrome nor Firefox, ignoring");
 						}
 					}
@@ -1899,7 +1899,7 @@ function Janus(gatewayCallbacks) {
 		Janus.debug(mediaConstraints);
 		// Check if this is Firefox and we've been asked to do simulcasting
 		var sendVideo = isVideoSendEnabled(media);
-		if(sendVideo && simulcast && adapter.browserDetails.browser === "firefox") {
+		if(sendVideo && simulcast && Janus.webRTCAdapter.browserDetails.browser === "firefox") {
 			// FIXME Based on https://gist.github.com/voluntas/088bc3cc62094730647b
 			Janus.log("Enabling Simulcasting for Firefox (RID)");
 			var sender = config.pc.getSenders()[1];
@@ -1919,12 +1919,12 @@ function Janus(gatewayCallbacks) {
 					Janus.log("Setting local description");
 					if(sendVideo && simulcast) {
 						// This SDP munging only works with Chrome
-						if(adapter.browserDetails.browser === "chrome") {
+						if(Janus.webRTCAdapter.browserDetails.browser === "chrome") {
 							// FIXME Apparently trying to simulcast when answering breaks video in Chrome...
 							//~ Janus.log("Enabling Simulcasting for Chrome (SDP munging)");
 							//~ answer.sdp = mungeSdpForSimulcasting(answer.sdp);
 							Janus.warn("simulcast=true, but this is an answer, and video breaks in Chrome if we enable it");
-						} else if(adapter.browserDetails.browser !== "firefox") {
+						} else if(Janus.webRTCAdapter.browserDetails.browser !== "firefox") {
 							Janus.warn("simulcast=true, but this is not Chrome nor Firefox, ignoring");
 						}
 					}
@@ -2137,7 +2137,7 @@ function Janus(gatewayCallbacks) {
 									} else {
 										// Calculate bitrate
 										var timePassed = config.bitrate.tsnow - config.bitrate.tsbefore;
-										if(adapter.browserDetails.browser == "safari")
+										if(Janus.webRTCAdapter.browserDetails.browser == "safari")
 											timePassed = timePassed/1000;	// Apparently the timestamp is in microseconds, in Safari
 										var bitRate = Math.round((config.bitrate.bsnow - config.bitrate.bsbefore) * 8 / timePassed);
 										config.bitrate.value = bitRate + ' kbits/sec';

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