fcr-ui-scene 3.7.5 → 3.7.6

package/lib/providers/screen-share/provider.browser.js

@@ -57,6 +57,7 @@ var _provider = require("./provider.base");
 var _browser = require("./strategy/browser");
 var _struct = require("./struct");
 var _decorator = require("agora-foundation/lib/decorator");
+var _defaultConfig = require("../../utilities/default-config");
 var _FcrUIScreenShareProviderImpl;
 var _initProto;
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2["default"])(o), (0, _possibleConstructorReturn2["default"])(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2["default"])(t).constructor) : o.apply(t, e)); }
@@ -116,7 +117,7 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
     key: "startShare",
     value: function () {
       var _startShare = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3(_ref) {
-        var videoSourceId, _ref$captureType, captureType, _ref$excludeWindows, excludeWindows, createConfig, screenTrack, isScreenRecordingGranted, isScreenSharingPermitted, audioSourceId, _t, _t2;
+        var videoSourceId, _ref$captureType, captureType, _ref$excludeWindows, excludeWindows, createConfig, screenTrack, isScreenRecordingGranted, isScreenSharingPermitted, audioSourceId, encoderConfig, dimensions, frameRate, bitrate, _t, _t2;
         return _regenerator["default"].wrap(function (_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -162,12 +163,24 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
               if (audioSourceId) {
                 createConfig.audioSourceId = audioSourceId;
               }
+
+              // first set screen scenario
+              if (this.isSharingInSmoothMode) {
+                this._streamControl.setScreenScenario(_type.AgoraRtcScreenScenarioType.SMOOTH);
+              } else {
+                this._streamControl.setScreenScenario(_type.AgoraRtcScreenScenarioType.CLEARITY);
+              }
+              encoderConfig = _defaultConfig.screenCaptureHighStreamEncoderConfig;
+              dimensions = encoderConfig.dimensions, frameRate = encoderConfig.frameRate, bitrate = encoderConfig.bitrate;
               _context3.prev = 5;
               _context3.next = 6;
               return this.strategy.startScreenCapture({
                 sourceId: videoSourceId,
                 captureType: captureType,
-                excludeWindows: excludeWindows
+                excludeWindows: excludeWindows,
+                dimensions: dimensions,
+                frameRate: frameRate,
+                bitrate: bitrate
               });
             case 6:
               _context3.next = 8;
@@ -190,10 +203,7 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
             case 10:
               _context3.prev = 10;
               _context3.next = 11;
-              return this._screenStreamSync.startScreenStream(createConfig, {
-                width: 0,
-                height: 0
-              });
+              return this._screenStreamSync.startScreenStream(createConfig, encoderConfig);
             case 11:
               _context3.next = 13;
               break;
@@ -203,12 +213,6 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
               this.observable.notifyObservers('onScreenShareErrorOccurred', _struct.FcrUIScreenShareErrorCode.CANNOT_CREATE_STREAM);
               throw new Error("cannot create screen stream, error: ".concat(_t2));
             case 13:
-              if (this.isSharingInSmoothMode) {
-                this._streamControl.setScreenScenario(_type.AgoraRtcScreenScenarioType.SMOOTH);
-              } else {
-                this._streamControl.setScreenScenario(_type.AgoraRtcScreenScenarioType.CLEARITY);
-              }
-            case 14:
             case "end":
               return _context3.stop();
           }
@@ -246,16 +250,21 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
     key: "replaceShare",
     value: function () {
       var _replaceShare = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee5(_ref2) {
-        var videoSourceId, captureType, excludeWindows;
+        var videoSourceId, captureType, excludeWindows, encoderConfig, dimensions, frameRate, bitrate;
         return _regenerator["default"].wrap(function (_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
               videoSourceId = _ref2.videoSourceId, captureType = _ref2.captureType, excludeWindows = _ref2.excludeWindows;
+              encoderConfig = _defaultConfig.screenCaptureHighStreamEncoderConfig;
+              dimensions = encoderConfig.dimensions, frameRate = encoderConfig.frameRate, bitrate = encoderConfig.bitrate;
               _context5.next = 1;
               return this.strategy.replaceScreenCaptureSource({
                 sourceId: videoSourceId,
                 captureType: captureType,
-                excludeWindows: excludeWindows
+                excludeWindows: excludeWindows,
+                dimensions: dimensions,
+                frameRate: frameRate,
+                bitrate: bitrate
               });
             case 1:
             case "end":

package/lib/providers/screen-share/provider.electron.d.ts

@@ -14,4 +14,5 @@ export declare class FcrUIScreenShareProviderImpl extends FcrUIScreenShareProvid
     findSharingDisplayBounds(): Electron.Rectangle;
     createStrategy(): FcrUIScreenShareStrategy;
     private _getExcludeWindows;
+    private _getEncoderConfig;
 }

package/lib/providers/screen-share/provider.electron.js

@@ -41,6 +41,7 @@ exports.FcrUIScreenShareProviderImpl = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 require("core-js/modules/es.error.cause.js");
 require("core-js/modules/es.error.to-string.js");
+require("core-js/modules/es.array.concat.js");
 require("core-js/modules/es.array.filter.js");
 require("core-js/modules/es.array.for-each.js");
 require("core-js/modules/es.array.includes.js");
@@ -54,6 +55,7 @@ require("core-js/modules/esnext.iterator.for-each.js");
 require("core-js/modules/esnext.iterator.map.js");
 require("core-js/modules/web.dom-collections.for-each.js");
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
@@ -71,6 +73,8 @@ var _struct = require("./struct");
 var _decorator = require("agora-foundation/lib/decorator");
 var _misc = require("agora-foundation/lib/utilities/misc");
 var _tools = require("../../utilities/tools");
+var _constant = require("../../utilities/constant");
+var _defaultConfig = require("../../utilities/default-config");
 var _FcrUIScreenShareProviderImpl;
 var _initProto;
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2["default"])(o), (0, _possibleConstructorReturn2["default"])(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2["default"])(t).constructor) : o.apply(t, e)); }
@@ -135,7 +139,7 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
               return this._mediaControl.getWindowList();
             case 1:
               this._windowList = _context2.sent.filter(function (item) {
-                return !['AgoraHighLighter', 'Toast', 'Confirm', 'Annotation tool bar', 'Annotation', 'Video Window', 'Control Bar', _this2._currentWindow.getTitle()].includes(item.title);
+                return ![].concat((0, _toConsumableArray2["default"])(_constant.ExcludeWIndows), [_this2._currentWindow.getTitle()]).includes(item.title);
               }).map(function (item) {
                 return {
                   id: item.id,
@@ -162,7 +166,7 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
     key: "startShare",
     value: function () {
       var _startShare = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3(_ref) {
-        var videoSourceId, _ref$captureType, captureType, createConfig, screenTrack, isScreenRecordingGranted, isScreenSharingPermitted, audioSourceId, excludeWindows, _t, _t2;
+        var videoSourceId, _ref$captureType, captureType, createConfig, screenTrack, isScreenRecordingGranted, isScreenSharingPermitted, audioSourceId, encoderConfig, excludeWindows, dimensions, frameRate, bitrate, _t, _t2;
         return _regenerator["default"].wrap(function (_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -210,14 +214,10 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
               }
               this._sharingDisplayBounds = this.findSharingDisplayBounds();
               this.observable.notifyObservers('onPrepreScreenCapture');
-
-              // create screen stream
+              encoderConfig = this._getEncoderConfig(); // create screen stream
               _context3.prev = 5;
               _context3.next = 6;
-              return this._screenStreamSync.startScreenStream(createConfig, {
-                width: 0,
-                height: 0
-              });
+              return this._screenStreamSync.startScreenStream(createConfig, encoderConfig);
             case 6:
               _context3.next = 8;
               break;
@@ -232,11 +232,15 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
               return this._getExcludeWindows();
             case 9:
               excludeWindows = _context3.sent;
+              dimensions = encoderConfig.dimensions, frameRate = encoderConfig.frameRate, bitrate = encoderConfig.bitrate;
               _context3.next = 10;
               return this.strategy.startScreenCapture({
                 sourceId: videoSourceId,
                 captureType: captureType,
-                excludeWindows: excludeWindows
+                excludeWindows: excludeWindows,
+                dimensions: dimensions,
+                frameRate: frameRate,
+                bitrate: bitrate
               });
             case 10:
               _context3.next = 12;
@@ -254,12 +258,6 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
               _context3.next = 13;
               return this.strategy.startLoopbackCapture({});
             case 13:
-              if (this.isSharingInSmoothMode) {
-                this._streamControl.setScreenScenario(_type.AgoraRtcScreenScenarioType.SMOOTH);
-              } else {
-                this._streamControl.setScreenScenario(_type.AgoraRtcScreenScenarioType.CLEARITY);
-              }
-            case 14:
             case "end":
               return _context3.stop();
           }
@@ -300,7 +298,7 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
     key: "replaceShare",
     value: function () {
       var _replaceShare = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee5(_ref2) {
-        var videoSourceId, captureType, screenTrack, excludeWindows, _t3;
+        var videoSourceId, captureType, screenTrack, excludeWindows, encoderConfig, dimensions, frameRate, bitrate, _t3;
         return _regenerator["default"].wrap(function (_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
@@ -325,11 +323,16 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
               return this._getExcludeWindows();
             case 3:
               excludeWindows = _context5.sent;
+              encoderConfig = this._getEncoderConfig();
+              dimensions = encoderConfig.dimensions, frameRate = encoderConfig.frameRate, bitrate = encoderConfig.bitrate;
               _context5.next = 4;
               return this.strategy.replaceScreenCaptureSource({
                 sourceId: videoSourceId,
                 captureType: captureType,
-                excludeWindows: excludeWindows
+                excludeWindows: excludeWindows,
+                dimensions: dimensions,
+                frameRate: frameRate,
+                bitrate: bitrate
               });
             case 4:
               if (!this._isSharingWithAudio) {
@@ -416,6 +419,30 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
       }
       return _getExcludeWindows;
     }()
+  }, {
+    key: "_getEncoderConfig",
+    value: function _getEncoderConfig() {
+      var dimensions;
+      var frameRate;
+      var bitrate;
+      if (this.isSharingInSmoothMode) {
+        this._streamControl.setScreenScenario(_type.AgoraRtcScreenScenarioType.SMOOTH);
+        dimensions = _defaultConfig.screenCaptureSmoothConfig.dimensions;
+        frameRate = _defaultConfig.screenCaptureSmoothConfig.frameRate;
+        bitrate = _defaultConfig.screenCaptureSmoothConfig.bitrate;
+      } else {
+        this._streamControl.setScreenScenario(_type.AgoraRtcScreenScenarioType.CLEARITY);
+        dimensions = _defaultConfig.screenCaptureClearityConfig.dimensions;
+        frameRate = _defaultConfig.screenCaptureClearityConfig.frameRate;
+        bitrate = _defaultConfig.screenCaptureClearityConfig.bitrate;
+      }
+      return {
+        dimensions: dimensions,
+        frameRate: frameRate,
+        bitrate: bitrate,
+        isMirror: false
+      };
+    }
   }]);
 }(_provider.FcrUIScreenShareProviderBase);
 _FcrUIScreenShareProviderImpl = FcrUIScreenShareProviderImpl;

package/lib/providers/screen-share/strategy/browser.js

@@ -49,20 +49,12 @@ var FcrUIBrowserScreenShareStrategy = exports.FcrUIBrowserScreenShareStrategy =
         }
         if (state === _fcrCore.FcrMediaSourceState.CLOSE) {
           _this._screenTrack = null;
-
-          // this.observable.notifyObservers('onScreenCaptureStopped', sourceId);
-
           if (!_this._isReplacing) {
             _this.observable.notifyObservers('onScreenCaptureStopped', sourceId);
           }
         }
         if (state === _fcrCore.FcrMediaSourceState.OPEN) {
-          // this.observable.notifyObservers('onScreenCaptureStarted', sourceId);
-
-          if (_this._isReplacing) {
-            _this._isReplacing = false;
-            _this.observable.notifyObservers('onScreenCaptureReplaced', sourceId);
-          } else {
+          if (!_this._isReplacing) {
             _this.observable.notifyObservers('onScreenCaptureStarted', sourceId);
           }
         }
@@ -95,7 +87,7 @@ var FcrUIBrowserScreenShareStrategy = exports.FcrUIBrowserScreenShareStrategy =
     key: "replaceScreenCaptureSource",
     value: function () {
       var _replaceScreenCaptureSource = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(_ref) {
-        var sourceId, screenTrack;
+        var sourceId, screenTrack, _t;
         return _regenerator["default"].wrap(function (_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -116,13 +108,24 @@ var FcrUIBrowserScreenShareStrategy = exports.FcrUIBrowserScreenShareStrategy =
               return this._stopTrackAndWaitUntilSuccess(screenTrack);
             case 2:
               screenTrack = this._mediaControl.getScreenTrack(sourceId);
-              _context.next = 3;
+              _context.prev = 3;
+              _context.next = 4;
               return this._startTrackAndWaitUntilSuccess(screenTrack);
-            case 3:
+            case 4:
+              this.observable.notifyObservers('onScreenCaptureReplaced', sourceId);
+              _context.next = 6;
+              break;
+            case 5:
+              _context.prev = 5;
+              _t = _context["catch"](3);
+              this.observable.notifyObservers('onScreenCaptureStopped', sourceId);
+            case 6:
+              this._isReplacing = false;
+            case 7:
             case "end":
               return _context.stop();
           }
-        }, _callee, this);
+        }, _callee, this, [[3, 5]]);
       }));
       function replaceScreenCaptureSource(_x) {
         return _replaceScreenCaptureSource.apply(this, arguments);

package/lib/providers/screen-share/strategy/electron.d.ts

@@ -10,13 +10,13 @@ export declare class FcrUIElectronScreenShareStrategy extends FcrUIScreenShareSt
     private _mediaControl;
     private _isReplacing;
     constructor(_objectManager: FcrUIObjectManager);
-    startScreenCapture({ sourceId, captureType, excludeWindows, }: FcrUIScreenCaptureStartParams): Promise<void>;
+    startScreenCapture({ sourceId, captureType, excludeWindows, dimensions, frameRate, bitrate, }: FcrUIScreenCaptureStartParams): Promise<void>;
     stopScreenCapture(): Promise<void>;
     startLoopbackCapture(params: FcrUIScreenLoopbackCaptureStartParams): Promise<void>;
     stopLoopbackCapture(): Promise<void>;
     getScreenTrack(): FcrScreenTrack | null;
     getLoopbackDeviceId(): string | null;
-    replaceScreenCaptureSource({ sourceId, captureType, excludeWindows, }: FcrUIScreenCaptureStartParams): Promise<void>;
+    replaceScreenCaptureSource({ sourceId, captureType, excludeWindows, dimensions, frameRate, bitrate, }: FcrUIScreenCaptureStartParams): Promise<void>;
     private _startTrackAndWaitUntilSuccess;
     private _stopTrackAndWaitUntilSuccess;
 }

package/lib/providers/screen-share/strategy/electron.js

@@ -24,7 +24,6 @@ var _logger = require("../../../utilities/logger");
 var _type = require("./type");
 var _objectManager2 = require("../../../object-manager");
 var _fcrCore = require("fcr-core");
-var _defaultConfig = require("../../../utilities/default-config");
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2["default"])(o), (0, _possibleConstructorReturn2["default"])(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2["default"])(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 var FcrUIElectronScreenShareStrategy = exports.FcrUIElectronScreenShareStrategy = /*#__PURE__*/function (_FcrUIScreenShareStra) {
@@ -70,11 +69,11 @@ var FcrUIElectronScreenShareStrategy = exports.FcrUIElectronScreenShareStrategy
     key: "startScreenCapture",
     value: function () {
       var _startScreenCapture = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(_ref) {
-        var sourceId, captureType, excludeWindows, screenTrack;
+        var sourceId, captureType, excludeWindows, dimensions, frameRate, bitrate, screenTrack;
         return _regenerator["default"].wrap(function (_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              sourceId = _ref.sourceId, captureType = _ref.captureType, excludeWindows = _ref.excludeWindows;
+              sourceId = _ref.sourceId, captureType = _ref.captureType, excludeWindows = _ref.excludeWindows, dimensions = _ref.dimensions, frameRate = _ref.frameRate, bitrate = _ref.bitrate;
               if (sourceId) {
                 _context.next = 1;
                 break;
@@ -83,7 +82,7 @@ var FcrUIElectronScreenShareStrategy = exports.FcrUIElectronScreenShareStrategy
             case 1:
               screenTrack = this._mediaControl.getScreenTrack(sourceId);
               _context.next = 2;
-              return this._startTrackAndWaitUntilSuccess(screenTrack, captureType, excludeWindows);
+              return this._startTrackAndWaitUntilSuccess(screenTrack, captureType, excludeWindows, dimensions, frameRate, bitrate);
             case 2:
             case "end":
               return _context.stop();
@@ -162,11 +161,11 @@ var FcrUIElectronScreenShareStrategy = exports.FcrUIElectronScreenShareStrategy
     key: "replaceScreenCaptureSource",
     value: function () {
       var _replaceScreenCaptureSource = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3(_ref2) {
-        var sourceId, captureType, excludeWindows, screenTrack;
+        var sourceId, captureType, excludeWindows, dimensions, frameRate, bitrate, screenTrack;
         return _regenerator["default"].wrap(function (_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              sourceId = _ref2.sourceId, captureType = _ref2.captureType, excludeWindows = _ref2.excludeWindows;
+              sourceId = _ref2.sourceId, captureType = _ref2.captureType, excludeWindows = _ref2.excludeWindows, dimensions = _ref2.dimensions, frameRate = _ref2.frameRate, bitrate = _ref2.bitrate;
               if (sourceId) {
                 _context3.next = 1;
                 break;
@@ -184,7 +183,7 @@ var FcrUIElectronScreenShareStrategy = exports.FcrUIElectronScreenShareStrategy
             case 2:
               screenTrack = this._mediaControl.getScreenTrack(sourceId);
               _context3.next = 3;
-              return this._startTrackAndWaitUntilSuccess(screenTrack, captureType, excludeWindows);
+              return this._startTrackAndWaitUntilSuccess(screenTrack, captureType, excludeWindows, dimensions, frameRate, bitrate);
             case 3:
             case "end":
               return _context3.stop();
@@ -202,12 +201,18 @@ var FcrUIElectronScreenShareStrategy = exports.FcrUIElectronScreenShareStrategy
       var _startTrackAndWaitUntilSuccess2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee4(screenTrack, captureType) {
         var _this2 = this;
         var excludeWindows,
+          dimensions,
+          frameRate,
+          bitrate,
           p,
           _args4 = arguments;
         return _regenerator["default"].wrap(function (_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
               excludeWindows = _args4.length > 2 && _args4[2] !== undefined ? _args4[2] : [];
+              dimensions = _args4.length > 3 ? _args4[3] : undefined;
+              frameRate = _args4.length > 4 ? _args4[4] : undefined;
+              bitrate = _args4.length > 5 ? _args4[5] : undefined;
               this._screenTrack = screenTrack;
               p = new Promise(function (resolve, reject) {
                 var waitObserver = {
@@ -229,9 +234,9 @@ var FcrUIElectronScreenShareStrategy = exports.FcrUIElectronScreenShareStrategy
               screenTrack.addObserver(this._screenTrackObserver);
               screenTrack.setCaptureParams({
                 withAudio: true,
-                dimensions: _defaultConfig.screenCaptureHighStreamEncoderConfig.dimensions,
-                frameRate: _defaultConfig.screenCaptureHighStreamEncoderConfig.frameRate,
-                bitrate: _defaultConfig.screenCaptureHighStreamEncoderConfig.bitrate
+                dimensions: dimensions,
+                frameRate: frameRate,
+                bitrate: bitrate
               });
               screenTrack.start(captureType, excludeWindows);
               _context4.next = 1;

package/lib/providers/screen-share/strategy/type.d.ts

@@ -28,6 +28,12 @@ export interface FcrUIScreenCaptureStartParams {
     sourceId: string;
     captureType: FcrScreenCaptureType;
     excludeWindows?: string[];
+    dimensions: {
+        width: number;
+        height: number;
+    };
+    frameRate: number;
+    bitrate: number;
 }
 export interface FcrUIScreenLoopbackCaptureStartParams {
 }

package/lib/providers/screen-share/stream-state-sync.d.ts

@@ -1,5 +1,6 @@
 import { FcrUIManagedObject, FcrUIObjectManager } from '../../object-manager';
-import { FcrScreenStreamCreateConfig, FcrSize } from 'fcr-core/lib/room-control/stream-control/type';
+import { FcrScreenStreamCreateConfig } from 'fcr-core/lib/room-control/stream-control/type';
+import { FcrVideoEncoderConfig } from 'fcr-core/lib/type';
 import { FcrUIScreenStreamUpdateParams } from './type';
 export declare class FcrUIScreenStreamSync implements FcrUIManagedObject {
     protected logger: import("agora-foundation/lib/logger").Logger;
@@ -10,7 +11,7 @@ export declare class FcrUIScreenStreamSync implements FcrUIManagedObject {
     constructor(objectManager: FcrUIObjectManager);
     release(): void;
     checkIfMyScreenShareStreamExists(): string | null;
-    startScreenStream(createConfig: FcrScreenStreamCreateConfig, size: FcrSize): Promise<void>;
+    startScreenStream(createConfig: FcrScreenStreamCreateConfig, encoderConfig: FcrVideoEncoderConfig): Promise<void>;
     stopScreenStream(): Promise<void>;
     updateStream({ videoSourceId, audioPublishPrivilege, videoPublishPrivilege, }: FcrUIScreenStreamUpdateParams): Promise<void>;
     isLocalScreenStreamCreated(): boolean;

package/lib/providers/screen-share/stream-state-sync.js

@@ -64,12 +64,13 @@ var FcrUIScreenStreamSync = exports.FcrUIScreenStreamSync = /*#__PURE__*/functio
   }, {
     key: "startScreenStream",
     value: function () {
-      var _startScreenStream = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(createConfig, size) {
-        var _t;
+      var _startScreenStream = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(createConfig, encoderConfig) {
+        var streamId, screenStreamId, _t;
         return _regenerator["default"].wrap(function (_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              if (!this._myCurrentScreenShareStreamId) {
+              streamId = this._myCurrentScreenShareStreamId;
+              if (!streamId) {
                 _context.next = 1;
                 break;
               }
@@ -77,8 +78,10 @@ var FcrUIScreenStreamSync = exports.FcrUIScreenStreamSync = /*#__PURE__*/functio
             case 1:
               _context.prev = 1;
               _context.next = 2;
-              return this._sharingControl.startScreenSharing(createConfig, size);
+              return this._sharingControl.startScreenSharing(createConfig, encoderConfig.dimensions);
             case 2:
+              screenStreamId = _context.sent;
+              this._streamControl.setVideoEncoderConfig(screenStreamId, encoderConfig, _type.FcrVideoStreamType.HIGH_STREAM);
               _context.next = 4;
               break;
             case 3:

package/lib/providers/screen-share/struct.d.ts

@@ -15,22 +15,24 @@ export declare enum FcrUIScreenShareErrorCode {
      * 无法开始屏幕采集
      */
     CANNOT_START_SCREEN_CAPTURE = 4,
-    /**
-     * 无法开始声卡采集
-     */
-    CANNOT_START_LOOPBACK_CAPTURE = 5,
     /**
      * 无发流权限
      */
-    NO_PUBLISH_PRIVILIGE = 6,
+    NO_PUBLISH_PRIVILIGE = 5,
     /**
      * 无屏幕采集权限
      */
-    NO_SCREEN_RECORDING_PERMISSION = 7,
+    NO_SCREEN_RECORDING_PERMISSION = 6,
     /**
      * 网络未连接
      */
-    NETWORK_DISCONNECTED = 8
+    NETWORK_DISCONNECTED = 7
+}
+export declare enum FcrUIAudioShareErrorCode {
+    /**
+     * 无法更新音频流
+     */
+    CANNOT_UPDATE_STREAM = 0
 }
 export declare enum FcrUIScreenShareStopReason {
     /**

package/lib/providers/screen-share/struct.js

@@ -4,7 +4,7 @@ require("core-js/modules/es.object.define-property.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.FcrUIScreenShareStopReason = exports.FcrUIScreenShareErrorCode = void 0;
+exports.FcrUIScreenShareStopReason = exports.FcrUIScreenShareErrorCode = exports.FcrUIAudioShareErrorCode = void 0;
 var FcrUIScreenShareErrorCode = exports.FcrUIScreenShareErrorCode = /*#__PURE__*/function (FcrUIScreenShareErrorCode) {
   /**
    * 当前已经在共享了，不能开启共享
@@ -22,24 +22,27 @@ var FcrUIScreenShareErrorCode = exports.FcrUIScreenShareErrorCode = /*#__PURE__*
    * 无法开始屏幕采集
    */
   FcrUIScreenShareErrorCode[FcrUIScreenShareErrorCode["CANNOT_START_SCREEN_CAPTURE"] = 4] = "CANNOT_START_SCREEN_CAPTURE";
-  /**
-   * 无法开始声卡采集
-   */
-  FcrUIScreenShareErrorCode[FcrUIScreenShareErrorCode["CANNOT_START_LOOPBACK_CAPTURE"] = 5] = "CANNOT_START_LOOPBACK_CAPTURE";
   /**
    * 无发流权限
    */
-  FcrUIScreenShareErrorCode[FcrUIScreenShareErrorCode["NO_PUBLISH_PRIVILIGE"] = 6] = "NO_PUBLISH_PRIVILIGE";
+  FcrUIScreenShareErrorCode[FcrUIScreenShareErrorCode["NO_PUBLISH_PRIVILIGE"] = 5] = "NO_PUBLISH_PRIVILIGE";
   /**
    * 无屏幕采集权限
    */
-  FcrUIScreenShareErrorCode[FcrUIScreenShareErrorCode["NO_SCREEN_RECORDING_PERMISSION"] = 7] = "NO_SCREEN_RECORDING_PERMISSION";
+  FcrUIScreenShareErrorCode[FcrUIScreenShareErrorCode["NO_SCREEN_RECORDING_PERMISSION"] = 6] = "NO_SCREEN_RECORDING_PERMISSION";
   /**
    * 网络未连接
    */
-  FcrUIScreenShareErrorCode[FcrUIScreenShareErrorCode["NETWORK_DISCONNECTED"] = 8] = "NETWORK_DISCONNECTED";
+  FcrUIScreenShareErrorCode[FcrUIScreenShareErrorCode["NETWORK_DISCONNECTED"] = 7] = "NETWORK_DISCONNECTED";
   return FcrUIScreenShareErrorCode;
 }({});
+var FcrUIAudioShareErrorCode = exports.FcrUIAudioShareErrorCode = /*#__PURE__*/function (FcrUIAudioShareErrorCode) {
+  /**
+   * 无法更新音频流
+   */
+  FcrUIAudioShareErrorCode[FcrUIAudioShareErrorCode["CANNOT_UPDATE_STREAM"] = 0] = "CANNOT_UPDATE_STREAM";
+  return FcrUIAudioShareErrorCode;
+}({});
 var FcrUIScreenShareStopReason = exports.FcrUIScreenShareStopReason = /*#__PURE__*/function (FcrUIScreenShareStopReason) {
   /**
    * 正常停止

package/lib/providers/screen-share/type.d.ts

@@ -1,6 +1,6 @@
 import { FcrStreamPrivilegeOperation } from 'fcr-core';
 import { FcrScreenCaptureType, FcrUserInfo } from 'fcr-core/lib/type';
-import { FcrUIScreenShareErrorCode, FcrUIScreenShareStopReason } from './struct';
+import { FcrUIAudioShareErrorCode, FcrUIScreenShareErrorCode, FcrUIScreenShareStopReason } from './struct';
 import { FcrScreenTrack } from 'fcr-core/lib/media-control/type';
 export interface FcrUIScreenShareWindowInfo {
     id: string;
@@ -56,6 +56,12 @@ export interface FcrUIScreenShareObserver {
      * @returns
      */
     onScreenShareErrorOccurred?: (code: FcrUIScreenShareErrorCode) => void;
+    /**
+     * 音频共享错误发生
+     * @param code
+     * @returns
+     */
+    onAudioShareErrorOccurred?: (code: FcrUIAudioShareErrorCode) => void;
 }
 export interface FcrUIScreenShareProvider {
     /**

package/lib/providers/widget-provider.d.ts

@@ -3,6 +3,7 @@ import { FcrRegisteredWidgetConfigs, FcrUIWebWidget, ID } from '../modules/widge
 import { FcrUIWebWidgetConfig } from '../type';
 import { FcrUIManagedObject } from '../object-manager';
 import { FcrUIDialogProvider } from './dialog/type';
+import { FcrUISharedWidgetDataSource } from '../shared-data/widget-data';
 export interface FcrUIWidgetObserver {
     onWidgetClicked(widgetId: string): void;
 }
@@ -60,11 +61,12 @@ export declare class FcrUIWidgetProviderImpl implements FcrUIWidgetProvider, Fcr
     private _dialogProvider;
     private _dialogProviderObserver;
     private _observable;
+    private _sharedWidgetDataSource;
     accessor dialogIds: Map<ID, string>;
-    accessor registeredWidgetConfigs: FcrRegisteredWidgetConfigs;
     accessor openedWidgets: Map<ID, FcrUIWebWidget>;
-    constructor({ registeredWidgetConfigs, roomProvider, dialogProvider, }: {
-        registeredWidgetConfigs: FcrRegisteredWidgetConfigs;
+    get registeredWidgetConfigs(): FcrRegisteredWidgetConfigs;
+    constructor({ sharedWidgetDataSource, roomProvider, dialogProvider, }: {
+        sharedWidgetDataSource: FcrUISharedWidgetDataSource;
         roomProvider: FcrUIRoomProvider;
         dialogProvider: FcrUIDialogProvider;
     });