agora-rte-sdk 2.9.30 → 2.9.32

package/lib/core/rtc/adapter/web/index.js

@@ -260,7 +260,7 @@ var RtcAdapterWeb = exports.RtcAdapterWeb = (_dec = _log.Log.attach({
   }, {
     key: "setupPreviewLocalVideo",
     value: function setupPreviewLocalVideo(canvas) {
-      this.previewCameraThread.canvas = canvas;
+      this.previewCameraThread.setCanvas(canvas);
       this.previewCameraThread.run();
       return 0;
     }
@@ -268,10 +268,10 @@ var RtcAdapterWeb = exports.RtcAdapterWeb = (_dec = _log.Log.attach({
     key: "setupLocalVideo",
     value: function setupLocalVideo(canvas, videoSourceType) {
       if (videoSourceType === _track.AgoraRteVideoSourceType.Camera) {
-        this.cameraThread.canvas = canvas;
+        this.cameraThread.setCanvas(canvas);
         this.cameraThread.run();
       } else {
-        this.screenThread.canvas = canvas;
+        this.screenThread.setCanvas(canvas);
         this.screenThread.run();
       }
       return 0;

package/lib/core/rtc/adapter/web/thread.d.ts

@@ -19,7 +19,9 @@ export declare class AgoraRteCameraThread extends AgoraRteMediaTrackThread {
     cameraEnable: boolean;
     private _deviceId?;
     private _deviceChanged;
+    private _canvasChanged;
     private setCameraTrackState;
+    setCanvas(canvas: AgoraRtcVideoCanvas): void;
     setDevice(deviceId: string): void;
     onExecution(): Promise<void>;
 }
@@ -29,7 +31,9 @@ export declare class AgoraRtePreviewCameraThread extends AgoraRteMediaTrackThrea
     cameraEnable: boolean;
     private _deviceId?;
     private _deviceChanged;
+    private _canvasChanged;
     private setCameraTrackState;
+    setCanvas(canvas: AgoraRtcVideoCanvas): void;
     setDevice(deviceId: string): void;
     onExecution(): Promise<void>;
 }
@@ -66,8 +70,10 @@ export declare class AgoraRteScreenShareThread extends AgoraRteMediaTrackThread
     screenEnable: boolean;
     trackState: AgoraRteMediaSourceState;
     loopbackDeviceState: AgoraRteMediaSourceState;
+    private _canvasChanged;
     get playing(): boolean | undefined;
     setScreenShareTrackState(state: AgoraRteMediaSourceState, withAudio: boolean, reason?: number): void;
+    setCanvas(canvas: AgoraRtcVideoCanvas): void;
     onExecution(): Promise<void>;
 }
 export declare class AgoraRtePublishThreadMain extends AgoraRteThread {

package/lib/core/rtc/adapter/web/thread.js

@@ -147,6 +147,7 @@ var AgoraRteCameraThread = exports.AgoraRteCameraThread = (_dec = _log.Log.attac
     _this3.cameraEnable = false;
     _this3._deviceId = void 0;
     _this3._deviceChanged = false;
+    _this3._canvasChanged = false;
     return _this3;
   }
   (0, _createClass2["default"])(AgoraRteCameraThread, [{
@@ -158,6 +159,12 @@ var AgoraRteCameraThread = exports.AgoraRteCameraThread = (_dec = _log.Log.attac
       this.trackState = state;
       this.emit(_control.AgoraMediaControlEventType.trackStateChanged, state, _track.AgoraRteVideoSourceType.Camera, reason);
     }
+  }, {
+    key: "setCanvas",
+    value: function setCanvas(canvas) {
+      this.canvas = canvas;
+      this._canvasChanged = true;
+    }
   }, {
     key: "setDevice",
     value: function setDevice(deviceId) {
@@ -256,20 +263,21 @@ var AgoraRteCameraThread = exports.AgoraRteCameraThread = (_dec = _log.Log.attac
                       _this4.setCameraTrackState(_type.AgoraRteMediaSourceState.error);
                       return _context.abrupt("return", 0);
                     case 39:
+                      if (!(_this4.track && !_this4._canvasChanged && (_this4.canvas && _this4.canvas.view && _this4.track.isPlaying || !_this4.canvas || !_this4.canvas.view))) {
+                        _context.next = 42;
+                        break;
+                      }
+                      // ok to sleep
+                      _this4.logger.info('complete thread run');
+                      return _context.abrupt("return", 0);
+                    case 42:
                       if (_this4.track && _this4.canvas && _this4.canvas.view) {
                         _this4.track.play(_this4.canvas.view, {
                           fit: _this4.canvas.renderMode === _type.AGRenderMode.fill ? 'cover' : 'contain'
                         });
+                        _this4._canvasChanged = false;
                       }
                       _this4.pipeProcessors();
-                      if (!(_this4.track && (_this4.canvas && _this4.canvas.view && _this4.track.isPlaying || !_this4.canvas || !_this4.canvas.view))) {
-                        _context.next = 44;
-                        break;
-                      }
-                      // ok to sleep
-                      _this4.logger.info('complete thread run');
-                      return _context.abrupt("return", 0);
-                    case 44:
                       _context.next = 50;
                       break;
                     case 46:
@@ -346,6 +354,7 @@ var AgoraRtePreviewCameraThread = exports.AgoraRtePreviewCameraThread = (_dec2 =
     _this5.cameraEnable = false;
     _this5._deviceId = void 0;
     _this5._deviceChanged = false;
+    _this5._canvasChanged = false;
     return _this5;
   }
   (0, _createClass2["default"])(AgoraRtePreviewCameraThread, [{
@@ -357,6 +366,12 @@ var AgoraRtePreviewCameraThread = exports.AgoraRtePreviewCameraThread = (_dec2 =
       this.trackState = state;
       this.emit(_control.AgoraMediaControlEventType.trackStateChanged, state, _track.AgoraRteVideoSourceType.Camera, reason);
     }
+  }, {
+    key: "setCanvas",
+    value: function setCanvas(canvas) {
+      this.canvas = canvas;
+      this._canvasChanged = true;
+    }
   }, {
     key: "setDevice",
     value: function setDevice(deviceId) {
@@ -455,20 +470,21 @@ var AgoraRtePreviewCameraThread = exports.AgoraRtePreviewCameraThread = (_dec2 =
                     case 38:
                       _this6.logger.info("camera started");
                     case 39:
+                      if (!(_this6.track && !_this6._canvasChanged && (_this6.canvas && _this6.canvas.view && _this6.track.isPlaying || !_this6.canvas || !_this6.canvas.view))) {
+                        _context3.next = 42;
+                        break;
+                      }
+                      // ok to sleep
+                      _this6.logger.info('complete thread run');
+                      return _context3.abrupt("return", 0);
+                    case 42:
                       if (_this6.track && _this6.canvas && _this6.canvas.view) {
                         _this6.track.play(_this6.canvas.view, {
                           fit: _this6.canvas.renderMode === _type.AGRenderMode.fill ? 'cover' : 'contain'
                         });
+                        _this6._canvasChanged = false;
                       }
                       _this6.pipeProcessors();
-                      if (!(_this6.track && (_this6.canvas && _this6.canvas.view && _this6.track.isPlaying || !_this6.canvas || !_this6.canvas.view))) {
-                        _context3.next = 44;
-                        break;
-                      }
-                      // ok to sleep
-                      _this6.logger.info('complete thread run');
-                      return _context3.abrupt("return", 0);
-                    case 44:
                       _context3.next = 50;
                       break;
                     case 46:
@@ -1051,12 +1067,13 @@ var AgoraRteScreenShareThread = exports.AgoraRteScreenShareThread = (_dec5 = _lo
     _this14.screenEnable = false;
     _this14.trackState = _type.AgoraRteMediaSourceState.stopped;
     _this14.loopbackDeviceState = _type.AgoraRteMediaSourceState.stopped;
+    _this14._canvasChanged = false;
     return _this14;
   }
   (0, _createClass2["default"])(AgoraRteScreenShareThread, [{
     key: "playing",
     get: function get() {
-      return this.track && this.track.isPlaying && (!this.audioTrack || this.audioTrack && this.audioTrack.isPlaying);
+      return this.track && !this._canvasChanged && this.track.isPlaying;
     }
   }, {
     key: "setScreenShareTrackState",
@@ -1067,6 +1084,12 @@ var AgoraRteScreenShareThread = exports.AgoraRteScreenShareThread = (_dec5 = _lo
       this.trackState = state;
       this.emit(_control.AgoraMediaControlEventType.trackStateChanged, state, _track.AgoraRteVideoSourceType.ScreenShare, reason, withAudio);
     }
+  }, {
+    key: "setCanvas",
+    value: function setCanvas(canvas) {
+      this.canvas = canvas;
+      this._canvasChanged = true;
+    }
   }, {
     key: "onExecution",
     value: function () {
@@ -1158,19 +1181,18 @@ var AgoraRteScreenShareThread = exports.AgoraRteScreenShareThread = (_dec5 = _lo
                     case 35:
                       _this15.logger.info("screenshare started");
                     case 36:
-                      if (_this15.track && _this15.canvas && _this15.canvas.view) {
-                        _this15.track.play(_this15.canvas.view);
-                      }
-
-                      // do not play local audioTrack as it causes echo
                       if (!(!_this15.canvas || _this15.canvas && _this15.playing)) {
-                        _context10.next = 40;
+                        _context10.next = 39;
                         break;
                       }
                       _this15.logger.info('complete thread run');
                       // ok to sleep
                       return _context10.abrupt("return", 0);
-                    case 40:
+                    case 39:
+                      if (_this15.track && _this15.canvas && _this15.canvas.view) {
+                        _this15.track.play(_this15.canvas.view);
+                        _this15._canvasChanged = false;
+                      }
                       _context10.next = 47;
                       break;
                     case 42:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agora-rte-sdk",
-  "version": "2.9.30",
+  "version": "2.9.32",
   "description": "SDK for building interactive scenarios",
   "author": "agora.io",
   "license": "ISC",
@@ -74,4 +74,4 @@
     "dexie": "3.0.3",
     "dayjs": "1.10.4"
   }
-}
+}