|
@@ -6,8 +6,6 @@ import BridgeChannel from './BridgeChannel';
|
6
|
6
|
import GlobalOnErrorHandler from '../util/GlobalOnErrorHandler';
|
7
|
7
|
import * as JitsiConferenceEvents from '../../JitsiConferenceEvents';
|
8
|
8
|
import JitsiLocalTrack from './JitsiLocalTrack';
|
9
|
|
-import JitsiTrackError from '../../JitsiTrackError';
|
10
|
|
-import * as JitsiTrackErrors from '../../JitsiTrackErrors';
|
11
|
9
|
import Listenable from '../util/Listenable';
|
12
|
10
|
import { safeCounterIncrement } from '../util/MathUtil';
|
13
|
11
|
import * as MediaType from '../../service/RTC/MediaType';
|
|
@@ -263,18 +261,13 @@ export default class RTC extends Listenable {
|
263
|
261
|
? RTCUtils.newObtainAudioAndVideoPermissions(options)
|
264
|
262
|
: RTCUtils.obtainAudioAndVideoPermissions(options);
|
265
|
263
|
|
266
|
|
- return obtainMediaPromise.then(
|
267
|
|
- tracksInfo => {
|
268
|
|
- const tracks = usesNewGumFlow
|
269
|
|
- ? _newCreateLocalTracks(tracksInfo)
|
270
|
|
- : createLocalTracks(tracksInfo, options);
|
271
|
|
-
|
272
|
|
- return tracks.some(track => !track._isReceivingData())
|
273
|
|
- ? Promise.reject(
|
274
|
|
- new JitsiTrackError(
|
275
|
|
- JitsiTrackErrors.NO_DATA_FROM_SOURCE))
|
276
|
|
- : tracks;
|
277
|
|
- });
|
|
264
|
+ return obtainMediaPromise.then(tracksInfo => {
|
|
265
|
+ if (usesNewGumFlow) {
|
|
266
|
+ return _newCreateLocalTracks(tracksInfo);
|
|
267
|
+ }
|
|
268
|
+
|
|
269
|
+ return createLocalTracks(tracksInfo, options);
|
|
270
|
+ });
|
278
|
271
|
}
|
279
|
272
|
|
280
|
273
|
/**
|