agora-rte-sdk 3.4.101 → 3.4.102
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/lib/core/rtc/type.d.ts
CHANGED
|
@@ -304,6 +304,7 @@ export type AgoraRtcScreenCaptureParams = {
|
|
|
304
304
|
outlineColor?: string;
|
|
305
305
|
outlineEnabled?: boolean;
|
|
306
306
|
excludeWindows?: string[];
|
|
307
|
+
monitorTypeSurfaces?: string;
|
|
307
308
|
};
|
|
308
309
|
export type AgoraRtcCameraCaptureParams = {
|
|
309
310
|
dimensions: AgoraRtcDimensions;
|
|
@@ -105,6 +105,8 @@ var AgoraRtcWebAdapterImp = exports.AgoraRtcWebAdapterImp = /*#__PURE__*/functio
|
|
|
105
105
|
(0, _defineProperty2["default"])(_this, "_screenViewCanvasMap", new Map());
|
|
106
106
|
// @internal
|
|
107
107
|
(0, _defineProperty2["default"])(_this, "_privateOptions", {});
|
|
108
|
+
// @internal
|
|
109
|
+
(0, _defineProperty2["default"])(_this, "_privateParameters", {});
|
|
108
110
|
_this._initConfig = _initConfig;
|
|
109
111
|
_this._handleAutoPlayFailed = _this._handleAutoPlayFailed.bind(_this);
|
|
110
112
|
_this._deviceObserver = {
|
|
@@ -115,7 +117,7 @@ var AgoraRtcWebAdapterImp = exports.AgoraRtcWebAdapterImp = /*#__PURE__*/functio
|
|
|
115
117
|
_this.rtcClientObservable.notifyObservers('onSpeakerListRemoved', speakerList);
|
|
116
118
|
}
|
|
117
119
|
};
|
|
118
|
-
_this._deviceManager = new _device.AgoraRtcDeviceManager(extensionDelegate, _initConfig.dualCameraVideoStreamConfig, _initConfig.dualScreenVideoStreamConfig);
|
|
120
|
+
_this._deviceManager = new _device.AgoraRtcDeviceManager(extensionDelegate, _initConfig.dualCameraVideoStreamConfig, _initConfig.dualScreenVideoStreamConfig, _this._privateParameters);
|
|
119
121
|
_this._audioPlayer = new _audioPlayer.AgoraWebAudioPlayer(_this.rtcClientObservable, _this._deviceManager);
|
|
120
122
|
_this.sourceManager = new _sourceManager.AgoraRtcSourceManagerImpl(_this._deviceManager);
|
|
121
123
|
_this.captureEnhancement = new _captureEnhancement.AgoraRtcCaptureEnhancementImpl(_this._deviceManager);
|
|
@@ -265,6 +267,7 @@ var AgoraRtcWebAdapterImp = exports.AgoraRtcWebAdapterImp = /*#__PURE__*/functio
|
|
|
265
267
|
}, {
|
|
266
268
|
key: "setParameters",
|
|
267
269
|
value: function setParameters(parameters) {
|
|
270
|
+
var _this2 = this;
|
|
268
271
|
try {
|
|
269
272
|
var obj = JSON.parse(parameters);
|
|
270
273
|
if (obj) {
|
|
@@ -272,6 +275,9 @@ var AgoraRtcWebAdapterImp = exports.AgoraRtcWebAdapterImp = /*#__PURE__*/functio
|
|
|
272
275
|
var value = obj[key];
|
|
273
276
|
//@ts-ignore
|
|
274
277
|
_agoraRtcSdkNg["default"].setParameter(key, value);
|
|
278
|
+
if (key === 'monitorTypeSurfaces') {
|
|
279
|
+
_this2._privateParameters[key] = value;
|
|
280
|
+
}
|
|
275
281
|
});
|
|
276
282
|
}
|
|
277
283
|
} catch (e) {
|
|
@@ -292,10 +298,10 @@ var AgoraRtcWebAdapterImp = exports.AgoraRtcWebAdapterImp = /*#__PURE__*/functio
|
|
|
292
298
|
}, {
|
|
293
299
|
key: "stopRenderCameraPreviewOnAllCanvas",
|
|
294
300
|
value: function stopRenderCameraPreviewOnAllCanvas(deviceId) {
|
|
295
|
-
var
|
|
301
|
+
var _this3 = this;
|
|
296
302
|
this._cameraViewCanvasMap.forEach(function (canvas, view) {
|
|
297
|
-
|
|
298
|
-
|
|
303
|
+
_this3._cameraViewCanvasMap["delete"](view);
|
|
304
|
+
_this3._deviceManager.stopRenderCameraVideo(deviceId, canvas);
|
|
299
305
|
view.innerHTML = '';
|
|
300
306
|
});
|
|
301
307
|
return 0;
|
|
@@ -303,10 +309,10 @@ var AgoraRtcWebAdapterImp = exports.AgoraRtcWebAdapterImp = /*#__PURE__*/functio
|
|
|
303
309
|
}, {
|
|
304
310
|
key: "stopRenderScreenPreviewOnAllCanvas",
|
|
305
311
|
value: function stopRenderScreenPreviewOnAllCanvas(sourceId, type) {
|
|
306
|
-
var
|
|
312
|
+
var _this4 = this;
|
|
307
313
|
this._screenViewCanvasMap.forEach(function (canvas, view) {
|
|
308
|
-
|
|
309
|
-
|
|
314
|
+
_this4._screenViewCanvasMap["delete"](view);
|
|
315
|
+
_this4._deviceManager.stopRenderScreenVideo(sourceId, canvas);
|
|
310
316
|
view.innerHTML = '';
|
|
311
317
|
});
|
|
312
318
|
return 0;
|
|
@@ -9,7 +9,8 @@ export declare class AgoraRtcDeviceManager {
|
|
|
9
9
|
private _extensionDelegate;
|
|
10
10
|
private _dualCameraVideoStreamConfig;
|
|
11
11
|
private _dualScreenVideoStreamConfig;
|
|
12
|
-
|
|
12
|
+
private _privateParameters;
|
|
13
|
+
constructor(_extensionDelegate: AgoraWebRtcExtensionDelegate, _dualCameraVideoStreamConfig: AgoraRteDualVideoStreamConfig, _dualScreenVideoStreamConfig: AgoraRteDualVideoStreamConfig, _privateParameters: Record<string, unknown>);
|
|
13
14
|
getVideoTracksMap(): Map<string, ILocalVideoTrack>;
|
|
14
15
|
getAudioTracksMap(): Map<string, ILocalAudioTrack>;
|
|
15
16
|
getVideoDeviceStateMap(): Map<string, {
|
|
@@ -51,7 +51,7 @@ var _screen = require("./track-control/screen");
|
|
|
51
51
|
var _agoraExtensionAiDenoiser = require("agora-extension-ai-denoiser");
|
|
52
52
|
var _logger = require("../../../core/utilities/logger");
|
|
53
53
|
var AgoraRtcDeviceManager = exports.AgoraRtcDeviceManager = /*#__PURE__*/function () {
|
|
54
|
-
function AgoraRtcDeviceManager(_extensionDelegate, _dualCameraVideoStreamConfig, _dualScreenVideoStreamConfig) {
|
|
54
|
+
function AgoraRtcDeviceManager(_extensionDelegate, _dualCameraVideoStreamConfig, _dualScreenVideoStreamConfig, _privateParameters) {
|
|
55
55
|
(0, _classCallCheck2["default"])(this, AgoraRtcDeviceManager);
|
|
56
56
|
//@internal
|
|
57
57
|
(0, _defineProperty2["default"])(this, "logger", (0, _logger.getLogger)());
|
|
@@ -78,6 +78,7 @@ var AgoraRtcDeviceManager = exports.AgoraRtcDeviceManager = /*#__PURE__*/functio
|
|
|
78
78
|
this._extensionDelegate = _extensionDelegate;
|
|
79
79
|
this._dualCameraVideoStreamConfig = _dualCameraVideoStreamConfig;
|
|
80
80
|
this._dualScreenVideoStreamConfig = _dualScreenVideoStreamConfig;
|
|
81
|
+
this._privateParameters = _privateParameters;
|
|
81
82
|
this._handleCameraChanged = this._handleCameraChanged.bind(this);
|
|
82
83
|
this._handleMicChanged = this._handleMicChanged.bind(this);
|
|
83
84
|
this._handleSpeakerChanged = this._handleSpeakerChanged.bind(this);
|
|
@@ -626,7 +627,8 @@ var AgoraRtcDeviceManager = exports.AgoraRtcDeviceManager = /*#__PURE__*/functio
|
|
|
626
627
|
controls.set(sourceId, new _screen.AgoraRtcScreenControl(sourceId, this._localTrackObservable, {
|
|
627
628
|
dimensions: this._dualScreenVideoStreamConfig.highVideoEncoderConfig.dimensions,
|
|
628
629
|
frameRate: this._dualScreenVideoStreamConfig.highVideoEncoderConfig.frameRate,
|
|
629
|
-
bitrate: this._dualScreenVideoStreamConfig.highVideoEncoderConfig.bitrate
|
|
630
|
+
bitrate: this._dualScreenVideoStreamConfig.highVideoEncoderConfig.bitrate,
|
|
631
|
+
monitorTypeSurfaces: this._privateParameters.monitorTypeSurfaces
|
|
630
632
|
}));
|
|
631
633
|
}
|
|
632
634
|
return controls.get(sourceId);
|
|
@@ -105,20 +105,24 @@ var AgoraRtcScreenControl = exports.AgoraRtcScreenControl = /*#__PURE__*/functio
|
|
|
105
105
|
}, {
|
|
106
106
|
key: "start",
|
|
107
107
|
value: function start(params) {
|
|
108
|
-
var
|
|
108
|
+
var _params$monitorTypeSu,
|
|
109
|
+
_this$_captureParamsP,
|
|
110
|
+
_this = this;
|
|
109
111
|
var sourceId = this._sourceId;
|
|
112
|
+
var monitorTypeSurfaces = (_params$monitorTypeSu = params.monitorTypeSurfaces) !== null && _params$monitorTypeSu !== void 0 ? _params$monitorTypeSu : (_this$_captureParamsP = this._captureParamsPreset) === null || _this$_captureParamsP === void 0 ? void 0 : _this$_captureParamsP.monitorTypeSurfaces;
|
|
110
113
|
if (params.withAudio) {
|
|
111
|
-
var _params$dimensions$wi, _params$dimensions, _this$
|
|
114
|
+
var _params$dimensions$wi, _params$dimensions, _this$_captureParamsP2, _params$dimensions$he, _params$dimensions2, _this$_captureParamsP3, _params$frameRate, _this$_captureParamsP4, _params$bitrate, _this$_captureParamsP5;
|
|
112
115
|
this._localTrackObservable.notifyObservers('onLocalVideoTrackBeforeCreate', sourceId, _type.AgoraRtcVideoSourceType.SCREEN);
|
|
113
116
|
this.logger.debug('start creating screen video track with audio');
|
|
114
117
|
_agoraRtcSdkNg["default"].createScreenVideoTrack({
|
|
115
118
|
encoderConfig: {
|
|
116
|
-
width: (_params$dimensions$wi = (_params$dimensions = params.dimensions) === null || _params$dimensions === void 0 ? void 0 : _params$dimensions.width) !== null && _params$dimensions$wi !== void 0 ? _params$dimensions$wi : (_this$
|
|
117
|
-
height: (_params$dimensions$he = (_params$dimensions2 = params.dimensions) === null || _params$dimensions2 === void 0 ? void 0 : _params$dimensions2.height) !== null && _params$dimensions$he !== void 0 ? _params$dimensions$he : (_this$
|
|
118
|
-
frameRate: (_params$frameRate = params.frameRate) !== null && _params$frameRate !== void 0 ? _params$frameRate : (_this$
|
|
119
|
-
bitrateMax: (_params$bitrate = params.bitrate) !== null && _params$bitrate !== void 0 ? _params$bitrate : (_this$
|
|
119
|
+
width: (_params$dimensions$wi = (_params$dimensions = params.dimensions) === null || _params$dimensions === void 0 ? void 0 : _params$dimensions.width) !== null && _params$dimensions$wi !== void 0 ? _params$dimensions$wi : (_this$_captureParamsP2 = this._captureParamsPreset) === null || _this$_captureParamsP2 === void 0 || (_this$_captureParamsP2 = _this$_captureParamsP2.dimensions) === null || _this$_captureParamsP2 === void 0 ? void 0 : _this$_captureParamsP2.width,
|
|
120
|
+
height: (_params$dimensions$he = (_params$dimensions2 = params.dimensions) === null || _params$dimensions2 === void 0 ? void 0 : _params$dimensions2.height) !== null && _params$dimensions$he !== void 0 ? _params$dimensions$he : (_this$_captureParamsP3 = this._captureParamsPreset) === null || _this$_captureParamsP3 === void 0 || (_this$_captureParamsP3 = _this$_captureParamsP3.dimensions) === null || _this$_captureParamsP3 === void 0 ? void 0 : _this$_captureParamsP3.height,
|
|
121
|
+
frameRate: (_params$frameRate = params.frameRate) !== null && _params$frameRate !== void 0 ? _params$frameRate : (_this$_captureParamsP4 = this._captureParamsPreset) === null || _this$_captureParamsP4 === void 0 ? void 0 : _this$_captureParamsP4.frameRate,
|
|
122
|
+
bitrateMax: (_params$bitrate = params.bitrate) !== null && _params$bitrate !== void 0 ? _params$bitrate : (_this$_captureParamsP5 = this._captureParamsPreset) === null || _this$_captureParamsP5 === void 0 ? void 0 : _this$_captureParamsP5.bitrate,
|
|
120
123
|
bitrateMin: 0
|
|
121
|
-
}
|
|
124
|
+
},
|
|
125
|
+
monitorTypeSurfaces: monitorTypeSurfaces ? monitorTypeSurfaces === 'exclude' ? 'exclude' : 'include' : undefined
|
|
122
126
|
}, 'auto').then(function (result) {
|
|
123
127
|
_this.logger.debug('screen track has been created');
|
|
124
128
|
var videoCanvases = new Map(_this._videoCanvases);
|
|
@@ -201,16 +205,17 @@ var AgoraRtcScreenControl = exports.AgoraRtcScreenControl = /*#__PURE__*/functio
|
|
|
201
205
|
_this._localTrackObservable.notifyObservers('onLocalAudioTrackFailedToCreate', sourceId, _type.AgoraRtcAudioSourceType.LOOPBACK, e);
|
|
202
206
|
});
|
|
203
207
|
} else {
|
|
204
|
-
var _params$dimensions$wi2, _params$dimensions3, _this$
|
|
208
|
+
var _params$dimensions$wi2, _params$dimensions3, _this$_captureParamsP6, _params$dimensions$he2, _params$dimensions4, _this$_captureParamsP7, _params$frameRate2, _this$_captureParamsP8, _params$bitrate2, _this$_captureParamsP9;
|
|
205
209
|
this.logger.debug('start creating screen video track without audio');
|
|
206
210
|
_agoraRtcSdkNg["default"].createScreenVideoTrack({
|
|
207
211
|
encoderConfig: {
|
|
208
|
-
width: (_params$dimensions$wi2 = (_params$dimensions3 = params.dimensions) === null || _params$dimensions3 === void 0 ? void 0 : _params$dimensions3.width) !== null && _params$dimensions$wi2 !== void 0 ? _params$dimensions$wi2 : (_this$
|
|
209
|
-
height: (_params$dimensions$he2 = (_params$dimensions4 = params.dimensions) === null || _params$dimensions4 === void 0 ? void 0 : _params$dimensions4.height) !== null && _params$dimensions$he2 !== void 0 ? _params$dimensions$he2 : (_this$
|
|
210
|
-
frameRate: (_params$frameRate2 = params.frameRate) !== null && _params$frameRate2 !== void 0 ? _params$frameRate2 : (_this$
|
|
211
|
-
bitrateMax: (_params$bitrate2 = params.bitrate) !== null && _params$bitrate2 !== void 0 ? _params$bitrate2 : (_this$
|
|
212
|
+
width: (_params$dimensions$wi2 = (_params$dimensions3 = params.dimensions) === null || _params$dimensions3 === void 0 ? void 0 : _params$dimensions3.width) !== null && _params$dimensions$wi2 !== void 0 ? _params$dimensions$wi2 : (_this$_captureParamsP6 = this._captureParamsPreset) === null || _this$_captureParamsP6 === void 0 || (_this$_captureParamsP6 = _this$_captureParamsP6.dimensions) === null || _this$_captureParamsP6 === void 0 ? void 0 : _this$_captureParamsP6.width,
|
|
213
|
+
height: (_params$dimensions$he2 = (_params$dimensions4 = params.dimensions) === null || _params$dimensions4 === void 0 ? void 0 : _params$dimensions4.height) !== null && _params$dimensions$he2 !== void 0 ? _params$dimensions$he2 : (_this$_captureParamsP7 = this._captureParamsPreset) === null || _this$_captureParamsP7 === void 0 || (_this$_captureParamsP7 = _this$_captureParamsP7.dimensions) === null || _this$_captureParamsP7 === void 0 ? void 0 : _this$_captureParamsP7.height,
|
|
214
|
+
frameRate: (_params$frameRate2 = params.frameRate) !== null && _params$frameRate2 !== void 0 ? _params$frameRate2 : (_this$_captureParamsP8 = this._captureParamsPreset) === null || _this$_captureParamsP8 === void 0 ? void 0 : _this$_captureParamsP8.frameRate,
|
|
215
|
+
bitrateMax: (_params$bitrate2 = params.bitrate) !== null && _params$bitrate2 !== void 0 ? _params$bitrate2 : (_this$_captureParamsP9 = this._captureParamsPreset) === null || _this$_captureParamsP9 === void 0 ? void 0 : _this$_captureParamsP9.bitrate,
|
|
212
216
|
bitrateMin: 0
|
|
213
|
-
}
|
|
217
|
+
},
|
|
218
|
+
monitorTypeSurfaces: monitorTypeSurfaces ? monitorTypeSurfaces === 'exclude' ? 'exclude' : 'include' : undefined
|
|
214
219
|
}, 'disable').then(function (videoTrack) {
|
|
215
220
|
_this.logger.debug('screen track has been created');
|
|
216
221
|
var videoCanvases = new Map(_this._videoCanvases);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "agora-rte-sdk",
|
|
3
|
-
"version": "3.4.
|
|
3
|
+
"version": "3.4.102",
|
|
4
4
|
"description": "SDK for building interactive scenarios",
|
|
5
5
|
"author": "agora.io",
|
|
6
6
|
"license": "ISC",
|
|
@@ -56,7 +56,7 @@
|
|
|
56
56
|
"agora-extension-beauty-effect": "^1.0.1-beta",
|
|
57
57
|
"agora-extension-virtual-background": "^1.1.1",
|
|
58
58
|
"agora-foundation": "^3.4.1",
|
|
59
|
-
"agora-rtc-sdk-ng": "4.20.0",
|
|
59
|
+
"agora-rtc-sdk-ng": "4.20.0-400",
|
|
60
60
|
"agora-rtm": "2.2.0",
|
|
61
61
|
"await-to-js": "^3.0.0",
|
|
62
62
|
"immutable": "^4.3.7",
|