trtc-electron-sdk 13.3.801 → 13.3.802-beta.1

package/liteav/extensions/MediaMixingManager/MediaMixingManager.d.ts

@@ -54,6 +54,8 @@ export declare enum TRTCMediaMixingEvent {
     onError = "onError",
     /**
      * @description 设备插入事件
+     * @deprecated
+     * @private
      *
      * @event TRTCMediaMixingEvent#onSourcePlugged
      * @param {TRTCPhoneMirrorParam} source 投屏手机状态信息
@@ -62,6 +64,8 @@ export declare enum TRTCMediaMixingEvent {
     onSourcePlugged = "onSourcePlugged",
     /**
      * @description 设备链接事件
+     * @deprecated
+     * @private
      *
      * @event TRTCMediaMixingEvent#onSourceConnected
      * @param {TRTCPhoneMirrorParam} source 投屏手机状态信息
@@ -70,6 +74,8 @@ export declare enum TRTCMediaMixingEvent {
     onSourceConnected = "onSourceConnected",
     /**
      * @description 设备断开链接事件
+     * @deprecated
+     * @private
      *
      * @event TRTCMediaMixingEvent#onSourceDisconnected
      * @param {TRTCPhoneMirrorParam} source 投屏手机状态信息
@@ -78,6 +84,8 @@ export declare enum TRTCMediaMixingEvent {
     onSourceDisconnected = "onSourceDisconnected",
     /**
      * @description 设备拔出事件
+     * @deprecated
+     * @private
      *
      * @event TRTCMediaMixingEvent#onSourceUnplugged
      * @param {TRTCPhoneMirrorParam} source 投屏手机状态信息
@@ -95,6 +103,13 @@ export declare enum TRTCMediaMixingEvent {
      * @param {Number} size.height 媒体源最新高度
      */
     onMediaSourceSizeChanged = "onMediaSourceSizeChanged",
+    /**
+     * @description 本地混流服务丢失事件
+     * @deprecated
+     * @private
+     *
+     * @event TRTCMediaMixingEvent#onMediaMixingServerLost
+     */
     onMediaMixingServerLost = "onMediaMixingServerLost"
 }
 declare enum TRTCMediaMixingServerMode {
@@ -241,13 +256,6 @@ export declare class TRTCMediaMixingManager implements ITRTCMediaMixingManager {
      * @returns {Promise<void>}
      */
     addMediaSource(mediaSource: TRTCMediaSource): Promise<void>;
-    /**
-     * Returns the per-sourceType timeout (ms) used by addMediaSource. The
-     * defaults are intentionally larger than the cpp-layer timeout in
-     * SourceManagerProxy so that, in the normal case, the cpp side resolves the
-     * promise first. This JS timer is the last-resort safety net in case the
-     * cpp side itself fails to emit any callback (older builds, ipc lost, etc.).
-     */
     private getAddMediaSourceTimeoutMs;
     /**
      * 删除本地混流媒体源
@@ -265,12 +273,17 @@ export declare class TRTCMediaMixingManager implements ITRTCMediaMixingManager {
     updateMediaSource(mediaSource: TRTCMediaSource): Promise<void>;
     /**
      * 设置摄像头采集参数
+     *
+     * @deprecated 请使用 `addMediaSource` 或 `updateMediaSource` 代替
+     *
      * @param cameraID {string} - 摄像头 ID
      * @param params {TRTCCameraCaptureParams} - 摄像头采集参数
      */
     setCameraCaptureParam(cameraID: string, params: TRTCCameraCaptureParams): void;
     /**
      * 设置手机投屏参数
+     *
+     * @deprecated
      * @private
      * @param phoneMirrorSourceId {string} - 手机投屏媒体源 ID
      * @param param {TRTCPhoneMirrorParam} - 手机投屏参数
@@ -278,18 +291,27 @@ export declare class TRTCMediaMixingManager implements ITRTCMediaMixingManager {
     setPhoneMirrorParam(phoneMirrorSourceId: string, param: TRTCPhoneMirrorParam): void;
     /**
      * 设置屏幕采集参数
+     *
+     * @deprecated 请使用 `addMediaSource` 或 `updateMediaSource` 代替
+     *
      * @param screenOrWindowID {String} - 屏幕 ID 或 窗口 ID
      * @param property {TRTCScreenCaptureProperty} - 屏幕采集属性
      */
     setScreenCaptureProperty(screenOrWindowID: string, property: TRTCScreenCaptureProperty): void;
     /**
      * 设置在线视频源播放参数
+     *
+     * @deprecated 请使用 `addMediaSource` 或 `updateMediaSource` 代替
+     *
      * @param url {string} - 在线视频源 URL
      * @param param {TRTCOnlineVideoParam} - 在线视频源播放参数
      */
     setOnlineVideoParam(url: string, param: TRTCOnlineVideoParam): void;
     /**
      * 设置视频文件播放参数
+     *
+     * @deprecated 请使用 `addMediaSource` 或 `updateMediaSource` 代替
+     *
      * @param videoFilePath {string} - 视频文件路径
      * @param param {TRTCVideoFileParam} - 视频文件播放参数
      */
@@ -458,6 +480,58 @@ export declare class TRTCMediaMixingManager implements ITRTCMediaMixingManager {
     private onCallExperimentalAPIFinish;
     private recoverMediaMixingServer;
     private onDevicePixelRatioChange;
+    /**
+     * @private
+     * Apply camera capture params BEFORE native addMediaSource.
+     *
+     * Calling setCameraCaptureParam after the camera has already been added
+     * triggers an extra camera restart (the camera first starts with default
+     * params and then restarts with the new ones). To avoid this we set
+     * camera params up-front for the add path. For all other source types
+     * the corresponding setters are dispatched in the post-add callback
+     * (`onMediaSourceAdded` -> `_applyMediaSourceParams`).
+     */
+    private _applyCameraParamsBeforeAdd;
+    /**
+     * @private
+     * Apply capture params from TRTCMediaSource to the native plugin.
+     *
+     * This method is called after media source is added or updated. To avoid
+     * costly side-effects of native setters (e.g. setCameraCaptureParam will
+     * restart the camera), the setter is invoked only when params are actually
+     * provided AND differ from the previous value carried by `oldMediaSource`.
+     *
+     * Camera handling differs by phase:
+     *   - Add path (oldMediaSource is undefined): camera params have been set
+     *     before native addMediaSource via `_applyCameraParamsBeforeAdd`, so
+     *     this method skips kCamera to avoid duplicate setter invocation.
+     *   - Update path (oldMediaSource is provided): kCamera goes through the
+     *     same diff check as other types and is dispatched only when changed.
+     *
+     * @param mediaSource - The new media source carrying capture params.
+     * @param oldMediaSource - The previous media source (omit for the add path
+     *                         where no previous params exist; in that case the
+     *                         setter is always invoked when params are present).
+     */
+    private _applyMediaSourceParams;
+    /**
+     * @private
+     * Shallow-but-stable equality check on capture param objects via JSON.
+     *
+     * Returns true when both sides represent the "same" params, false otherwise.
+     * Semantics:
+     *   - both empty (undefined / null) → true (no change requested)
+     *   - exactly one side empty → false (first-time apply or transition)
+     *   - both non-empty → byte-equal after JSON.stringify
+     *
+     * Note: JSON.stringify is sensitive to key ordering. Capture param objects
+     * carried by `TRTCMediaSource` are constructed by the SDK via
+     * `JSON.parse(JSON.stringify(...))` flow, so key order is stable in
+     * practice; for caller-supplied literal objects with unstable key order,
+     * the comparison may yield a false-negative and trigger an unnecessary
+     * setter call.
+     */
+    private _isSameCaptureParams;
     private previewInNativeWindow;
     private previewInWebElement;
     private previewInNone;

package/liteav/extensions/MediaMixingManager/MediaMixingManager.js

@@ -92,6 +92,21 @@ const TRTCMediaSourceType_HACK_JSDOC = {
  *
  */
 const TRTCPhoneMirrorParam_HACK_JSDOC = null;
+/**
+ * 在线视频播放参数
+ *
+ * @typedef {Object} TRTCOnlineVideoParam
+ * @property {Number} networkCacheSizeKB 网络缓存大小，单位 KB
+ * @property {Number} playoutVolume 播放音量，取值 0 - 100
+ */
+const TRTCOnlineVideoParam_HACK_JSDOC = null;
+/**
+ * 本地视频文件播放参数
+ *
+ * @typedef {Object} TRTCVideoFileParam
+ * @property {Number} playoutVolume 播放音量，取值 0 - 100
+ */
+const TRTCVideoFileParam_HACK_JSDOC = null;
 /**
  * 媒体源数据
  *
@@ -99,12 +114,16 @@ const TRTCPhoneMirrorParam_HACK_JSDOC = null;
  * @property {TRTCMediaSourceType} sourceType 媒体源类型
  * @property {String} sourceId 媒体源唯一 ID
  * @property {Number} zOrder 媒体源展示层级，取值 0 - 15
+ * @property {Boolean} enableGreenScreen 是否开启绿幕（仅在 sourceType 为 kCamera 时生效），可选属性
  * @property {Rect} rect 媒体源显示区域
  * @property {Boolean} isSelected 媒体源是否选中，可选属性，默认：false
  * @property {TRTCVideoRotation} rotation 媒体源选中角度，可选属性
  * @property {TRTCVideoFillMode} fillMode 媒体源显示模式，可选属性，默认 `TRTCVideoFillMode_Fit`
  * @property {TRTCVideoMirrorType} mirrorType 媒体源是否镜像，可选属性，默认不镜像
- * @property {TRTCPhoneMirrorConnectionParam} connectionParam 手机投屏类型媒体源，连接参数
+ * @property {TRTCCameraCaptureParams} camera 摄像头采集参数，仅在 sourceType 为 kCamera 时生效，可选属性
+ * @property {TRTCScreenCaptureProperty} screen 屏幕/窗口采集属性，仅在 sourceType 为 kScreen 时生效，可选属性
+ * @property {TRTCVideoFileParam} localVideo 本地视频文件播放参数，仅在 sourceType 为 kVideoFile 时生效，可选属性
+ * @property {TRTCOnlineVideoParam} onlineVideo 在线视频播放参数，仅在 sourceType 为 kOnlineVideo 时生效，可选属性
  */
 const TRTCMediaSource_HACK_JSDOC = null;
 /**
@@ -133,20 +152,20 @@ const TRTCStreamLayoutMode_HACK_JSDOC = {
  * 单路连麦视频流布局信息
  *
  * 本地混流高性能渲染模式下，单路视频流布局信息
- * @typedef {Object} TRTCStreamInfo
+ * @typedef {Object} TRTCUserStream
  * @property {String} userId 用户 ID，本地用户需填空字符长
  * @property {TRTCVideoFillMode} fillMode 视频填充模式
  * @property {Rect} rect 视频流显示区域
  * @property {Number} zOrder 视频流展示层级，取值 0 - 15
  */
-const TRTCStreamInfo_HACK_JSDOC = null;
+const TRTCUserStream_HACK_JSDOC = null;
 /**
  * 连麦视频流布局信息
  *
  * 本地混流高性能渲染模式下，所有视频流布局信息
  * @typedef {Object} TRTCStreamLayout
  * @property {TRTCStreamLayoutMode} layoutMode 布局模式
- * @property {Array<TRTCStreamInfo>} userList 非必填，用户视频流布局
+ * @property {Array<TRTCUserStream>} userList 非必填，用户视频流布局
  */
 const TRTCStreamLayout_HACK_JSDOC = null;
 const initResolutionMap = () => {
@@ -217,6 +236,8 @@ var TRTCMediaMixingEvent;
     TRTCMediaMixingEvent["onError"] = "onError";
     /**
      * @description 设备插入事件
+     * @deprecated
+     * @private
      *
      * @event TRTCMediaMixingEvent#onSourcePlugged
      * @param {TRTCPhoneMirrorParam} source 投屏手机状态信息
@@ -225,6 +246,8 @@ var TRTCMediaMixingEvent;
     TRTCMediaMixingEvent["onSourcePlugged"] = "onSourcePlugged";
     /**
      * @description 设备链接事件
+     * @deprecated
+     * @private
      *
      * @event TRTCMediaMixingEvent#onSourceConnected
      * @param {TRTCPhoneMirrorParam} source 投屏手机状态信息
@@ -233,6 +256,8 @@ var TRTCMediaMixingEvent;
     TRTCMediaMixingEvent["onSourceConnected"] = "onSourceConnected";
     /**
      * @description 设备断开链接事件
+     * @deprecated
+     * @private
      *
      * @event TRTCMediaMixingEvent#onSourceDisconnected
      * @param {TRTCPhoneMirrorParam} source 投屏手机状态信息
@@ -241,6 +266,8 @@ var TRTCMediaMixingEvent;
     TRTCMediaMixingEvent["onSourceDisconnected"] = "onSourceDisconnected";
     /**
      * @description 设备拔出事件
+     * @deprecated
+     * @private
      *
      * @event TRTCMediaMixingEvent#onSourceUnplugged
      * @param {TRTCPhoneMirrorParam} source 投屏手机状态信息
@@ -258,6 +285,13 @@ var TRTCMediaMixingEvent;
      * @param {Number} size.height 媒体源最新高度
      */
     TRTCMediaMixingEvent["onMediaSourceSizeChanged"] = "onMediaSourceSizeChanged";
+    /**
+     * @description 本地混流服务丢失事件
+     * @deprecated
+     * @private
+     *
+     * @event TRTCMediaMixingEvent#onMediaMixingServerLost
+     */
     TRTCMediaMixingEvent["onMediaMixingServerLost"] = "onMediaMixingServerLost";
 })(TRTCMediaMixingEvent = exports.TRTCMediaMixingEvent || (exports.TRTCMediaMixingEvent = {}));
 const promiseKeys = {
@@ -598,6 +632,10 @@ class TRTCMediaMixingManager {
                     }
                 }, timeoutMs);
                 this.addMediaSourceTimers.set(key, timer);
+                // Apply camera capture params BEFORE native addMediaSource to avoid an
+                // extra camera restart on first add. Other source types are handled in
+                // the onMediaSourceAdded callback once the C++ layer reports success.
+                this._applyCameraParamsBeforeAdd(newMediaSource);
                 this.nodeMediaMixingPlugin.addMediaSource(newMediaSource);
                 (_a = this.mediaMixingDesigner) === null || _a === void 0 ? void 0 : _a.addMedia({
                     id: `${newMediaSource.sourceType}__${newMediaSource.sourceId}`,
@@ -610,13 +648,6 @@ class TRTCMediaMixingManager {
             });
         });
     }
