Browse Source

Merge branch 'react_native_webrtc_media_stream_track_get_settings_not_implemented' of https://github.com/tsareg/lib-jitsi-meet into tsareg-react_native_webrtc_media_stream_track_get_settings_not_implemented

dev1
Lyubomir Marinov 9 years ago
parent
commit
0b2499682d
1 changed files with 8 additions and 5 deletions
  1. 8
    5
      modules/RTC/JitsiLocalTrack.js

+ 8
- 5
modules/RTC/JitsiLocalTrack.js View File

459
         // https://bugs.chromium.org/p/webrtc/issues/detail?id=2481 for Chromium
459
         // https://bugs.chromium.org/p/webrtc/issues/detail?id=2481 for Chromium
460
         // and https://bugzilla.mozilla.org/show_bug.cgi?id=1213517 for Firefox.
460
         // and https://bugzilla.mozilla.org/show_bug.cgi?id=1213517 for Firefox.
461
         // Even if a browser implements getSettings() already, it might still
461
         // Even if a browser implements getSettings() already, it might still
462
-        // not return anything for 'facingMode'.
462
+        // not return anything for 'facingMode'. In react-native-webrtc case
463
+        // MediaStreamTrack has getSettings method, but it throws
464
+        // "Not implemented" Error.
463
         var trackSettings;
465
         var trackSettings;
464
 
466
 
465
-        if (this.track &&
466
-            typeof this.track.getSettings === 'function' &&
467
-            (trackSettings = this.track.getSettings()) &&
468
-            'facingMode' in trackSettings) {
467
+        try {
468
+            trackSettings = this.track.getSettings();
469
+        } catch (ex) {}
470
+
471
+        if (trackSettings && 'facingMode' in trackSettings) {
469
             return trackSettings.facingMode;
472
             return trackSettings.facingMode;
470
         } else if (typeof this._facingMode !== 'undefined') {
473
         } else if (typeof this._facingMode !== 'undefined') {
471
             return this._facingMode;
474
             return this._facingMode;

Loading…
Cancel
Save