浏览代码

ref: disable ICE restart by default (#6594)

* ref: disable ICE restart by default

The reason for that it's currently causing issues with signaling when
Octo is enabled. Also when we do an "ICE restart"(which is not a real
ICE restart), the client maintains the TCC sequence number counter, but
the bridge resets it. The bridge sends media packets with TCC sequence
numbers starting from 0.

The 'enableIceRestart' config option can be used to force it, but it's
not recommended.
master
Paweł Domas 5 年前
父节点
当前提交
f646bc7a7a
没有帐户链接到提交者的电子邮件

+ 1
- 0
conference.js 查看文件

356
         }
356
         }
357
 
357
 
358
         case JitsiConferenceErrors.FOCUS_LEFT:
358
         case JitsiConferenceErrors.FOCUS_LEFT:
359
+        case JitsiConferenceErrors.ICE_FAILED:
359
         case JitsiConferenceErrors.VIDEOBRIDGE_NOT_AVAILABLE:
360
         case JitsiConferenceErrors.VIDEOBRIDGE_NOT_AVAILABLE:
360
         case JitsiConferenceErrors.OFFER_ANSWER_FAILED:
361
         case JitsiConferenceErrors.OFFER_ANSWER_FAILED:
361
             APP.store.dispatch(conferenceWillLeave(room));
362
             APP.store.dispatch(conferenceWillLeave(room));

+ 8
- 0
config.js 查看文件

226
     // disabled, then bandwidth estimations are disabled.
226
     // disabled, then bandwidth estimations are disabled.
227
     // enableRemb: false,
227
     // enableRemb: false,
228
 
228
 
229
+    // Enables ICE restart logic in LJM and displays the page reload overlay on
230
+    // ICE failure. Current disabled by default because it's causing issues with
231
+    // signaling when Octo is enabled. Also when we do an "ICE restart"(which is
232
+    // not a real ICE restart), the client maintains the TCC sequence number
233
+    // counter, but the bridge resets it. The bridge sends media packets with
234
+    // TCC sequence numbers starting from 0.
235
+    // enableIceRestart: false,
236
+
229
     // Defines the minimum number of participants to start a call (the default
237
     // Defines the minimum number of participants to start a call (the default
230
     // is set in Jicofo and set to 2).
238
     // is set in Jicofo and set to 2).
231
     // minParticipants: 2,
239
     // minParticipants: 2,

+ 2
- 2
package-lock.json 查看文件

10794
       }
10794
       }
10795
     },
10795
     },
10796
     "lib-jitsi-meet": {
10796
     "lib-jitsi-meet": {
10797
-      "version": "github:jitsi/lib-jitsi-meet#805eb938ae431cf71d67234fafaa35ae47be6308",
10798
-      "from": "github:jitsi/lib-jitsi-meet#805eb938ae431cf71d67234fafaa35ae47be6308",
10797
+      "version": "github:jitsi/lib-jitsi-meet#46691d8442b2db389170f9e67d8d1b84b164a493",
10798
+      "from": "github:jitsi/lib-jitsi-meet#46691d8442b2db389170f9e67d8d1b84b164a493",
10799
       "requires": {
10799
       "requires": {
10800
         "@jitsi/sdp-interop": "1.0.2",
10800
         "@jitsi/sdp-interop": "1.0.2",
10801
         "@jitsi/sdp-simulcast": "0.3.0",
10801
         "@jitsi/sdp-simulcast": "0.3.0",

+ 1
- 1
package.json 查看文件

56
     "js-utils": "github:jitsi/js-utils#cf11996bd866fdb47326c59a5d3bc24be17282d4",
56
     "js-utils": "github:jitsi/js-utils#cf11996bd866fdb47326c59a5d3bc24be17282d4",
57
     "jsrsasign": "8.0.12",
57
     "jsrsasign": "8.0.12",
58
     "jwt-decode": "2.2.0",
58
     "jwt-decode": "2.2.0",
59
-    "lib-jitsi-meet": "github:jitsi/lib-jitsi-meet#805eb938ae431cf71d67234fafaa35ae47be6308",
59
+    "lib-jitsi-meet": "github:jitsi/lib-jitsi-meet#46691d8442b2db389170f9e67d8d1b84b164a493",
60
     "libflacjs": "github:mmig/libflac.js#93d37e7f811f01cf7d8b6a603e38bd3c3810907d",
60
     "libflacjs": "github:mmig/libflac.js#93d37e7f811f01cf7d8b6a603e38bd3c3810907d",
61
     "lodash": "4.17.13",
61
     "lodash": "4.17.13",
62
     "moment": "2.19.4",
62
     "moment": "2.19.4",

+ 1
- 0
react/features/base/config/configWhitelist.js 查看文件

101
     'e2eping',
101
     'e2eping',
102
     'enableDisplayNameInStats',
102
     'enableDisplayNameInStats',
103
     'enableEmailInStats',
103
     'enableEmailInStats',
104
+    'enableIceRestart',
104
     'enableLayerSuspension',
105
     'enableLayerSuspension',
105
     'enableLipSync',
106
     'enableLipSync',
106
     'enableRemb',
107
     'enableRemb',

+ 1
- 0
react/features/base/lib-jitsi-meet/functions.any.js 查看文件

64
     return (
64
     return (
65
         error === JitsiConferenceErrors.FOCUS_DISCONNECTED
65
         error === JitsiConferenceErrors.FOCUS_DISCONNECTED
66
             || error === JitsiConferenceErrors.FOCUS_LEFT
66
             || error === JitsiConferenceErrors.FOCUS_LEFT
67
+            || error === JitsiConferenceErrors.ICE_FAILED
67
             || error === JitsiConferenceErrors.OFFER_ANSWER_FAILED
68
             || error === JitsiConferenceErrors.OFFER_ANSWER_FAILED
68
             || error === JitsiConferenceErrors.VIDEOBRIDGE_NOT_AVAILABLE);
69
             || error === JitsiConferenceErrors.VIDEOBRIDGE_NOT_AVAILABLE);
69
 }
70
 }

+ 1
- 1
react/features/overlay/components/AbstractPageReloadOverlay.js 查看文件

286
         details: fatalError && fatalError.details,
286
         details: fatalError && fatalError.details,
287
         isNetworkFailure:
287
         isNetworkFailure:
288
             fatalError === configError || fatalError === connectionError,
288
             fatalError === configError || fatalError === connectionError,
289
-        reason: fatalError && fatalError.message
289
+        reason: fatalError && (fatalError.message || fatalError.name)
290
     };
290
     };
291
 }
291
 }

正在加载...
取消
保存