Bladeren bron

fix(RTC) unconditionally use adapter

It does no harm on RN, since it doesn't detect it as a supported browser
and bails out.
dev1
Saúl Ibarra Corretgé 2 jaren geleden
bovenliggende
commit
b7eea55020

+ 1
- 7
modules/RTC/RTCUtils.js Bestand weergeven

@@ -1,6 +1,7 @@
1 1
 import { getLogger } from '@jitsi/logger';
2 2
 import EventEmitter from 'events';
3 3
 import clonedeep from 'lodash.clonedeep';
4
+import 'webrtc-adapter';
4 5
 
5 6
 import JitsiTrackError from '../../JitsiTrackError';
6 7
 import * as JitsiTrackErrors from '../../JitsiTrackErrors';
@@ -19,13 +20,6 @@ import screenObtainer from './ScreenObtainer';
19 20
 
20 21
 const logger = getLogger(__filename);
21 22
 
22
-// Require adapter only for certain browsers. This is being done for
23
-// react-native, which has its own shims, and while browsers are being migrated
24
-// over to use adapter's shims.
25
-if (browser.usesAdapter()) {
26
-    require('webrtc-adapter');
27
-}
28
-
29 23
 const eventEmitter = new EventEmitter();
30 24
 
31 25
 const AVAILABLE_DEVICES_POLL_INTERVAL_TIME = 3000; // ms

+ 0
- 9
modules/browser/BrowserCapabilities.js Bestand weergeven

@@ -250,15 +250,6 @@ export default class BrowserCapabilities extends BrowserDetection {
250 250
         return this.isChromiumBased() || this.isReactNative() || this.isWebKitBased();
251 251
     }
252 252
 
253
-    /**
254
-     * Checks if the browser uses webrtc-adapter. All browsers except React Native do.
255
-     *
256
-     * @returns {boolean}
257
-     */
258
-    usesAdapter() {
259
-        return !this.isReactNative();
260
-    }
261
-
262 253
     /**
263 254
      * Checks if the browser uses RIDs/MIDs for siganling the simulcast streams
264 255
      * to the bridge instead of the ssrcs.

+ 0
- 6
types/auto/modules/browser/BrowserCapabilities.d.ts Bestand weergeven

@@ -123,12 +123,6 @@ export default class BrowserCapabilities {
123 123
      * @returns {boolean}
124 124
      */
125 125
     usesSdpMungingForSimulcast(): boolean;
126
-    /**
127
-     * Checks if the browser uses webrtc-adapter. All browsers except React Native do.
128
-     *
129
-     * @returns {boolean}
130
-     */
131
-    usesAdapter(): boolean;
132 126
     /**
133 127
      * Checks if the browser uses RIDs/MIDs for siganling the simulcast streams
134 128
      * to the bridge instead of the ssrcs.

Laden…
Annuleren
Opslaan