Browse Source

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

release-8443
Hristo Terezov 6 years ago
parent
commit
b7e4980561
3 changed files with 7 additions and 23 deletions
  1. 0
    3
      JitsiTrackError.js
  2. 0
    6
      JitsiTrackErrors.js
  3. 7
    14
      modules/RTC/RTC.js

+ 0
- 3
JitsiTrackError.js View File

30
     = 'Track has been already disposed';
30
     = 'Track has been already disposed';
31
 TRACK_ERROR_TO_MESSAGE_MAP[JitsiTrackErrors.TRACK_NO_STREAM_FOUND]
31
 TRACK_ERROR_TO_MESSAGE_MAP[JitsiTrackErrors.TRACK_NO_STREAM_FOUND]
32
     = 'Track does not have an associated Media Stream';
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
 // FIXME: Using prototype inheritance because otherwise instanceof is not
34
 // FIXME: Using prototype inheritance because otherwise instanceof is not
38
 // working properly (see https://github.com/babel/babel/issues/3083)
35
 // working properly (see https://github.com/babel/babel/issues/3083)

+ 0
- 6
JitsiTrackErrors.js View File

90
  * by a webcam.
90
  * by a webcam.
91
  */
91
  */
92
 export const UNSUPPORTED_RESOLUTION = 'gum.unsupported_resolution';
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 View File

6
 import GlobalOnErrorHandler from '../util/GlobalOnErrorHandler';
6
 import GlobalOnErrorHandler from '../util/GlobalOnErrorHandler';
7
 import * as JitsiConferenceEvents from '../../JitsiConferenceEvents';
7
 import * as JitsiConferenceEvents from '../../JitsiConferenceEvents';
8
 import JitsiLocalTrack from './JitsiLocalTrack';
8
 import JitsiLocalTrack from './JitsiLocalTrack';
9
-import JitsiTrackError from '../../JitsiTrackError';
10
-import * as JitsiTrackErrors from '../../JitsiTrackErrors';
11
 import Listenable from '../util/Listenable';
9
 import Listenable from '../util/Listenable';
12
 import { safeCounterIncrement } from '../util/MathUtil';
10
 import { safeCounterIncrement } from '../util/MathUtil';
13
 import * as MediaType from '../../service/RTC/MediaType';
11
 import * as MediaType from '../../service/RTC/MediaType';
263
             ? RTCUtils.newObtainAudioAndVideoPermissions(options)
261
             ? RTCUtils.newObtainAudioAndVideoPermissions(options)
264
             : RTCUtils.obtainAudioAndVideoPermissions(options);
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
     /**

Loading…
Cancel
Save