Browse Source

Adds config property for enabling firefox support

master
hristoterezov 10 years ago
parent
commit
edb89a65d5
3 changed files with 8 additions and 2 deletions
  1. 4
    0
      app.js
  2. 3
    1
      config.js
  3. 1
    1
      libs/colibri/colibri.focus.js

+ 4
- 0
app.js View File

@@ -68,6 +68,10 @@ function init() {
68 68
     if (RTC === null) {
69 69
         window.location.href = 'webrtcrequired.html';
70 70
         return;
71
+    } else if (RTC.browser !== 'chrome' &&
72
+        config.enableFirefoxSupport !== true) {
73
+        window.location.href = 'chromeonly.html';
74
+        return;
71 75
     }
72 76
 
73 77
     obtainAudioAndVideoPermissions(function (stream) {

+ 3
- 1
config.js View File

@@ -26,5 +26,7 @@ var config = {
26 26
     useBundle: true,
27 27
     enableRecording: false,
28 28
     enableWelcomePage: true,
29
-    enableSimulcast: false
29
+    enableSimulcast: false,
30
+    enableFirefoxSupport: false //firefox support is still experimental, only one-to-one conferences with chrome focus
31
+    // will work when simulcast, bundle, mux, lastN and SCTP are disabled.
30 32
 };

+ 1
- 1
libs/colibri/colibri.focus.js View File

@@ -454,7 +454,7 @@ ColibriFocus.prototype.createdConference = function (result) {
454 454
         'a=rtcp-fb:100 ccm fir\r\n' +
455 455
         'a=rtcp-fb:100 nack\r\n' +
456 456
         'a=rtcp-fb:100 nack pli\r\n' +
457
-//        'a=rtcp-fb:100 goog-remb\r\n' +
457
+            (config.enableFirefoxSupport? "" : 'a=rtcp-fb:100 goog-remb\r\n') +
458 458
         'a=rtpmap:116 red/90000\r\n' +
459 459
         'a=rtpmap:117 ulpfec/90000\r\n' +
460 460
         (config.useRtcpMux ? 'a=rtcp-mux\r\n' : '') +

Loading…
Cancel
Save