浏览代码

Removes the useBundle and useRtcpMux options from config.js. These are

now fully supported by jitsi-videobridge and all browsers which we
support (and if we need to enable them conditionally because of browser
compatibility in the future, we should do it based on run-time browser
detection.)
j8
Boris Grozev 9 年前
父节点
当前提交
b0c81985d4
共有 4 个文件被更改,包括 8 次插入16 次删除
  1. 0
    2
      config.js
  2. 2
    4
      modules/RTC/RTCUtils.js
  3. 1
    3
      modules/statistics/CallStats.js
  4. 5
    7
      modules/xmpp/strophe.jingle.js

+ 0
- 2
config.js 查看文件

26
     channelLastN: -1, // The default value of the channel attribute last-n.
26
     channelLastN: -1, // The default value of the channel attribute last-n.
27
     adaptiveLastN: false,
27
     adaptiveLastN: false,
28
     adaptiveSimulcast: false,
28
     adaptiveSimulcast: false,
29
-    useRtcpMux: true, // required for FF support
30
-    useBundle: true, // required for FF support
31
     enableRecording: false,
29
     enableRecording: false,
32
     enableWelcomePage: true,
30
     enableWelcomePage: true,
33
     enableSimulcast: false, // blocks FF support
31
     enableSimulcast: false, // blocks FF support

+ 2
- 4
modules/RTC/RTCUtils.js 查看文件

146
     this.service = RTCService;
146
     this.service = RTCService;
147
     if (RTCBrowserType.isFirefox()) {
147
     if (RTCBrowserType.isFirefox()) {
148
         var FFversion = RTCBrowserType.getFirefoxVersion();
148
         var FFversion = RTCBrowserType.getFirefoxVersion();
149
-        if (FFversion >= 40 && config.useBundle && config.useRtcpMux) {
149
+        if (FFversion >= 40) {
150
             this.peerconnection = mozRTCPeerConnection;
150
             this.peerconnection = mozRTCPeerConnection;
151
             this.getUserMedia = navigator.mozGetUserMedia.bind(navigator);
151
             this.getUserMedia = navigator.mozGetUserMedia.bind(navigator);
152
             this.pc_constraints = {};
152
             this.pc_constraints = {};
188
             RTCIceCandidate = mozRTCIceCandidate;
188
             RTCIceCandidate = mozRTCIceCandidate;
189
         } else {
189
         } else {
190
             console.error(
190
             console.error(
191
-                "Firefox requirements not met, ver: " + FFversion +
192
-                ", bundle: " + config.useBundle +
193
-                ", rtcp-mux: " + config.useRtcpMux);
191
+                "Firefox version too old: " + FFversion + ". Required >= 40.");
194
             window.location.href = 'unsupported_browser.html';
192
             window.location.href = 'unsupported_browser.html';
195
             return;
193
             return;
196
         }
194
         }

+ 1
- 3
modules/statistics/CallStats.js 查看文件

27
             this.userID,
27
             this.userID,
28
             initCallback);
28
             initCallback);
29
 
29
 
30
-        var usage = callStats.fabricUsage.unbundled;
31
-        if(config.useBundle)
32
-            usage = callStats.fabricUsage.multiplex;
30
+        var usage = callStats.fabricUsage.multiplex;
33
 
31
 
34
         callStats.addNewFabric(this.peerconnection,
32
         callStats.addNewFabric(this.peerconnection,
35
             Strophe.getResourceFromJid(jingleSession.peerjid),
33
             Strophe.getResourceFromJid(jingleSession.peerjid),

+ 5
- 7
modules/xmpp/strophe.jingle.js 查看文件

55
                     this.connection.disco.addFeature('urn:ietf:rfc:4588');
55
                     this.connection.disco.addFeature('urn:ietf:rfc:4588');
56
                 }
56
                 }
57
 
57
 
58
-                // this is dealt with by SDP O/A so we don't need to annouce this
58
+                // this is dealt with by SDP O/A so we don't need to announce this
59
                 //this.connection.disco.addFeature('urn:xmpp:jingle:apps:rtp:rtcp-fb:0'); // XEP-0293
59
                 //this.connection.disco.addFeature('urn:xmpp:jingle:apps:rtp:rtcp-fb:0'); // XEP-0293
60
                 //this.connection.disco.addFeature('urn:xmpp:jingle:apps:rtp:rtp-hdrext:0'); // XEP-0294
60
                 //this.connection.disco.addFeature('urn:xmpp:jingle:apps:rtp:rtp-hdrext:0'); // XEP-0294
61
-                if (config.useRtcpMux) {
62
-                    this.connection.disco.addFeature('urn:ietf:rfc:5761'); // rtcp-mux
63
-                }
64
-                if (config.useBundle) {
65
-                    this.connection.disco.addFeature('urn:ietf:rfc:5888'); // a=group, e.g. bundle
66
-                }
61
+
62
+                this.connection.disco.addFeature('urn:ietf:rfc:5761'); // rtcp-mux
63
+                this.connection.disco.addFeature('urn:ietf:rfc:5888'); // a=group, e.g. bundle
64
+
67
                 //this.connection.disco.addFeature('urn:ietf:rfc:5576'); // a=ssrc
65
                 //this.connection.disco.addFeature('urn:ietf:rfc:5576'); // a=ssrc
68
             }
66
             }
69
             this.connection.addHandler(this.onJingle.bind(this), 'urn:xmpp:jingle:1', 'iq', 'set', null, null);
67
             this.connection.addHandler(this.onJingle.bind(this), 'urn:xmpp:jingle:1', 'iq', 'set', null, null);

正在加载...
取消
保存