瀏覽代碼

feat(presenter): Modify the default behavior for presenter mode, it set to off when screensharing is turned on. Also, revert video to the original state when screensharing is turned off.

j8
Jaya Allamsetty 5 年之前
父節點
當前提交
bcc1289a23
共有 1 個檔案被更改,包括 2 行新增32 行删除
  1. 2
    32
      conference.js

+ 2
- 32
conference.js 查看文件

825
                 await this.localVideo.setEffect(undefined);
825
                 await this.localVideo.setEffect(undefined);
826
                 APP.store.dispatch(
826
                 APP.store.dispatch(
827
                     setVideoMuted(mute, MEDIA_TYPE.PRESENTER));
827
                     setVideoMuted(mute, MEDIA_TYPE.PRESENTER));
828
-                this._untoggleScreenSharing
829
-                    = this._turnScreenSharingOff.bind(this, false);
830
             } catch (err) {
828
             } catch (err) {
831
                 logger.error('Failed to mute the Presenter video');
829
                 logger.error('Failed to mute the Presenter video');
832
             }
830
             }
850
         try {
848
         try {
851
             await this.localVideo.setEffect(effect);
849
             await this.localVideo.setEffect(effect);
852
             APP.store.dispatch(setVideoMuted(mute, MEDIA_TYPE.PRESENTER));
850
             APP.store.dispatch(setVideoMuted(mute, MEDIA_TYPE.PRESENTER));
853
-            this._untoggleScreenSharing
854
-                = this._turnScreenSharingOff.bind(this, true);
855
         } catch (err) {
851
         } catch (err) {
856
             logger.error('Failed to apply the Presenter effect', err);
852
             logger.error('Failed to apply the Presenter effect', err);
857
         }
853
         }
1496
         }
1492
         }
1497
 
1493
 
1498
         if (toggle) {
1494
         if (toggle) {
1499
-            const wasVideoMuted = this.isLocalVideoMuted();
1500
-
1501
             try {
1495
             try {
1502
                 await this._switchToScreenSharing(options);
1496
                 await this._switchToScreenSharing(options);
1503
-            } catch (err) {
1504
-                logger.error('Failed to switch to screensharing', err);
1505
 
1497
 
1506
                 return;
1498
                 return;
1507
-            }
1508
-            if (wasVideoMuted) {
1509
-                return;
1510
-            }
1511
-            const { height } = this.localVideo.track.getSettings();
1512
-            const defaultCamera
1513
-                = getUserSelectedCameraDeviceId(APP.store.getState());
1514
-            let effect;
1515
-
1516
-            try {
1517
-                effect = await this._createPresenterStreamEffect(
1518
-                    height, defaultCamera);
1519
             } catch (err) {
1499
             } catch (err) {
1520
-                logger.error('Failed to create the presenter effect');
1521
-
1522
-                return;
1523
-            }
1524
-            try {
1525
-                await this.localVideo.setEffect(effect);
1526
-                muteLocalVideo(false);
1527
-
1528
-                return;
1529
-            } catch (err) {
1530
-                logger.error('Failed to create the presenter effect', err);
1500
+                logger.error('Failed to switch to screensharing', err);
1531
 
1501
 
1532
                 return;
1502
                 return;
1533
             }
1503
             }
1555
     _createDesktopTrack(options = {}) {
1525
     _createDesktopTrack(options = {}) {
1556
         let externalInstallation = false;
1526
         let externalInstallation = false;
1557
         let DSExternalInstallationInProgress = false;
1527
         let DSExternalInstallationInProgress = false;
1558
-        const didHaveVideo = Boolean(this.localVideo);
1528
+        const didHaveVideo = !this.isLocalVideoMuted();
1559
 
1529
 
1560
         const getDesktopStreamPromise = options.desktopStream
1530
         const getDesktopStreamPromise = options.desktopStream
1561
             ? Promise.resolve([ options.desktopStream ])
1531
             ? Promise.resolve([ options.desktopStream ])

Loading…
取消
儲存