-    /**
-     * Returns the per-sourceType timeout (ms) used by addMediaSource. The
-     * defaults are intentionally larger than the cpp-layer timeout in
-     * SourceManagerProxy so that, in the normal case, the cpp side resolves the
-     * promise first. This JS timer is the last-resort safety net in case the
-     * cpp side itself fails to emit any callback (older builds, ipc lost, etc.).
-     */
     getAddMediaSourceTimeoutMs(sourceType) {
         switch (sourceType) {
             case types_1.TRTCMediaSourceType.kOnlineVideo:
@@ -701,6 +732,7 @@ class TRTCMediaMixingManager {
                 }
             }
             yield this.nodeMediaMixingPlugin.updateMediaSource(newMediaSource);
+            this._applyMediaSourceParams(newMediaSource, this.sourceList[index]);
             (_a = this.mediaMixingDesigner) === null || _a === void 0 ? void 0 : _a.updateMedia({
                 id: `${mediaSource.sourceType}__${mediaSource.sourceId}`,
                 rect: mediaSource.rect,
@@ -713,6 +745,9 @@ class TRTCMediaMixingManager {
     }
     /**
      * 设置摄像头采集参数
+     *
+     * @deprecated 请使用 `addMediaSource` 或 `updateMediaSource` 代替
+     *
      * @param cameraID {string} - 摄像头 ID
      * @param params {TRTCCameraCaptureParams} - 摄像头采集参数
      */
@@ -731,6 +766,8 @@ class TRTCMediaMixingManager {
     }
     /**
      * 设置手机投屏参数
+     *
+     * @deprecated
      * @private
      * @param phoneMirrorSourceId {string} - 手机投屏媒体源 ID
      * @param param {TRTCPhoneMirrorParam} - 手机投屏参数
@@ -740,6 +777,9 @@ class TRTCMediaMixingManager {
     }
     /**
      * 设置屏幕采集参数
+     *
+     * @deprecated 请使用 `addMediaSource` 或 `updateMediaSource` 代替
+     *
      * @param screenOrWindowID {String} - 屏幕 ID 或 窗口 ID
      * @param property {TRTCScreenCaptureProperty} - 屏幕采集属性
      */
@@ -748,6 +788,9 @@ class TRTCMediaMixingManager {
     }
     /**
      * 设置在线视频源播放参数
+     *
+     * @deprecated 请使用 `addMediaSource` 或 `updateMediaSource` 代替
+     *
      * @param url {string} - 在线视频源 URL
      * @param param {TRTCOnlineVideoParam} - 在线视频源播放参数
      */
@@ -756,6 +799,9 @@ class TRTCMediaMixingManager {
     }
     /**
      * 设置视频文件播放参数
+     *
+     * @deprecated 请使用 `addMediaSource` 或 `updateMediaSource` 代替
+     *
      * @param videoFilePath {string} - 视频文件路径
      * @param param {TRTCVideoFileParam} - 视频文件播放参数
      */
@@ -1294,6 +1340,13 @@ class TRTCMediaMixingManager {
         }
         let flag = false;
         if (data.errCode === 0) {
+            const addedIndex = this.findMediaSourceIndex({
+                sourceId: data.sourceId,
+                sourceType: data.sourceType,
+            });
+            if (addedIndex !== -1) {
+                this._applyMediaSourceParams(this.sourceList[addedIndex]);
+            }
             flag = this.promiseStore.resolvePromise(promiseKey, undefined);
         }
         else {
@@ -1456,6 +1509,7 @@ class TRTCMediaMixingManager {
                     this.setStreamLayout(this.paramsStore.streamLayout);
                 }
                 this.sourceList.forEach((item) => {
+                    this._applyCameraParamsBeforeAdd(item);
                     this.nodeMediaMixingPlugin.addMediaSource(item);
                 });
                 if (((_b = this.trtcParamsStore) === null || _b === void 0 ? void 0 : _b.enterRoomParams) && ((_c = this.trtcParamsStore) === null || _c === void 0 ? void 0 : _c.enterRoomScene)) {
@@ -1497,7 +1551,108 @@ class TRTCMediaMixingManager {
         logger_1.default.debug(`${this.logPrefix}onDevicePixelRatioChange:`, window.devicePixelRatio);
         this.setDisplayRect();
     }
+    /**
+     * @private
+     * Apply camera capture params BEFORE native addMediaSource.
+     *
+     * Calling setCameraCaptureParam after the camera has already been added
+     * triggers an extra camera restart (the camera first starts with default
+     * params and then restarts with the new ones). To avoid this we set
+     * camera params up-front for the add path. For all other source types
+     * the corresponding setters are dispatched in the post-add callback
+     * (`onMediaSourceAdded` -> `_applyMediaSourceParams`).
+     */
+    _applyCameraParamsBeforeAdd(mediaSource) {
+        if (mediaSource.sourceType === types_1.TRTCMediaSourceType.kCamera && mediaSource.camera) {
+            this.setCameraCaptureParam(mediaSource.sourceId, mediaSource.camera);
+        }
+    }
+    /**
+     * @private
+     * Apply capture params from TRTCMediaSource to the native plugin.
+     *
+     * This method is called after media source is added or updated. To avoid
+     * costly side-effects of native setters (e.g. setCameraCaptureParam will
+     * restart the camera), the setter is invoked only when params are actually
+     * provided AND differ from the previous value carried by `oldMediaSource`.
+     *
+     * Camera handling differs by phase:
+     *   - Add path (oldMediaSource is undefined): camera params have been set
+     *     before native addMediaSource via `_applyCameraParamsBeforeAdd`, so
+     *     this method skips kCamera to avoid duplicate setter invocation.
+     *   - Update path (oldMediaSource is provided): kCamera goes through the
+     *     same diff check as other types and is dispatched only when changed.
+     *
+     * @param mediaSource - The new media source carrying capture params.
+     * @param oldMediaSource - The previous media source (omit for the add path
+     *                         where no previous params exist; in that case the
+     *                         setter is always invoked when params are present).
+     */
+    _applyMediaSourceParams(mediaSource, oldMediaSource) {
+        switch (mediaSource.sourceType) {
+            case types_1.TRTCMediaSourceType.kCamera:
+                // Skip kCamera on the add path to avoid an extra camera restart;
+                // it has been handled by `_applyCameraParamsBeforeAdd` already.
+                if (oldMediaSource && mediaSource.camera && !this._isSameCaptureParams(mediaSource.camera, oldMediaSource.camera)) {
+                    this.setCameraCaptureParam(mediaSource.sourceId, mediaSource.camera);
+                }
+                break;
+            case types_1.TRTCMediaSourceType.kScreen:
+                if (mediaSource.screen && !this._isSameCaptureParams(mediaSource.screen, oldMediaSource === null || oldMediaSource === void 0 ? void 0 : oldMediaSource.screen)) {
+                    this.setScreenCaptureProperty(mediaSource.sourceId, mediaSource.screen);
+                }
+                break;
+            case types_1.TRTCMediaSourceType.kOnlineVideo:
+                if (mediaSource.onlineVideo && !this._isSameCaptureParams(mediaSource.onlineVideo, oldMediaSource === null || oldMediaSource === void 0 ? void 0 : oldMediaSource.onlineVideo)) {
+                    this.setOnlineVideoParam(mediaSource.sourceId, mediaSource.onlineVideo);
+                }
+                break;
+            case types_1.TRTCMediaSourceType.kVideoFile:
+                if (mediaSource.localVideo && !this._isSameCaptureParams(mediaSource.localVideo, oldMediaSource === null || oldMediaSource === void 0 ? void 0 : oldMediaSource.localVideo)) {
+                    this.setVideoFileParam(mediaSource.sourceId, mediaSource.localVideo);
+                }
+                break;
+        }
+    }
+    /**
+     * @private
+     * Shallow-but-stable equality check on capture param objects via JSON.
+     *
+     * Returns true when both sides represent the "same" params, false otherwise.
+     * Semantics:
+     *   - both empty (undefined / null) → true (no change requested)
+     *   - exactly one side empty → false (first-time apply or transition)
+     *   - both non-empty → byte-equal after JSON.stringify
+     *
+     * Note: JSON.stringify is sensitive to key ordering. Capture param objects
+     * carried by `TRTCMediaSource` are constructed by the SDK via
+     * `JSON.parse(JSON.stringify(...))` flow, so key order is stable in
+     * practice; for caller-supplied literal objects with unstable key order,
+     * the comparison may yield a false-negative and trigger an unnecessary
+     * setter call.
+     */
+    _isSameCaptureParams(next, prev) {
+        if (next === prev) {
+            return true;
+        }
+        const nextEmpty = next === undefined || next === null;
+        const prevEmpty = prev === undefined || prev === null;
+        if (nextEmpty && prevEmpty) {
+            return true;
+        }
+        if (nextEmpty || prevEmpty) {
+            return false;
+        }
+        try {
+            return JSON.stringify(next) === JSON.stringify(prev);
+        }
+        catch (err) {
+            logger_1.default.warn(`${this.logPrefix}_isSameCaptureParams: stringify failed, treat as different.`, err);
+            return false;
+        }
+    }
     previewInNativeWindow(viewOrRegion) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             if (this.serverMode === TRTCMediaMixingServerMode.Embedded && (this.serverStatus === TRTCMediaMixingServerStatus.Started || this.serverStatus === TRTCMediaMixingServerStatus.Starting)) {
                 try {
@@ -1530,9 +1685,15 @@ class TRTCMediaMixingManager {
                 this.destroyDesigner();
                 this.nodeMediaMixingPlugin.setDisplayParams(this.windowID, viewOrRegion);
             }
+            if (!((_a = this.paramsStore) === null || _a === void 0 ? void 0 : _a.streamLayout)) {
+                this.setStreamLayout({
+                    layoutMode: types_1.TRTCStreamLayoutMode.None,
+                });
+            }
         });
     }
     previewInWebElement(viewOrRegion) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             if (this.serverMode === TRTCMediaMixingServerMode.Independent && (this.serverStatus === TRTCMediaMixingServerStatus.Started || this.serverStatus === TRTCMediaMixingServerStatus.Starting)) {
                 try {
@@ -1559,6 +1720,11 @@ class TRTCMediaMixingManager {
                         this.createDesigner();
                     }
                 }
+                if (!((_a = this.paramsStore) === null || _a === void 0 ? void 0 : _a.streamLayout)) {
+                    this.setStreamLayout({
+                        layoutMode: types_1.TRTCStreamLayoutMode.None,
+                    });
+                }
             }
             else {
                 // neither native window nor web element, stop preview
@@ -1567,12 +1733,16 @@ class TRTCMediaMixingManager {
         });
     }
     previewInNone() {
+        var _a;
         this.destroyResizeObserver();
         this.destroyLayoutManager();
         this.destroyDesigner();
         this.destroyWebRenderer();
         this.view = null;
         this.nodeMediaMixingPlugin.setDisplayParams(this.windowID, { left: 0, right: 0, top: 0, bottom: 0 });
+        if ((_a = this.paramsStore) === null || _a === void 0 ? void 0 : _a.streamLayout) {
+            this.paramsStore.streamLayout = null;
+        }
     }
     createWebRenderer(view) {
         if (this.view === view) {

package/liteav/extensions/MediaMixingManager/types.d.ts

@@ -39,6 +39,13 @@ export declare type TRTCPhoneMirrorParam = {
     frameRate: number;
     bitrateKbps: number;
 };
+export declare type TRTCOnlineVideoParam = {
+    networkCacheSizeKB: number;
+    playoutVolume: number;
+};
+export declare type TRTCVideoFileParam = {
+    playoutVolume: number;
+};
 export declare type TRTCMediaSource = {
     sourceType: TRTCMediaSourceType;
     sourceId: string;
@@ -49,6 +56,10 @@ export declare type TRTCMediaSource = {
     rotation?: TRTCVideoRotation;
     fillMode?: TRTCVideoFillMode;
     mirrorType?: TRTCVideoMirrorType;
+    camera?: TRTCCameraCaptureParams;
+    screen?: TRTCScreenCaptureProperty;
+    localVideo?: TRTCVideoFileParam;
+    onlineVideo?: TRTCOnlineVideoParam;
 };
 export declare type TRTCMediaMixingEncParam = {
     videoEncoderParams: TRTCVideoEncParam;
@@ -83,20 +94,10 @@ export declare type TRTCStreamLayout = {
     };
     streams?: Array<TRTCStreamInfo>;
 };
-export declare type TRTCOnlineVideoParam = {
-    networkCacheSizeKB: number;
-    playoutVolume: number;
-};
-export declare type TRTCVideoFileParam = {
-    playoutVolume: number;
-};
 export interface ITRTCMediaMixingManager {
     addMediaSource(mediaSource: TRTCMediaSource): Promise<void>;
     removeMediaSource(mediaSource: TRTCMediaSource): Promise<void>;
     updateMediaSource(mediaSource: TRTCMediaSource): Promise<void>;
-    setCameraCaptureParam(cameraID: string, param: TRTCCameraCaptureParams): void;
-    setPhoneMirrorParam(phoneMirrorSourceId: string, param: TRTCPhoneMirrorParam): void;
-    setScreenCaptureProperty(screenWindowID: string, property: TRTCScreenCaptureProperty): void;
     startPublish(): Promise<void>;
     stopPublish(): Promise<void>;
     updatePublishParams(params: TRTCMediaMixingEncParam): Promise<void>;

package/liteav/trtc.js

@@ -5434,6 +5434,10 @@ class TRTCCloud extends events_1.EventEmitter {
         try {
             const json = JSON.parse(jsonStr);
             const { api, params } = json;
+            if (this._isMacPlatform() && api === 'TuikitLog') {
+                this.logger.info(`TuikitLog: ${jsonStr}`);
+                return;
+            }
             if (this[api] && typeof this[api] === 'function') {
                 this[api](params);
             }

package/liteav/vod_player.d.ts

@@ -110,7 +110,6 @@ export declare class TRTCVodPlayer implements IVodPlayer {
     private nativeVodPlayer;
     private videoRender;
     private mediaFilePath;
-    private isStarted;
     private isDestroyed;
     private isRenderPrepared;
     private _setBufferRetryCount;

package/liteav/vod_player.js

@@ -109,7 +109,6 @@ class TRTCVodPlayer {
         this._dataRenderCallback = this._dataRenderCallback.bind(this);
         this.nativeVodPlayer = new NodeTRTCEngine.NodeVodPlayer(mediaFilePath, repeat);
         this.mediaFilePath = mediaFilePath;
-        this.isStarted = false;
         this.isDestroyed = false;
         this.isRenderPrepared = false;
         this._setBufferRetryCount = 0;
@@ -232,10 +231,6 @@ class TRTCVodPlayer {
             this.logger.warn('preload: player already destroyed');
             return;
         }
-        if (this.isStarted) {
-            this.logger.warn('preload: already started, ignored');
-            return;
-        }
         this.logger.info(`preload mediaFile: ${this.mediaFilePath}`);
         this._prepareRender();
         (_a = this.nativeVodPlayer) === null || _a === void 0 ? void 0 : _a.preload();
@@ -251,20 +246,16 @@ class TRTCVodPlayer {
      * @note 可以先调用 {@link preload} 预加载完成后再调用 start，也可以跳过 preload 直接调用 start。
      */
     start() {
-        var _a;
+        var _a, _b;
         if (this.isDestroyed) {
             this.logger.warn('start: player already destroyed');
             return;
         }
         this.logger.info(`start mediaFile: ${this.mediaFilePath}`);
-        if (this.isStarted) {
-            this.logger.warn('start: already started, ignored');
-            return;
-        }
         this._prepareRender();
         this.attachTRTC();
         (_a = this.nativeVodPlayer) === null || _a === void 0 ? void 0 : _a.start();
-        this.isStarted = true;
+        (_b = this.nativeVodPlayer) === null || _b === void 0 ? void 0 : _b.resume();
     }
     /**
      * 停止播放
@@ -276,14 +267,8 @@ class TRTCVodPlayer {
             return;
         }
         this.logger.info('stop');
-        if (!this.isStarted && !this.isRenderPrepared) {
-            return;
-        }
-        if (this.isStarted) {
-            this.isStarted = false;
-            (_a = this.nativeVodPlayer) === null || _a === void 0 ? void 0 : _a.stop();
-            this.detachTRTC();
-        }
+        (_a = this.nativeVodPlayer) === null || _a === void 0 ? void 0 : _a.stop();
+        this.detachTRTC();
         this._teardownRender();
     }
     /**
@@ -297,10 +282,6 @@ class TRTCVodPlayer {
             this.logger.warn('pause: player already destroyed');
             return;
         }
-        if (!this.isStarted) {
-            this.logger.warn('pause: player not started, ignored');
-            return;
-        }
         this.logger.info('pause');
         (_a = this.nativeVodPlayer) === null || _a === void 0 ? void 0 : _a.pause();
     }
@@ -310,17 +291,14 @@ class TRTCVodPlayer {
      * @note 仅在 {@link start} 之后调用才有效；未播放时调用会被忽略并打 warn 日志。
      */
     resume() {
-        var _a;
+        var _a, _b;
         if (this.isDestroyed) {
             this.logger.warn('resume: player already destroyed');
             return;
         }
-        if (!this.isStarted) {
-            this.logger.warn('resume: player not started, ignored');
-            return;
-        }
         this.logger.info('resume');
-        (_a = this.nativeVodPlayer) === null || _a === void 0 ? void 0 : _a.resume();
+        (_a = this.nativeVodPlayer) === null || _a === void 0 ? void 0 : _a.start();
+        (_b = this.nativeVodPlayer) === null || _b === void 0 ? void 0 : _b.resume();
     }
     /**
      * 跳转到指定播放位置（seek）
@@ -335,7 +313,7 @@ class TRTCVodPlayer {
             this.logger.warn('seek: player already destroyed');
             return;
         }
-        if (!this.isStarted && !this.isRenderPrepared) {
+        if (!this.isRenderPrepared) {
             this.logger.warn(`seek: player not preloaded or started, ignored (msPos=${msPos})`);
             return;
         }
@@ -370,7 +348,7 @@ class TRTCVodPlayer {
             this.logger.warn('switchSource: newMediaFile is empty, ignored');
             return;
         }
-        if (!this.isStarted && !this.isRenderPrepared) {
+        if (!this.isRenderPrepared) {
             this.logger.warn(`switchSource: player not preloaded or started, ignored (newMediaFile=${newMediaFile})`);
             return;
         }
@@ -698,14 +676,8 @@ class TRTCVodPlayer {
         var _a;
         (_a = this.nativeVodPlayer) === null || _a === void 0 ? void 0 : _a.setEventCallback((args) => {
             const event = args[0];
-            if ((event === TRTCVodPlayerEvent.onVodPlayerStopped || event === TRTCVodPlayerEvent.onVodPlayerError) && this.isStarted) {
-                this.isStarted = false;
-            }
             switch (event) {
                 case TRTCVodPlayerEvent.onVodPlayerStarted:
-                    if (!this.isStarted) {
-                        this.isStarted = true;
-                    }
                     this.fire(TRTCVodPlayerEvent.onVodPlayerStarted, args[1].msLength);
                     break;
                 case TRTCVodPlayerEvent.onVodPlayerLoaded: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trtc-electron-sdk",
-  "version": "13.3.801",
+  "version": "13.3.802-beta.1",
   "description": "trtc electron sdk",
   "main": "./liteav/index.js",
   "types": "./liteav/index.d.ts",