Browse Source

rn,tracks: do not load stream effects on mobile

master
Saúl Ibarra Corretgé 5 years ago
parent
commit
c05b4a43e8

+ 3
- 23
react/features/base/tracks/functions.js View File

1
 /* global APP */
1
 /* global APP */
2
 
2
 
3
-import { createScreenshotCaptureEffect } from '../../stream-effects/screenshot-capture';
4
-import { getBlurEffect } from '../../blur';
5
 import JitsiMeetJS, { JitsiTrackErrors, browser } from '../lib-jitsi-meet';
3
 import JitsiMeetJS, { JitsiTrackErrors, browser } from '../lib-jitsi-meet';
6
 import { MEDIA_TYPE } from '../media';
4
 import { MEDIA_TYPE } from '../media';
7
 import {
5
 import {
9
     getUserSelectedMicDeviceId
7
     getUserSelectedMicDeviceId
10
 } from '../settings';
8
 } from '../settings';
11
 
9
 
10
+import loadEffects from './loadEffects';
12
 import logger from './logger';
11
 import logger from './logger';
13
 
12
 
14
 /**
13
 /**
94
         firefox_fake_device, // eslint-disable-line camelcase
93
         firefox_fake_device, // eslint-disable-line camelcase
95
         resolution
94
         resolution
96
     } = state['features/base/config'];
95
     } = state['features/base/config'];
97
-    const constraints = options.constraints
98
-        ?? state['features/base/config'].constraints;
99
-
100
-    const blurPromise = state['features/blur'].blurEnabled
101
-        ? getBlurEffect()
102
-            .catch(error => {
103
-                logger.error('Failed to obtain the blur effect instance with error: ', error);
104
-
105
-                return Promise.resolve();
106
-            })
107
-        : Promise.resolve();
108
-    const screenshotCapturePromise = state['features/screenshot-capture']?.capturesEnabled
109
-        ? createScreenshotCaptureEffect(state)
110
-            .catch(error => {
111
-                logger.error('Failed to obtain the screenshot capture effect effect instance with error: ', error);
112
-
113
-                return Promise.resolve();
114
-            })
115
-        : Promise.resolve();
116
-    const loadEffectsPromise = Promise.all([ blurPromise, screenshotCapturePromise ]);
96
+    const constraints = options.constraints ?? state['features/base/config'].constraints;
117
 
97
 
118
     return (
98
     return (
119
-        loadEffectsPromise.then(effectsArray => {
99
+        loadEffects(store).then(effectsArray => {
120
             // Filter any undefined values returned by Promise.resolve().
100
             // Filter any undefined values returned by Promise.resolve().
121
             const effects = effectsArray.filter(effect => Boolean(effect));
101
             const effects = effectsArray.filter(effect => Boolean(effect));
122
 
102
 

+ 11
- 0
react/features/base/tracks/loadEffects.native.js View File

1
+// @flow
2
+
3
+/**
4
+ * Loads the enabled stream effects.
5
+ *
6
+ * @param {Object} store - The Redux store.
7
+ * @returns {Promsie} - A Promise which resolves when all effects are created.
8
+ */
9
+export default function loadEffects(store: Object): Promise<any> { // eslint-disable-line no-unused-vars
10
+    return Promise.resolve();
11
+}

+ 35
- 0
react/features/base/tracks/loadEffects.web.js View File

1
+// @flow
2
+
3
+import { createScreenshotCaptureEffect } from '../../stream-effects/screenshot-capture';
4
+import { getBlurEffect } from '../../blur';
5
+
6
+import logger from './logger';
7
+
8
+/**
9
+ * Loads the enabled stream effects.
10
+ *
11
+ * @param {Object} store - The Redux store.
12
+ * @returns {Promsie} - A Promise which resolves when all effects are created.
13
+ */
14
+export default function loadEffects(store: Object): Promise<any> {
15
+    const state = store.getState();
16
+
17
+    const blurPromise = state['features/blur'].blurEnabled
18
+        ? getBlurEffect()
19
+            .catch(error => {
20
+                logger.error('Failed to obtain the blur effect instance with error: ', error);
21
+
22
+                return Promise.resolve();
23
+            })
24
+        : Promise.resolve();
25
+    const screenshotCapturePromise = state['features/screenshot-capture']?.capturesEnabled
26
+        ? createScreenshotCaptureEffect(state)
27
+            .catch(error => {
28
+                logger.error('Failed to obtain the screenshot capture effect effect instance with error: ', error);
29
+
30
+                return Promise.resolve();
31
+            })
32
+        : Promise.resolve();
33
+
34
+    return Promise.all([ blurPromise, screenshotCapturePromise ]);
35
+}

Loading…
Cancel
Save