From edb89a65d5a43c5a5bbcea7cfba7fbd7aaadfeba Mon Sep 17 00:00:00 2001 From: hristoterezov Date: Mon, 1 Dec 2014 19:59:51 +0200 Subject: [PATCH] Adds config property for enabling firefox support --- app.js | 4 ++++ config.js | 4 +++- libs/colibri/colibri.focus.js | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app.js b/app.js index 69b38abea..a6df82708 100644 --- a/app.js +++ b/app.js @@ -68,6 +68,10 @@ function init() { if (RTC === null) { window.location.href = 'webrtcrequired.html'; return; + } else if (RTC.browser !== 'chrome' && + config.enableFirefoxSupport !== true) { + window.location.href = 'chromeonly.html'; + return; } obtainAudioAndVideoPermissions(function (stream) { diff --git a/config.js b/config.js index c8a6fbeb6..47f3891c5 100644 --- a/config.js +++ b/config.js @@ -26,5 +26,7 @@ var config = { useBundle: true, enableRecording: false, enableWelcomePage: true, - enableSimulcast: false + enableSimulcast: false, + enableFirefoxSupport: false //firefox support is still experimental, only one-to-one conferences with chrome focus + // will work when simulcast, bundle, mux, lastN and SCTP are disabled. }; diff --git a/libs/colibri/colibri.focus.js b/libs/colibri/colibri.focus.js index f56f42494..310fe3a67 100644 --- a/libs/colibri/colibri.focus.js +++ b/libs/colibri/colibri.focus.js @@ -454,7 +454,7 @@ ColibriFocus.prototype.createdConference = function (result) { 'a=rtcp-fb:100 ccm fir\r\n' + 'a=rtcp-fb:100 nack\r\n' + 'a=rtcp-fb:100 nack pli\r\n' + -// 'a=rtcp-fb:100 goog-remb\r\n' + + (config.enableFirefoxSupport? "" : 'a=rtcp-fb:100 goog-remb\r\n') + 'a=rtpmap:116 red/90000\r\n' + 'a=rtpmap:117 ulpfec/90000\r\n' + (config.useRtcpMux ? 'a=rtcp-mux\r\n' : '') +