agora-electron-sdk 4.2.6-build.1-dev.1 → 4.2.6-build.1-dev.2

package/CHANGELOG.md

@@ -1,11 +1,34 @@
 
 
-## [4.2.6-build.1-dev.1](https://github.com/AgoraIO-Extensions/Electron-SDK/compare/v4.2.4...v4.2.6-build.1-dev.1) (2023-11-16)
+## [4.2.6-build.1-dev.2](https://github.com/AgoraIO-Extensions/Electron-SDK/compare/v4.2.6...v4.2.6-build.1-dev.2) (2023-12-06)
+
+
+### Features
+
+* optimize for renderer ([#1132](https://github.com/AgoraIO-Extensions/Electron-SDK/issues/1132)) ([d0098c1](https://github.com/AgoraIO-Extensions/Electron-SDK/commit/d0098c1c9f6d44dbfa6b790cf127b070d2201ac8))
+* support alpha buffer ([a377169](https://github.com/AgoraIO-Extensions/Electron-SDK/commit/a377169f3efd64d8afa8faf68836c674064b4896))
+
+## [4.2.6](https://github.com/AgoraIO-Extensions/Electron-SDK/compare/v4.2.4...v4.2.6) (2023-11-22)
+
+
+### Bug Fixes
+
+* jira CSD-60920 render issue after ([#1110](https://github.com/AgoraIO-Extensions/Electron-SDK/issues/1110)) ([5730d86](https://github.com/AgoraIO-Extensions/Electron-SDK/commit/5730d86d136539d79f50b1e92ba9ec5049196488))
+* jira CSD-61288 renderer issue ([#1114](https://github.com/AgoraIO-Extensions/Electron-SDK/issues/1114)) ([fe50880](https://github.com/AgoraIO-Extensions/Electron-SDK/commit/fe50880466cf763dc5111bbff6cd5bcd2566ca21))
+* use `setTimeout` intead of `setInterval` ([#1097](https://github.com/AgoraIO-Extensions/Electron-SDK/issues/1097)) ([9df0579](https://github.com/AgoraIO-Extensions/Electron-SDK/commit/9df057989846e5e7e5fb4a00c6a1208f5728b9d8))
+
+
+### Features
+
+* suppot native 4.2.6 ([#1104](https://github.com/AgoraIO-Extensions/Electron-SDK/issues/1104)) ([e8be60b](https://github.com/AgoraIO-Extensions/Electron-SDK/commit/e8be60bc762db3aac50d025a674664fb9e21c0bd)), closes [#1102](https://github.com/AgoraIO-Extensions/Electron-SDK/issues/1102)
+
+## [4.2.6-rc.1](https://github.com/AgoraIO-Extensions/Electron-SDK/compare/v4.2.4...v4.2.6-rc.1) (2023-11-21)
 
 
 ### Bug Fixes
 
 * jira CSD-60920 render issue after ([#1110](https://github.com/AgoraIO-Extensions/Electron-SDK/issues/1110)) ([5730d86](https://github.com/AgoraIO-Extensions/Electron-SDK/commit/5730d86d136539d79f50b1e92ba9ec5049196488))
+* jira CSD-61288 CSD-60920 renderer issue ([341491d](https://github.com/AgoraIO-Extensions/Electron-SDK/commit/341491dfac72e1614df5ad32f0b40198d6a046dd))
 * use `setTimeout` intead of `setInterval` ([#1097](https://github.com/AgoraIO-Extensions/Electron-SDK/issues/1097)) ([9df0579](https://github.com/AgoraIO-Extensions/Electron-SDK/commit/9df057989846e5e7e5fb4a00c6a1208f5728b9d8))
 
 

package/js/Private/AgoraBase.js

@@ -1710,14 +1710,6 @@ var LocalVideoStreamError;
      * 10: (macOS and Windows only) The SDK cannot find the video device in the video device list. Check whether the ID of the video device is valid.
      */
     LocalVideoStreamError[LocalVideoStreamError["LocalVideoStreamErrorDeviceInvalidId"] = 10] = "LocalVideoStreamErrorDeviceInvalidId";
-    /**
-     * @ignore
-     */
-    LocalVideoStreamError[LocalVideoStreamError["LocalVideoStreamErrorDeviceInterrupt"] = 14] = "LocalVideoStreamErrorDeviceInterrupt";
-    /**
-     * @ignore
-     */
-    LocalVideoStreamError[LocalVideoStreamError["LocalVideoStreamErrorDeviceFatalError"] = 15] = "LocalVideoStreamErrorDeviceFatalError";
     /**
      * 101: The current video capture device is unavailable due to excessive system pressure.
      */

package/js/Private/AgoraMediaBase.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RecorderInfo = exports.MediaRecorderConfiguration = exports.RecorderErrorCode = exports.RecorderState = exports.MediaRecorderStreamType = exports.MediaRecorderContainerFormat = exports.ExternalVideoSourceType = exports.VideoFrameProcessMode = exports.UserAudioSpectrumInfo = exports.AudioSpectrumData = exports.AudioParams = exports.AudioFramePosition = exports.AudioFrame = exports.AudioFrameType = exports.VideoModulePosition = exports.MediaPlayerSourceType = exports.VideoFrame = exports.ExternalVideoFrame = exports.VideoBufferType = exports.EglContextType = exports.CameraVideoSourceType = exports.RenderModeType = exports.VideoPixelFormat = exports.AudioDualMonoMode = exports.AudioPcmFrame = exports.AudioEncodedFrameInfo = exports.PacketOptions = exports.ContentInspectConfig = exports.ContentInspectModule = exports.ContentInspectType = exports.ContentInspectResult = exports.MediaSourceType = exports.AudioDeviceInfo = exports.RawAudioFrameOpModeType = exports.AudioParameters = exports.BytesPerSample = exports.AudioRoute = exports.VideoSourceType = void 0;
+exports.RecorderInfo = exports.MediaRecorderConfiguration = exports.RecorderErrorCode = exports.RecorderState = exports.MediaRecorderStreamType = exports.MediaRecorderContainerFormat = exports.ExternalVideoSourceType = exports.VideoFrameProcessMode = exports.UserAudioSpectrumInfo = exports.AudioSpectrumData = exports.AudioParams = exports.AudioFramePosition = exports.AudioFrame = exports.AudioFrameType = exports.VideoModulePosition = exports.MediaPlayerSourceType = exports.VideoFrame = exports.ExternalVideoFrame = exports.VideoBufferType = exports.EglContextType = exports.CameraVideoSourceType = exports.RenderModeType = exports.VideoPixelFormat = exports.AudioDualMonoMode = exports.AudioPcmFrame = exports.AudioEncodedFrameInfo = exports.PacketOptions = exports.ContentInspectConfig = exports.ContentInspectModule = exports.ContentInspectType = exports.ContentInspectResult = exports.MediaSourceType = exports.RawAudioFrameOpModeType = exports.AudioParameters = exports.BytesPerSample = exports.AudioRoute = exports.VideoSourceType = void 0;
 require("./extension/AgoraMediaBaseExtension");
 /**
  * The type of the video source.
@@ -129,14 +129,6 @@ var AudioRoute;
      * 9: The audio route is Apple AirPlay. (For macOS only)
      */
     AudioRoute[AudioRoute["RouteAirplay"] = 9] = "RouteAirplay";
-    /**
-     * @ignore
-     */
-    AudioRoute[AudioRoute["RouteVirtual"] = 10] = "RouteVirtual";
-    /**
-     * @ignore
-     */
-    AudioRoute[AudioRoute["RouteContinuity"] = 11] = "RouteContinuity";
 })(AudioRoute = exports.AudioRoute || (exports.AudioRoute = {}));
 /**
  * @ignore
@@ -171,15 +163,6 @@ var RawAudioFrameOpModeType;
      */
     RawAudioFrameOpModeType[RawAudioFrameOpModeType["RawAudioFrameOpModeReadWrite"] = 2] = "RawAudioFrameOpModeReadWrite";
 })(RawAudioFrameOpModeType = exports.RawAudioFrameOpModeType || (exports.RawAudioFrameOpModeType = {}));
-/**
- * The AudioDeviceInfo class that contains the ID and device name of the audio devices.
- */
-var AudioDeviceInfo = /** @class */ (function () {
-    function AudioDeviceInfo() {
-    }
-    return AudioDeviceInfo;
-}());
-exports.AudioDeviceInfo = AudioDeviceInfo;
 /**
  * Media source type.
  */

package/js/Private/IAgoraRtcEngine.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.VideoDeviceInfo = exports.SDKBuildInfo = exports.VideoProfileType = exports.MediaDeviceStateType = exports.QualityReportFormatType = exports.IRtcEngine = exports.ExtensionInfo = exports.DirectCdnStreamingMediaOptions = exports.DirectCdnStreamingStats = exports.DirectCdnStreamingState = exports.DirectCdnStreamingError = exports.Metadata = exports.MaxMetadataSizeType = exports.MetadataType = exports.RtcEngineContext = exports.IVideoDeviceManager = exports.LeaveChannelOptions = exports.FeatureType = exports.ProxyType = exports.ChannelMediaOptions = exports.ImageTrackOptions = exports.AdvancedAudioOptions = exports.ScreenCaptureSourceInfo = exports.ScreenCaptureSourceType = exports.ThumbImageBuffer = exports.Size = exports.ScreenCaptureConfiguration = exports.CameraCapturerConfiguration = exports.CloudProxyType = exports.CameraDirection = exports.PublisherConfiguration = exports.RtmpStreamLifeCycleType = exports.InjectStreamConfig = exports.VideoCompositingLayout = exports.Region = exports.RemoteVideoStats = exports.RemoteAudioStats = exports.LocalVideoStats = exports.PriorityType = exports.StreamFallbackOptions = exports.AudioReverbType = exports.AudioEqualizationBandFrequency = exports.InjectStreamStatus = exports.AudioMixingReasonType = exports.AudioMixingStateType = exports.MediaDeviceType = void 0;
+exports.AudioDeviceInfo = exports.VideoDeviceInfo = exports.SDKBuildInfo = exports.VideoProfileType = exports.MediaDeviceStateType = exports.QualityReportFormatType = exports.IRtcEngine = exports.ExtensionInfo = exports.DirectCdnStreamingMediaOptions = exports.DirectCdnStreamingStats = exports.DirectCdnStreamingState = exports.DirectCdnStreamingError = exports.Metadata = exports.MaxMetadataSizeType = exports.MetadataType = exports.RtcEngineContext = exports.IVideoDeviceManager = exports.LeaveChannelOptions = exports.FeatureType = exports.ProxyType = exports.ChannelMediaOptions = exports.ImageTrackOptions = exports.AdvancedAudioOptions = exports.ScreenCaptureSourceInfo = exports.ScreenCaptureSourceType = exports.ThumbImageBuffer = exports.Size = exports.ScreenCaptureConfiguration = exports.CameraCapturerConfiguration = exports.CloudProxyType = exports.CameraDirection = exports.PublisherConfiguration = exports.RtmpStreamLifeCycleType = exports.InjectStreamConfig = exports.VideoCompositingLayout = exports.Region = exports.RemoteVideoStats = exports.RemoteAudioStats = exports.LocalVideoStats = exports.PriorityType = exports.StreamFallbackOptions = exports.AudioReverbType = exports.AudioEqualizationBandFrequency = exports.InjectStreamStatus = exports.AudioMixingReasonType = exports.AudioMixingStateType = exports.MediaDeviceType = void 0;
 require("./extension/IAgoraRtcEngineExtension");
 /**
  * Media device types.
@@ -1017,3 +1017,12 @@ var VideoDeviceInfo = /** @class */ (function () {
     return VideoDeviceInfo;
 }());
 exports.VideoDeviceInfo = VideoDeviceInfo;
+/**
+ * The AudioDeviceInfo class that contains the ID and device name of the audio devices.
+ */
+var AudioDeviceInfo = /** @class */ (function () {
+    function AudioDeviceInfo() {
+    }
+    return AudioDeviceInfo;
+}());
+exports.AudioDeviceInfo = AudioDeviceInfo;

package/js/Private/impl/IAgoraMediaPlayerImpl.js

@@ -212,24 +212,6 @@ var IMediaPlayerImpl = /** @class */ (function () {
     IMediaPlayerImpl.prototype.getApiTypeFromSelectAudioTrack = function (index) {
         return 'MediaPlayer_selectAudioTrack';
     };
-    IMediaPlayerImpl.prototype.selectMultiAudioTrack = function (playoutTrackIndex, publishTrackIndex) {
-        var apiType = this.getApiTypeFromSelectMultiAudioTrack(playoutTrackIndex, publishTrackIndex);
-        var jsonParams = {
-            playoutTrackIndex: playoutTrackIndex,
-            publishTrackIndex: publishTrackIndex,
-            toJSON: function () {
-                return {
-                    playoutTrackIndex: playoutTrackIndex,
-                    publishTrackIndex: publishTrackIndex,
-                };
-            },
-        };
-        var jsonResults = IrisApiEngine_1.callIrisApi.call(this, apiType, jsonParams);
-        return jsonResults.result;
-    };
-    IMediaPlayerImpl.prototype.getApiTypeFromSelectMultiAudioTrack = function (playoutTrackIndex, publishTrackIndex) {
-        return 'MediaPlayer_selectMultiAudioTrack';
-    };
     IMediaPlayerImpl.prototype.setPlayerOptionInInt = function (key, value) {
         var apiType = this.getApiTypeFromSetPlayerOptionInInt(key, value);
         var jsonParams = {

package/js/Private/impl/IAgoraRtcEngineImpl.js

@@ -340,11 +340,6 @@ function processIRtcEngineEventHandler(handler, event, jsonParams) {
                 handler.onAudioRoutingChanged(jsonParams.routing);
             }
             break;
-        case 'onAudioRoutingChanged':
-            if (handler.onAudioRoutingChanged !== undefined) {
-                handler.onAudioRoutingChanged(jsonParams.deviceType, jsonParams.routing);
-            }
-            break;
         case 'onChannelMediaRelayStateChanged':
             if (handler.onChannelMediaRelayStateChanged !== undefined) {
                 handler.onChannelMediaRelayStateChanged(jsonParams.state, jsonParams.code);
@@ -689,15 +684,6 @@ var IRtcEngineImpl = /** @class */ (function () {
     IRtcEngineImpl.prototype.getApiTypeFromQueryCodecCapability = function () {
         return 'RtcEngine_queryCodecCapability';
     };
-    IRtcEngineImpl.prototype.queryDeviceScore = function () {
-        var apiType = this.getApiTypeFromQueryDeviceScore();
-        var jsonParams = {};
-        var jsonResults = IrisApiEngine_1.callIrisApi.call(this, apiType, jsonParams);
-        return jsonResults.result;
-    };
-    IRtcEngineImpl.prototype.getApiTypeFromQueryDeviceScore = function () {
-        return 'RtcEngine_queryDeviceScore';
-    };
     IRtcEngineImpl.prototype.preloadChannel = function (token, channelId, uid) {
         var apiType = this.getApiTypeFromPreloadChannel(token, channelId, uid);
         var jsonParams = {

package/js/Private/internal/IrisApiEngine.js

@@ -262,7 +262,7 @@ function handleEvent() {
     }
     var event = _b[0], data = _b[1], buffers = _b[2];
     if (isDebuggable()) {
-        console.info('onEvent', event, data, buffers);
+        (0, Utils_1.logInfo)('onEvent', event, data, buffers);
     }
     var _event = event;
     var processor = Object.values(exports.EVENT_PROCESSORS).find(function (it) {
@@ -395,30 +395,30 @@ function callIrisApi(funcName, params) {
             var retObj = json_bigint_1.default.parse(ret);
             if (isDebuggable()) {
                 if (typeof retObj.result === 'number' && retObj.result < 0) {
-                    console.error('callApi', funcName, json_bigint_1.default.stringify(params), ret);
+                    (0, Utils_1.logError)('callApi', funcName, json_bigint_1.default.stringify(params), ret);
                 }
                 else {
-                    console.debug('callApi', funcName, json_bigint_1.default.stringify(params), ret);
+                    (0, Utils_1.logDebug)('callApi', funcName, json_bigint_1.default.stringify(params), ret);
                 }
             }
             return retObj;
         }
         else {
             if (isDebuggable()) {
-                console.error('callApi', funcName, json_bigint_1.default.stringify(params), callApiReturnCode);
+                (0, Utils_1.logError)('callApi', funcName, json_bigint_1.default.stringify(params), callApiReturnCode);
             }
             else {
-                console.warn('callApi', funcName, json_bigint_1.default.stringify(params), callApiReturnCode);
+                (0, Utils_1.logWarn)('callApi', funcName, json_bigint_1.default.stringify(params), callApiReturnCode);
             }
             return { result: callApiReturnCode };
         }
     }
     catch (e) {
         if (isDebuggable()) {
-            console.error('callApi', funcName, json_bigint_1.default.stringify(params), e);
+            (0, Utils_1.logError)('callApi', funcName, json_bigint_1.default.stringify(params), e);
         }
         else {
-            console.warn('callApi', funcName, json_bigint_1.default.stringify(params), e);
+            (0, Utils_1.logWarn)('callApi', funcName, json_bigint_1.default.stringify(params), e);
         }
     }
     return {};

package/js/Private/internal/MediaPlayerInternal.js

@@ -71,7 +71,7 @@ var MediaPlayerInternal = /** @class */ (function (_super) {
             _d[eventType] = undefined,
             _d))) {
             if (((_m = MediaPlayerInternal._audio_spectrum_observers.get(this._mediaPlayerId)) === null || _m === void 0 ? void 0 : _m.length) === 0) {
-                console.error('Please call `registerMediaPlayerAudioSpectrumObserver` before you want to receive event by `addListener`');
+                (0, Utils_1.logError)('Please call `registerMediaPlayerAudioSpectrumObserver` before you want to receive event by `addListener`');
                 return false;
             }
         }
@@ -188,27 +188,28 @@ var MediaPlayerInternal = /** @class */ (function (_super) {
         return 'MediaPlayer_setPlayerOption2';
     };
     MediaPlayerInternal.prototype.setView = function (view) {
-        var _a, _b;
-        (0, Utils_1.logWarn)('Also can use other api setupLocalVideo');
-        return ((_b = (_a = Utils_1.AgoraEnv.AgoraRendererManager) === null || _a === void 0 ? void 0 : _a.setupVideo({
-            videoSourceType: AgoraMediaBase_1.VideoSourceType.VideoSourceMediaPlayer,
-            uid: this._mediaPlayerId,
+        if (!Utils_1.AgoraEnv.AgoraRendererManager)
+            return -AgoraBase_1.ErrorCodeType.ErrNotInitialized;
+        var renderer = Utils_1.AgoraEnv.AgoraRendererManager.addOrRemoveRenderer({
+            sourceType: AgoraMediaBase_1.VideoSourceType.VideoSourceMediaPlayer,
+            mediaPlayerId: this._mediaPlayerId,
             view: view,
-        })) !== null && _b !== void 0 ? _b : -AgoraBase_1.ErrorCodeType.ErrNotInitialized);
+        });
+        if (!renderer)
+            return -AgoraBase_1.ErrorCodeType.ErrFailed;
+        return AgoraBase_1.ErrorCodeType.ErrOk;
     };
     MediaPlayerInternal.prototype.setRenderMode = function (renderMode) {
-        var _a, _b;
-        (0, Utils_1.logWarn)('Also can use other api setRenderOption or setRenderOptionByConfig');
-        return ((_b = (_a = Utils_1.AgoraEnv.AgoraRendererManager) === null || _a === void 0 ? void 0 : _a.setRenderOptionByConfig({
-            videoSourceType: AgoraMediaBase_1.VideoSourceType.VideoSourceMediaPlayer,
-            uid: this._mediaPlayerId,
-            rendererOptions: {
-                contentMode: renderMode === AgoraMediaBase_1.RenderModeType.RenderModeFit
-                    ? AgoraMediaBase_1.RenderModeType.RenderModeFit
-                    : AgoraMediaBase_1.RenderModeType.RenderModeHidden,
-                mirror: true,
-            },
-        })) !== null && _b !== void 0 ? _b : -AgoraBase_1.ErrorCodeType.ErrNotInitialized);
+        if (!Utils_1.AgoraEnv.AgoraRendererManager)
+            return -AgoraBase_1.ErrorCodeType.ErrNotInitialized;
+        var renderer = Utils_1.AgoraEnv.AgoraRendererManager.setRendererContext({
+            sourceType: AgoraMediaBase_1.VideoSourceType.VideoSourceMediaPlayer,
+            mediaPlayerId: this._mediaPlayerId,
+            renderMode: renderMode,
+        });
+        if (!renderer)
+            return -AgoraBase_1.ErrorCodeType.ErrFailed;
+        return AgoraBase_1.ErrorCodeType.ErrOk;
     };
     MediaPlayerInternal._source_observers = new Map();
     MediaPlayerInternal._audio_frame_observers = new Map();

package/js/Private/internal/RtcEngineExInternal.js

@@ -14,6 +14,17 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -48,7 +59,6 @@ var RtcEngineExInternal = /** @class */ (function (_super) {
         return _this;
     }
     RtcEngineExInternal.prototype.initialize = function (context) {
-        var _a;
         if (Utils_1.AgoraEnv.webEnvReady) {
             // @ts-ignore
             window.AgoraEnv = Utils_1.AgoraEnv;
@@ -57,7 +67,6 @@ var RtcEngineExInternal = /** @class */ (function (_super) {
                 Utils_1.AgoraEnv.AgoraRendererManager = new RendererManager();
             }
         }
-        (_a = Utils_1.AgoraEnv.AgoraRendererManager) === null || _a === void 0 ? void 0 : _a.enableRender();
         var ret = _super.prototype.initialize.call(this, context);
         IrisApiEngine_1.callIrisApi.call(this, 'RtcEngine_setAppType', {
             appType: 3,
@@ -68,7 +77,7 @@ var RtcEngineExInternal = /** @class */ (function (_super) {
         var _a;
         if (sync === void 0) { sync = false; }
         Utils_1.AgoraEnv.AgoraElectronBridge.ReleaseRenderer();
-        (_a = Utils_1.AgoraEnv.AgoraRendererManager) === null || _a === void 0 ? void 0 : _a.clear();
+        (_a = Utils_1.AgoraEnv.AgoraRendererManager) === null || _a === void 0 ? void 0 : _a.release();
         Utils_1.AgoraEnv.AgoraRendererManager = undefined;
         this._audio_device_manager.release();
         this._video_device_manager.release();
@@ -99,7 +108,7 @@ var RtcEngineExInternal = /** @class */ (function (_super) {
             _b[eventType] = undefined,
             _b))) {
             if (RtcEngineExInternal._direct_cdn_streaming_event_handler.length === 0) {
-                console.error('Please call `startDirectCdnStreaming` before you want to receive event by `addListener`');
+                (0, Utils_1.logError)('Please call `startDirectCdnStreaming` before you want to receive event by `addListener`');
                 return false;
             }
         }
@@ -107,7 +116,7 @@ var RtcEngineExInternal = /** @class */ (function (_super) {
             _c[eventType] = undefined,
             _c))) {
             if (RtcEngineExInternal._metadata_observer.length === 0) {
-                console.error('Please call `registerMediaMetadataObserver` before you want to receive event by `addListener`');
+                (0, Utils_1.logError)('Please call `registerMediaMetadataObserver` before you want to receive event by `addListener`');
                 return false;
             }
         }
@@ -115,7 +124,7 @@ var RtcEngineExInternal = /** @class */ (function (_super) {
             _d[eventType] = undefined,
             _d))) {
             if (RtcEngineExInternal._audio_encoded_frame_observers.length === 0) {
-                console.error('Please call `registerAudioEncodedFrameObserver` before you want to receive event by `addListener`');
+                (0, Utils_1.logError)('Please call `registerAudioEncodedFrameObserver` before you want to receive event by `addListener`');
                 return false;
             }
         }
@@ -213,7 +222,7 @@ var RtcEngineExInternal = /** @class */ (function (_super) {
     };
     RtcEngineExInternal.prototype.getApiTypeFromJoinChannel = function (token, channelId, uid, options) {
         if (Utils_1.AgoraEnv.AgoraRendererManager) {
-            Utils_1.AgoraEnv.AgoraRendererManager.defaultRenderConfig.channelId = channelId;
+            Utils_1.AgoraEnv.AgoraRendererManager.defaultChannelId = channelId;
         }
         return 'RtcEngine_joinChannel2';
     };
@@ -266,7 +275,7 @@ var RtcEngineExInternal = /** @class */ (function (_super) {
     };
     RtcEngineExInternal.prototype.getApiTypeFromJoinChannelWithUserAccount = function (token, channelId, userAccount, options) {
         if (Utils_1.AgoraEnv.AgoraRendererManager) {
-            Utils_1.AgoraEnv.AgoraRendererManager.defaultRenderConfig.channelId = channelId;
+            Utils_1.AgoraEnv.AgoraRendererManager.defaultChannelId = channelId;
         }
         return options === undefined
             ? 'RtcEngine_joinChannelWithUserAccount'
@@ -358,108 +367,85 @@ var RtcEngineExInternal = /** @class */ (function (_super) {
         return screenCaptureSources;
     };
     RtcEngineExInternal.prototype.setupLocalVideo = function (canvas) {
-        var _a, _b;
-        var _c = canvas.sourceType, sourceType = _c === void 0 ? AgoraMediaBase_1.VideoSourceType.VideoSourceCamera : _c, uid = canvas.uid, mediaPlayerId = canvas.mediaPlayerId, view = canvas.view, renderMode = canvas.renderMode, mirrorMode = canvas.mirrorMode;
-        if (sourceType === AgoraMediaBase_1.VideoSourceType.VideoSourceMediaPlayer &&
-            mediaPlayerId !== undefined) {
-            uid = mediaPlayerId;
-        }
-        return ((_b = (_a = Utils_1.AgoraEnv.AgoraRendererManager) === null || _a === void 0 ? void 0 : _a.setupLocalVideo({
-            videoSourceType: sourceType,
-            channelId: '',
-            uid: uid,
-            view: view,
-            rendererOptions: {
-                contentMode: renderMode,
-                mirror: mirrorMode === AgoraBase_1.VideoMirrorModeType.VideoMirrorModeEnabled,
-            },
-        })) !== null && _b !== void 0 ? _b : -AgoraBase_1.ErrorCodeType.ErrNotInitialized);
+        if (!Utils_1.AgoraEnv.AgoraRendererManager)
+            return -AgoraBase_1.ErrorCodeType.ErrNotInitialized;
+        var renderer = Utils_1.AgoraEnv.AgoraRendererManager.addOrRemoveRenderer(canvas);
+        if (!renderer)
+            return -AgoraBase_1.ErrorCodeType.ErrFailed;
+        return AgoraBase_1.ErrorCodeType.ErrOk;
     };
     RtcEngineExInternal.prototype.setupRemoteVideo = function (canvas) {
-        var _a, _b, _c, _d;
-        var _e = canvas.sourceType, sourceType = _e === void 0 ? AgoraMediaBase_1.VideoSourceType.VideoSourceRemote : _e, uid = canvas.uid, view = canvas.view, renderMode = canvas.renderMode, mirrorMode = canvas.mirrorMode;
-        return ((_d = (_a = Utils_1.AgoraEnv.AgoraRendererManager) === null || _a === void 0 ? void 0 : _a.setupRemoteVideo({
-            videoSourceType: sourceType,
-            channelId: (_c = (_b = Utils_1.AgoraEnv.AgoraRendererManager) === null || _b === void 0 ? void 0 : _b.defaultRenderConfig) === null || _c === void 0 ? void 0 : _c.channelId,
-            uid: uid,
-            view: view,
-            rendererOptions: {
-                contentMode: renderMode,
-                mirror: mirrorMode === AgoraBase_1.VideoMirrorModeType.VideoMirrorModeEnabled,
-            },
-        })) !== null && _d !== void 0 ? _d : -AgoraBase_1.ErrorCodeType.ErrNotInitialized);
+        if (!Utils_1.AgoraEnv.AgoraRendererManager)
+            return -AgoraBase_1.ErrorCodeType.ErrNotInitialized;
+        var renderer = Utils_1.AgoraEnv.AgoraRendererManager.addOrRemoveRenderer(canvas);
+        if (!renderer)
+            return -AgoraBase_1.ErrorCodeType.ErrFailed;
+        return AgoraBase_1.ErrorCodeType.ErrOk;
     };
     RtcEngineExInternal.prototype.setupRemoteVideoEx = function (canvas, connection) {
-        var _a, _b;
-        var _c = canvas.sourceType, sourceType = _c === void 0 ? AgoraMediaBase_1.VideoSourceType.VideoSourceRemote : _c, uid = canvas.uid, view = canvas.view, renderMode = canvas.renderMode, mirrorMode = canvas.mirrorMode;
-        var channelId = connection.channelId;
-        return ((_b = (_a = Utils_1.AgoraEnv.AgoraRendererManager) === null || _a === void 0 ? void 0 : _a.setupRemoteVideo({
-            videoSourceType: sourceType,
-            channelId: channelId,
-            uid: uid,
-            view: view,
-            rendererOptions: {
-                contentMode: renderMode,
-                mirror: mirrorMode === AgoraBase_1.VideoMirrorModeType.VideoMirrorModeEnabled,
-            },
-        })) !== null && _b !== void 0 ? _b : -AgoraBase_1.ErrorCodeType.ErrNotInitialized);
+        if (!Utils_1.AgoraEnv.AgoraRendererManager)
+            return -AgoraBase_1.ErrorCodeType.ErrNotInitialized;
+        var renderer = Utils_1.AgoraEnv.AgoraRendererManager.addOrRemoveRenderer(__assign(__assign({}, canvas), connection));
+        if (!renderer)
+            return -AgoraBase_1.ErrorCodeType.ErrFailed;
+        return AgoraBase_1.ErrorCodeType.ErrOk;
     };
     RtcEngineExInternal.prototype.setLocalRenderMode = function (renderMode, mirrorMode) {
-        var _a, _b;
         if (mirrorMode === void 0) { mirrorMode = AgoraBase_1.VideoMirrorModeType.VideoMirrorModeAuto; }
-        return ((_b = (_a = Utils_1.AgoraEnv.AgoraRendererManager) === null || _a === void 0 ? void 0 : _a.setRenderOptionByConfig({
-            videoSourceType: AgoraMediaBase_1.VideoSourceType.VideoSourceCamera,
-            channelId: '',
-            uid: 0,
-            rendererOptions: {
-                contentMode: renderMode,
-                mirror: mirrorMode === AgoraBase_1.VideoMirrorModeType.VideoMirrorModeEnabled,
-            },
-        })) !== null && _b !== void 0 ? _b : -AgoraBase_1.ErrorCodeType.ErrNotInitialized);
+        if (!Utils_1.AgoraEnv.AgoraRendererManager)
+            return -AgoraBase_1.ErrorCodeType.ErrNotInitialized;
+        var result = Utils_1.AgoraEnv.AgoraRendererManager.setRendererContext({
+            sourceType: AgoraMediaBase_1.VideoSourceType.VideoSourceCamera,
+            renderMode: renderMode,
+            mirrorMode: mirrorMode,
+        });
+        if (!result)
+            return -AgoraBase_1.ErrorCodeType.ErrFailed;
+        return AgoraBase_1.ErrorCodeType.ErrOk;
     };
     RtcEngineExInternal.prototype.setRemoteRenderMode = function (uid, renderMode, mirrorMode) {
-        var _a, _b, _c;
-        return ((_c = (_a = Utils_1.AgoraEnv.AgoraRendererManager) === null || _a === void 0 ? void 0 : _a.setRenderOptionByConfig({
-            videoSourceType: AgoraMediaBase_1.VideoSourceType.VideoSourceRemote,
-            channelId: (_b = Utils_1.AgoraEnv.AgoraRendererManager) === null || _b === void 0 ? void 0 : _b.defaultRenderConfig.channelId,
+        if (!Utils_1.AgoraEnv.AgoraRendererManager)
+            return -AgoraBase_1.ErrorCodeType.ErrNotInitialized;
+        var result = Utils_1.AgoraEnv.AgoraRendererManager.setRendererContext({
+            sourceType: AgoraMediaBase_1.VideoSourceType.VideoSourceRemote,
             uid: uid,
-            rendererOptions: {
-                contentMode: renderMode,
-                mirror: mirrorMode === AgoraBase_1.VideoMirrorModeType.VideoMirrorModeEnabled,
-            },
-        })) !== null && _c !== void 0 ? _c : -AgoraBase_1.ErrorCodeType.ErrNotInitialized);
+            renderMode: renderMode,
+            mirrorMode: mirrorMode,
+        });
+        if (!result)
+            return -AgoraBase_1.ErrorCodeType.ErrFailed;
+        return AgoraBase_1.ErrorCodeType.ErrOk;
     };
     RtcEngineExInternal.prototype.setRemoteRenderModeEx = function (uid, renderMode, mirrorMode, connection) {
-        var _a, _b;
-        var channelId = connection.channelId;
-        return ((_b = (_a = Utils_1.AgoraEnv.AgoraRendererManager) === null || _a === void 0 ? void 0 : _a.setRenderOptionByConfig({
-            videoSourceType: AgoraMediaBase_1.VideoSourceType.VideoSourceRemote,
-            channelId: channelId,
-            uid: uid,
-            rendererOptions: {
-                contentMode: renderMode,
-                mirror: mirrorMode === AgoraBase_1.VideoMirrorModeType.VideoMirrorModeEnabled,
-            },
-        })) !== null && _b !== void 0 ? _b : -AgoraBase_1.ErrorCodeType.ErrNotInitialized);
+        if (!Utils_1.AgoraEnv.AgoraRendererManager)
+            return -AgoraBase_1.ErrorCodeType.ErrNotInitialized;
+        var result = Utils_1.AgoraEnv.AgoraRendererManager.setRendererContext(__assign(__assign({ sourceType: AgoraMediaBase_1.VideoSourceType.VideoSourceRemote }, connection), { uid: uid, renderMode: renderMode, mirrorMode: mirrorMode }));
+        if (!result)
+            return -AgoraBase_1.ErrorCodeType.ErrFailed;
+        return AgoraBase_1.ErrorCodeType.ErrOk;
     };
     RtcEngineExInternal.prototype.setLocalVideoMirrorMode = function (mirrorMode) {
-        var _a, _b;
-        return ((_b = (_a = Utils_1.AgoraEnv.AgoraRendererManager) === null || _a === void 0 ? void 0 : _a.setRenderOptionByConfig({
-            videoSourceType: AgoraMediaBase_1.VideoSourceType.VideoSourceCamera,
-            channelId: '',
-            uid: 0,
-            rendererOptions: {
-                mirror: mirrorMode === AgoraBase_1.VideoMirrorModeType.VideoMirrorModeEnabled,
-            },
-        })) !== null && _b !== void 0 ? _b : -AgoraBase_1.ErrorCodeType.ErrNotInitialized);
+        if (!Utils_1.AgoraEnv.AgoraRendererManager)
+            return -AgoraBase_1.ErrorCodeType.ErrNotInitialized;
+        var result = Utils_1.AgoraEnv.AgoraRendererManager.setRendererContext({
+            sourceType: AgoraMediaBase_1.VideoSourceType.VideoSourceCamera,
+            mirrorMode: mirrorMode,
+        });
+        if (!result)
+            return -AgoraBase_1.ErrorCodeType.ErrFailed;
+        return AgoraBase_1.ErrorCodeType.ErrOk;
     };
     RtcEngineExInternal.prototype.destroyRendererByView = function (view) {
         var _a;
-        (_a = Utils_1.AgoraEnv.AgoraRendererManager) === null || _a === void 0 ? void 0 : _a.destroyRendererByView(view);
+        (_a = Utils_1.AgoraEnv.AgoraRendererManager) === null || _a === void 0 ? void 0 : _a.removeRendererFromCache({ view: view });
     };
-    RtcEngineExInternal.prototype.destroyRendererByConfig = function (videoSourceType, channelId, uid) {
+    RtcEngineExInternal.prototype.destroyRendererByConfig = function (sourceType, channelId, uid) {
         var _a;
-        (_a = Utils_1.AgoraEnv.AgoraRendererManager) === null || _a === void 0 ? void 0 : _a.destroyRenderersByConfig(videoSourceType, channelId, uid);
+        (_a = Utils_1.AgoraEnv.AgoraRendererManager) === null || _a === void 0 ? void 0 : _a.removeRendererFromCache({
+            sourceType: sourceType,
+            channelId: channelId,
+            uid: uid,
+        });
     };
     RtcEngineExInternal._event_handlers = [];
     RtcEngineExInternal._direct_cdn_streaming_event_handler = [];

package/js/Private/ti/IAgoraRtcEngine-ti.js

@@ -97,7 +97,6 @@ exports.IRtcEngineEventHandler = t.iface([], {
     "onRtmpStreamingEvent": t.opt(t.func("void", t.param("url", "string"), t.param("eventCode", "RtmpStreamingEvent"))),
     "onTranscodingUpdated": t.opt(t.func("void")),
     "onAudioRoutingChanged": t.opt(t.func("void", t.param("routing", "number"))),
-    "onAudioRoutingChanged": t.opt(t.func("void", t.param("deviceType", "number"), t.param("routing", "number"))),
     "onChannelMediaRelayStateChanged": t.opt(t.func("void", t.param("state", "ChannelMediaRelayState"), t.param("code", "ChannelMediaRelayError"))),
     "onChannelMediaRelayEvent": t.opt(t.func("void", t.param("code", "ChannelMediaRelayEvent"))),
     "onLocalPublishFallbackToAudioOnly": t.opt(t.func("void", t.param("isFallbackOrRecover", "boolean"))),

package/js/Renderer/AgoraView.js

@@ -15,6 +15,7 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
+var AgoraBase_1 = require("../Private/AgoraBase");
 var AgoraMediaBase_1 = require("../Private/AgoraMediaBase");
 var Utils_1 = require("../Utils");
 var VIDEO_SOURCE_TYPE_STRING = 'video-source-type';
@@ -35,22 +36,29 @@ var AgoraView = /** @class */ (function (_super) {
         var _this = _super.call(this) || this;
         _this.isConnectedCallback = false;
         _this.initializeRender = function () {
-            var _a, _b;
-            (_a = Utils_1.AgoraEnv.AgoraRendererManager) === null || _a === void 0 ? void 0 : _a.destroyRendererByView(_this);
-            (_b = Utils_1.AgoraEnv.AgoraRendererManager) === null || _b === void 0 ? void 0 : _b.setupVideo({
-                videoSourceType: _this.videoSourceType,
+            var _a;
+            var _b = _this, channelId = _b.channelId, uid = _b.uid, sourceType = _b.sourceType, renderMode = _b.renderMode, renderMirror = _b.renderMirror;
+            (_a = Utils_1.AgoraEnv.AgoraRendererManager) === null || _a === void 0 ? void 0 : _a.addOrRemoveRenderer({
+                sourceType: sourceType,
                 view: _this,
-                uid: _this.uid,
-                channelId: _this.channelId,
-                rendererOptions: {
-                    mirror: _this.renderMirror,
-                    contentMode: _this.renderContentMode,
-                },
+                uid: uid,
+                channelId: channelId,
+                renderMode: renderMode,
+                mirrorMode: renderMirror
+                    ? AgoraBase_1.VideoMirrorModeType.VideoMirrorModeEnabled
+                    : AgoraBase_1.VideoMirrorModeType.VideoMirrorModeDisabled,
+                setupMode: AgoraBase_1.VideoViewSetupMode.VideoViewSetupReplace,
             });
         };
         _this.destroyRender = function () {
             var _a;
-            (_a = Utils_1.AgoraEnv.AgoraRendererManager) === null || _a === void 0 ? void 0 : _a.destroyRendererByView(_this);
+            var _b = _this, channelId = _b.channelId, uid = _b.uid, sourceType = _b.sourceType;
+            (_a = Utils_1.AgoraEnv.AgoraRendererManager) === null || _a === void 0 ? void 0 : _a.removeRendererFromCache({
+                channelId: channelId,
+                uid: uid,
+                sourceType: sourceType,
+                view: _this,
+            });
         };
         return _this;
     }
@@ -61,7 +69,7 @@ var AgoraView = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(AgoraView.prototype, "videoSourceType", {
+    Object.defineProperty(AgoraView.prototype, "sourceType", {
         get: function () {
             var number = Number(this.getAttribute(VIDEO_SOURCE_TYPE_STRING));
             return isNaN(number) ? 0 : number;
@@ -108,7 +116,7 @@ var AgoraView = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(AgoraView.prototype, "renderContentMode", {
+    Object.defineProperty(AgoraView.prototype, "renderMode", {
         get: function () {
             var number = Number(this.getAttribute(RENDERER_CONTENT_MODE_STRING) ||
                 AgoraMediaBase_1.RenderModeType.RenderModeFit);
@@ -154,7 +162,13 @@ var AgoraView = /** @class */ (function (_super) {
             RENDERER_MIRROR_STRING,
         ].includes(attrName);
         if (isSetRenderOption) {
-            (_a = Utils_1.AgoraEnv.AgoraRendererManager) === null || _a === void 0 ? void 0 : _a.setRenderOption(this, this.renderContentMode, this.renderMirror);
+            (_a = Utils_1.AgoraEnv.AgoraRendererManager) === null || _a === void 0 ? void 0 : _a.setRendererContext({
+                view: this,
+                renderMode: this.renderMode,
+                mirrorMode: this.renderMirror
+                    ? AgoraBase_1.VideoMirrorModeType.VideoMirrorModeEnabled
+                    : AgoraBase_1.VideoMirrorModeType.VideoMirrorModeDisabled,
+            });
             return;
         }
         var isNeedReInitialize = observedAttributes.includes(attrName);