Procházet zdrojové kódy

fix(GUM): Don't fail when a track is muted.

release-8443
Hristo Terezov před 6 roky
rodič
revize
b7e4980561
3 změnil soubory, kde provedl 7 přidání a 23 odebrání
  1. 0
    3
      JitsiTrackError.js
  2. 0
    6
      JitsiTrackErrors.js
  3. 7
    14
      modules/RTC/RTC.js

+ 0
- 3
JitsiTrackError.js Zobrazit soubor

@@ -30,9 +30,6 @@ TRACK_ERROR_TO_MESSAGE_MAP[JitsiTrackErrors.TRACK_IS_DISPOSED]
30 30
     = 'Track has been already disposed';
31 31
 TRACK_ERROR_TO_MESSAGE_MAP[JitsiTrackErrors.TRACK_NO_STREAM_FOUND]
32 32
     = 'Track does not have an associated Media Stream';
33
-TRACK_ERROR_TO_MESSAGE_MAP[JitsiTrackErrors.NO_DATA_FROM_SOURCE]
34
-    = 'The track has stopped receiving data from it\'s source';
35
-
36 33
 
37 34
 // FIXME: Using prototype inheritance because otherwise instanceof is not
38 35
 // working properly (see https://github.com/babel/babel/issues/3083)

+ 0
- 6
JitsiTrackErrors.js Zobrazit soubor

@@ -90,9 +90,3 @@ export const TRACK_NO_STREAM_FOUND = 'track.no_stream_found';
90 90
  * by a webcam.
91 91
  */
92 92
 export const UNSUPPORTED_RESOLUTION = 'gum.unsupported_resolution';
93
-
94
-/**
95
- * Indicates that the track is no receiving any data without reason(the
96
- * stream was stopped, etc)
97
- */
98
-export const NO_DATA_FROM_SOURCE = 'track.no_data_from_source';

+ 7
- 14
modules/RTC/RTC.js Zobrazit soubor

@@ -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
     /**

Načítá se…
Zrušit
Uložit