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.)
This commit is contained in:
parent
f8b7d048b0
commit
b0c81985d4
|
@ -26,8 +26,6 @@ var config = {
|
||||||
channelLastN: -1, // The default value of the channel attribute last-n.
|
channelLastN: -1, // The default value of the channel attribute last-n.
|
||||||
adaptiveLastN: false,
|
adaptiveLastN: false,
|
||||||
adaptiveSimulcast: false,
|
adaptiveSimulcast: false,
|
||||||
useRtcpMux: true, // required for FF support
|
|
||||||
useBundle: true, // required for FF support
|
|
||||||
enableRecording: false,
|
enableRecording: false,
|
||||||
enableWelcomePage: true,
|
enableWelcomePage: true,
|
||||||
enableSimulcast: false, // blocks FF support
|
enableSimulcast: false, // blocks FF support
|
||||||
|
|
|
@ -146,7 +146,7 @@ function RTCUtils(RTCService, onTemasysPluginReady)
|
||||||
this.service = RTCService;
|
this.service = RTCService;
|
||||||
if (RTCBrowserType.isFirefox()) {
|
if (RTCBrowserType.isFirefox()) {
|
||||||
var FFversion = RTCBrowserType.getFirefoxVersion();
|
var FFversion = RTCBrowserType.getFirefoxVersion();
|
||||||
if (FFversion >= 40 && config.useBundle && config.useRtcpMux) {
|
if (FFversion >= 40) {
|
||||||
this.peerconnection = mozRTCPeerConnection;
|
this.peerconnection = mozRTCPeerConnection;
|
||||||
this.getUserMedia = navigator.mozGetUserMedia.bind(navigator);
|
this.getUserMedia = navigator.mozGetUserMedia.bind(navigator);
|
||||||
this.pc_constraints = {};
|
this.pc_constraints = {};
|
||||||
|
@ -188,9 +188,7 @@ function RTCUtils(RTCService, onTemasysPluginReady)
|
||||||
RTCIceCandidate = mozRTCIceCandidate;
|
RTCIceCandidate = mozRTCIceCandidate;
|
||||||
} else {
|
} else {
|
||||||
console.error(
|
console.error(
|
||||||
"Firefox requirements not met, ver: " + FFversion +
|
"Firefox version too old: " + FFversion + ". Required >= 40.");
|
||||||
", bundle: " + config.useBundle +
|
|
||||||
", rtcp-mux: " + config.useRtcpMux);
|
|
||||||
window.location.href = 'unsupported_browser.html';
|
window.location.href = 'unsupported_browser.html';
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
@ -27,9 +27,7 @@ var CallStats = {
|
||||||
this.userID,
|
this.userID,
|
||||||
initCallback);
|
initCallback);
|
||||||
|
|
||||||
var usage = callStats.fabricUsage.unbundled;
|
var usage = callStats.fabricUsage.multiplex;
|
||||||
if(config.useBundle)
|
|
||||||
usage = callStats.fabricUsage.multiplex;
|
|
||||||
|
|
||||||
callStats.addNewFabric(this.peerconnection,
|
callStats.addNewFabric(this.peerconnection,
|
||||||
Strophe.getResourceFromJid(jingleSession.peerjid),
|
Strophe.getResourceFromJid(jingleSession.peerjid),
|
||||||
|
|
|
@ -55,15 +55,13 @@ module.exports = function(XMPP, eventEmitter)
|
||||||
this.connection.disco.addFeature('urn:ietf:rfc:4588');
|
this.connection.disco.addFeature('urn:ietf:rfc:4588');
|
||||||
}
|
}
|
||||||
|
|
||||||
// this is dealt with by SDP O/A so we don't need to annouce this
|
// this is dealt with by SDP O/A so we don't need to announce this
|
||||||
//this.connection.disco.addFeature('urn:xmpp:jingle:apps:rtp:rtcp-fb:0'); // XEP-0293
|
//this.connection.disco.addFeature('urn:xmpp:jingle:apps:rtp:rtcp-fb:0'); // XEP-0293
|
||||||
//this.connection.disco.addFeature('urn:xmpp:jingle:apps:rtp:rtp-hdrext:0'); // XEP-0294
|
//this.connection.disco.addFeature('urn:xmpp:jingle:apps:rtp:rtp-hdrext:0'); // XEP-0294
|
||||||
if (config.useRtcpMux) {
|
|
||||||
this.connection.disco.addFeature('urn:ietf:rfc:5761'); // rtcp-mux
|
this.connection.disco.addFeature('urn:ietf:rfc:5761'); // rtcp-mux
|
||||||
}
|
this.connection.disco.addFeature('urn:ietf:rfc:5888'); // a=group, e.g. bundle
|
||||||
if (config.useBundle) {
|
|
||||||
this.connection.disco.addFeature('urn:ietf:rfc:5888'); // a=group, e.g. bundle
|
|
||||||
}
|
|
||||||
//this.connection.disco.addFeature('urn:ietf:rfc:5576'); // a=ssrc
|
//this.connection.disco.addFeature('urn:ietf:rfc:5576'); // a=ssrc
|
||||||
}
|
}
|
||||||
this.connection.addHandler(this.onJingle.bind(this), 'urn:xmpp:jingle:1', 'iq', 'set', null, null);
|
this.connection.addHandler(this.onJingle.bind(this), 'urn:xmpp:jingle:1', 'iq', 'set', null, null);
|
||||||
|
|
Loading…
Reference in New Issue