瀏覽代碼

fix(config) Ignore enableUnifiedOnChrome flag in config.js, always enable unified-plan.

release-8443
Jaya Allamsetty 2 年之前
父節點
當前提交
6dc9dbfadd
共有 3 個文件被更改,包括 2 次插入12 次删除
  1. 1
    2
      JitsiConference.js
  2. 0
    1
      JitsiMeetJS.ts
  3. 1
    9
      modules/xmpp/JingleSessionPC.js

+ 1
- 2
JitsiConference.js 查看文件

2151
  */
2151
  */
2152
 JitsiConference.prototype._onIncomingCallP2P = function(jingleSession, jingleOffer) {
2152
 JitsiConference.prototype._onIncomingCallP2P = function(jingleSession, jingleOffer) {
2153
     let rejectReason;
2153
     let rejectReason;
2154
-    const usesUnifiedPlan = browser.supportsUnifiedPlan()
2155
-        && (!browser.isChromiumBased() || (this.options.config.enableUnifiedOnChrome ?? true));
2154
+    const usesUnifiedPlan = browser.supportsUnifiedPlan();
2156
     const contentName = jingleOffer.find('>content').attr('name');
2155
     const contentName = jingleOffer.find('>content').attr('name');
2157
     const peerUsesUnifiedPlan = contentName === '0' || contentName === '1';
2156
     const peerUsesUnifiedPlan = contentName === '0' || contentName === '1';
2158
 
2157
 

+ 0
- 1
JitsiMeetJS.ts 查看文件

77
 
77
 
78
 interface IJitsiMeetJSOptions {
78
 interface IJitsiMeetJSOptions {
79
     enableAnalyticsLogging?: boolean;
79
     enableAnalyticsLogging?: boolean;
80
-    enableUnifiedOnChrome?: boolean;
81
     enableWindowOnErrorHandler?: boolean;
80
     enableWindowOnErrorHandler?: boolean;
82
     externalStorage?: Storage;
81
     externalStorage?: Storage;
83
     flags?: {
82
     flags?: {

+ 1
- 9
modules/xmpp/JingleSessionPC.js 查看文件

405
         pcOptions.videoQuality = options.videoQuality;
405
         pcOptions.videoQuality = options.videoQuality;
406
         pcOptions.forceTurnRelay = options.forceTurnRelay;
406
         pcOptions.forceTurnRelay = options.forceTurnRelay;
407
         pcOptions.audioQuality = options.audioQuality;
407
         pcOptions.audioQuality = options.audioQuality;
408
-        pcOptions.usesUnifiedPlan = this.usesUnifiedPlan
409
-            = browser.supportsUnifiedPlan()
410
-                && (!browser.isChromiumBased()
411
-                    || (browser.isChromiumBased()
412
-
413
-                        // Provide a way to control the behavior for jvb and p2p connections independently.
414
-                        && this.isP2P
415
-                        ? options.p2p?.enableUnifiedOnChrome ?? true
416
-                        : options.enableUnifiedOnChrome ?? true));
408
+        pcOptions.usesUnifiedPlan = this.usesUnifiedPlan = browser.supportsUnifiedPlan();
417
 
409
 
418
         if (this.isP2P) {
410
         if (this.isP2P) {
419
             // simulcast needs to be disabled for P2P (121) calls
411
             // simulcast needs to be disabled for P2P (121) calls

Loading…
取消
儲存