trtc-electron-sdk 12.6.706-beta.0 → 12.7.706-beta.1

package/liteav/MediaMixingDesigner/index.d.ts

@@ -3,7 +3,7 @@ export declare type TRTCMediaInfo = {
     id: string;
     rect: Rect;
     isSelected: boolean;
-    zOrder?: number;
+    zOrder: number;
     origin: any;
 };
 declare class TRTCMediaMixingDesigner {
@@ -48,6 +48,7 @@ declare class TRTCMediaMixingDesigner {
     addMedia(media: TRTCMediaInfo): void;
     removeMedia(media: TRTCMediaInfo): void;
     updateMedia(media: TRTCMediaInfo): void;
+    removeAllMedia(): void;
     on(event: string, func: (...args: any[]) => void): void;
     off(event: string, func: (...args: any[]) => void): void;
     destroy(): void;

package/liteav/MediaMixingDesigner/index.js

@@ -73,9 +73,23 @@ class TRTCMediaMixingDesigner {
         }
     }
     addMedia(media) {
-        this.mediaList.unshift(media);
+        // sort by zOrder desc
+        const length = this.mediaList.length;
+        let insertIndex = -1;
+        for (let i = 0; i < length; i++) {
+            if (media.zOrder >= this.mediaList[i].zOrder) {
+                insertIndex = i;
+                break;
+            }
+        }
+        if (insertIndex >= 0) {
+            this.mediaList.splice(insertIndex, 0, media);
+        }
+        else {
+            this.mediaList.push(media);
+        }
         if (media.isSelected) {
-            this.selectedMediaIndex = 0;
+            this.selectedMediaIndex = insertIndex >= 0 ? insertIndex : (this.mediaList.length - 1);
             this.updateOverlay();
         }
     }
@@ -90,15 +104,24 @@ class TRTCMediaMixingDesigner {
         }
     }
     updateMedia(media) {
-        const targetIndex = this.mediaList.findIndex(item => item.id === media.id);
+        let targetIndex = this.mediaList.findIndex(item => item.id === media.id);
         if (targetIndex !== -1) {
+            const isZOrderChanged = media.zOrder !== this.mediaList[targetIndex].zOrder;
             this.mediaList[targetIndex] = Object.assign({}, this.mediaList[targetIndex], media);
+            if (isZOrderChanged) {
+                this.mediaList.sort((a, b) => b.zOrder - a.zOrder);
+                targetIndex = this.mediaList.findIndex(item => item.id === media.id);
+            }
             if (media.isSelected) {
                 this.selectedMediaIndex = targetIndex;
                 this.updateOverlay();
             }
         }
     }
+    removeAllMedia() {
+        this.mediaList = [];
+        this.selectedMediaIndex = -1;
+    }
     on(event, func) {
         var _a;
         (_a = this.eventEmitter) === null || _a === void 0 ? void 0 : _a.on(event, func);

package/liteav/base/DevicePixelRatioObserver.d.ts

@@ -0,0 +1,12 @@
+declare class DevicePixelRatioObserver {
+    private mediaQueryString;
+    private mediaQuery;
+    private eventEmitter;
+    constructor();
+    destroy(): void;
+    on(event: string, func: (...args: any[]) => void): void;
+    off(event: string, func: (...args: any[]) => void): void;
+    private onPixelRatioChanged;
+}
+declare const devicePixelRationObserver: DevicePixelRatioObserver;
+export default devicePixelRationObserver;

package/liteav/base/DevicePixelRatioObserver.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const events_1 = require("events");
+class DevicePixelRatioObserver {
+    constructor() {
+        this.mediaQueryString = `(resolution: ${window.devicePixelRatio}dppx)`;
+        this.mediaQuery = window.matchMedia(this.mediaQueryString);
+        this.eventEmitter = new events_1.EventEmitter();
+        this.onPixelRatioChanged = this.onPixelRatioChanged.bind(this);
+        this.mediaQuery.addEventListener('change', this.onPixelRatioChanged);
+    }
+    destroy() {
+        var _a;
+        (_a = this.mediaQuery) === null || _a === void 0 ? void 0 : _a.removeEventListener('change', this.onPixelRatioChanged);
+        this.mediaQuery = null;
+        this.eventEmitter = null;
+    }
+    on(event, func) {
+        var _a;
+        (_a = this.eventEmitter) === null || _a === void 0 ? void 0 : _a.on(event, func);
+    }
+    off(event, func) {
+        var _a;
+        (_a = this.eventEmitter) === null || _a === void 0 ? void 0 : _a.off(event, func);
+    }
+    onPixelRatioChanged() {
+        var _a;
+        (_a = this.eventEmitter) === null || _a === void 0 ? void 0 : _a.emit('change');
+    }
+}
+const devicePixelRationObserver = new DevicePixelRatioObserver();
+exports.default = devicePixelRationObserver;

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

@@ -373,6 +373,7 @@ export declare class TRTCMediaMixingManager implements ITRTCMediaMixingManager {
      * @returns {Promise<void>}
      */
     stopMediaMixingServer(): Promise<void>;
+    callExperimentalAPI(jsonStr: string): void;
     /**
      * 注册事件监听
      *
@@ -393,6 +394,8 @@ export declare class TRTCMediaMixingManager implements ITRTCMediaMixingManager {
     private setDisplayRect;
     private createDesigner;
     private destroyDesigner;
+    private createOrUpdateLayoutManager;
+    private destroyLayoutManager;
     private updateMixingVideoSize;
     private listenDesignerEvent;
     private unlistenDesignerEvent;
@@ -407,13 +410,15 @@ export declare class TRTCMediaMixingManager implements ITRTCMediaMixingManager {
     private findSelectedMediaSource;
     private unselectMediaSource;
     private handleCppCallbackEvent;
-    private onMediaSourceAddedOrRemoved;
+    private onMediaSourceAdded;
+    private onMediaSourceRemoved;
     private onMediaSourceSizeChanged;
     private onPhoneMirrorSourceChanged;
     private onMediaServerState;
     private onMediaMixingServerLost;
     private onCallExperimentalAPIFinish;
     private recoverMediaMixingServer;
+    private onDevicePixelRatioChange;
     startCameraDeviceTest(windowID: number | Uint8Array, rect?: Rect): Promise<number>;
     stopCameraDeviceTest(): Promise<number>;
     setCameraTestRenderMirror(mirror: boolean): void;

package/liteav/extensions/MediaMixingManager/MediaMixingManager.js

@@ -15,11 +15,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TRTCMediaMixingManager = exports.TRTCMediaMixingEvent = void 0;
 const events_1 = require("events");
 const trtc_define_1 = require("../../trtc_define");
+const types_1 = require("./types");
 const utils_1 = require("../../utils");
 const constant_1 = require("../../constant");
 const index_1 = __importDefault(require("../../MediaMixingDesigner/index"));
 const StreamLayout_1 = require("./StreamLayout");
 const PromiseStore_1 = __importDefault(require("../../base/PromiseStore"));
+const DevicePixelRatioObserver_1 = __importDefault(require("../../base/DevicePixelRatioObserver"));
 const logger_1 = __importDefault(require("../../logger"));
 const NodeTRTCEngine = require('../../../build/Release/trtc_electron_sdk.node');
 /**
@@ -307,9 +309,12 @@ class TRTCMediaMixingManager {
         this.onPreviewAreaResize = this.onPreviewAreaResize.bind(this);
         this.onVisibilityChange = this.onVisibilityChange.bind(this);
         document.addEventListener('visibilitychange', this.onVisibilityChange);
+        this.onDevicePixelRatioChange = this.onDevicePixelRatioChange.bind(this);
+        DevicePixelRatioObserver_1.default.on('change', this.onDevicePixelRatioChange);
     }
     destroy() {
         return __awaiter(this, void 0, void 0, function* () {
+            DevicePixelRatioObserver_1.default.off('change', this.onDevicePixelRatioChange);
             document.removeEventListener('visibilitychange', this.onVisibilityChange);
             if (this.resizeObserver && this.view) {
                 this.resizeObserver.unobserve(this.view);
@@ -444,18 +449,29 @@ class TRTCMediaMixingManager {
         this.windowID = realWindowID;
         if (realWindowID !== 0 && viewOrRegion !== null) {
             if (viewOrRegion instanceof HTMLElement) {
-                this.destroyDesigner();
-                this.view = viewOrRegion;
-                this.setDisplayRect();
-                this.initResizeObserver();
-                this.createDesigner();
+                if (this.view !== viewOrRegion) {
+                    this.destroyDesigner();
+                    this.view = viewOrRegion;
+                    this.setDisplayRect();
+                    this.initResizeObserver();
+                    this.createDesigner();
+                }
+                else {
+                    this.setDisplayRect();
+                    if (!this.mediaMixingDesigner) {
+                        this.createDesigner();
+                    }
+                }
             }
             else {
                 // Rect
+                this.destroyLayoutManager();
+                this.destroyDesigner();
                 this.nodeMediaMixingPlugin.setDisplayParams(realWindowID, viewOrRegion);
             }
         }
         else {
+            this.destroyLayoutManager();
             this.destroyDesigner();
             this.nodeMediaMixingPlugin.setDisplayParams(realWindowID, { left: 0, right: 0, top: 0, bottom: 0 });
         }
@@ -469,7 +485,10 @@ class TRTCMediaMixingManager {
         logger_1.default.log(`${this.logPrefix}addMediaSource:`, mediaSource);
         const index = this.findMediaSourceIndex(mediaSource);
         if (index !== -1) {
-            throw new Error("Media source already existed");
+            return Promise.reject({
+                code: types_1.TRTCMediaMixingErrorCode.InvalidParams,
+                message: "Media source already existed"
+            });
         }
         const newMediaSource = (0, utils_1.safelyParse)(JSON.stringify(mediaSource));
         if (newMediaSource.isSelected) {
@@ -487,6 +506,7 @@ class TRTCMediaMixingManager {
                 id: `${newMediaSource.sourceType}__${newMediaSource.sourceId}`,
                 rect: newMediaSource.rect,
                 isSelected: newMediaSource.isSelected || false,
+                zOrder: newMediaSource.zOrder,
                 origin: newMediaSource
             });
             this.sourceList.push(newMediaSource);
@@ -501,20 +521,15 @@ class TRTCMediaMixingManager {
         logger_1.default.log(`${this.logPrefix}removeMediaSource:`, mediaSource);
         const index = this.findMediaSourceIndex(mediaSource);
         if (index === -1) {
-            throw new Error("Not existing media source to remove");
+            return Promise.reject({
+                code: types_1.TRTCMediaMixingErrorCode.NotFoundSource,
+                message: "Not existing media source to remove"
+            });
         }
         return new Promise((resolve, reject) => {
-            var _a;
             const key = `${promiseKeys.removeMediaSource}-${mediaSource.sourceType}-${mediaSource.sourceId}`;
             this.promiseStore.addPromise(key, resolve, reject);
             this.nodeMediaMixingPlugin.removeMediaSource(mediaSource);
-            (_a = this.mediaMixingDesigner) === null || _a === void 0 ? void 0 : _a.removeMedia({
-                id: `${mediaSource.sourceType}__${mediaSource.sourceId}`,
-                rect: mediaSource.rect,
-                isSelected: mediaSource.isSelected || false,
-                origin: (0, utils_1.safelyParse)(JSON.stringify(mediaSource))
-            });
-            this.sourceList.splice(index, 1);
         });
     }
     /**
@@ -528,7 +543,10 @@ class TRTCMediaMixingManager {
             logger_1.default.log(`${this.logPrefix}updateMediaSource:`, mediaSource);
             const index = this.findMediaSourceIndex(mediaSource);
             if (index === -1) {
-                throw new Error("Not existing media source to update");
+                return Promise.reject({
+                    code: types_1.TRTCMediaMixingErrorCode.NotFoundSource,
+                    message: "Not existing media source to update"
+                });
             }
             const newMediaSource = Object.assign(Object.assign({}, this.sourceList[index]), (0, utils_1.safelyParse)(JSON.stringify(mediaSource)));
             if (mediaSource.isSelected) {
@@ -542,6 +560,7 @@ class TRTCMediaMixingManager {
                 id: `${mediaSource.sourceType}__${mediaSource.sourceId}`,
                 rect: mediaSource.rect,
                 isSelected: mediaSource.isSelected || false,
+                zOrder: mediaSource.zOrder,
                 origin: (0, utils_1.safelyParse)(JSON.stringify(mediaSource))
             });
             this.sourceList[index] = newMediaSource;
@@ -620,19 +639,34 @@ class TRTCMediaMixingManager {
                 width: this.mixingVideoWidth,
                 height: this.mixingVideoHeight
             });
-            const result = yield this.nodeMediaMixingPlugin.updatePublishParams(params);
+            const result = yield this.nodeMediaMixingPlugin.updatePublishParams(Object.assign(Object.assign({}, params), { videoEncoderParams: {
+                    videoResolution: 0,
+                    resMode: 0,
+                    videoFps: params.videoEncoderParams.videoFps,
+                    videoBitrate: 0,
+                    minVideoBitrate: 0,
+                    enableAdjustRes: 0,
+                } }));
+            const encodeParamEx = {
+                videoWidth: this.mixingVideoWidth > this.mixingVideoHeight ? this.mixingVideoWidth : this.mixingVideoHeight,
+                videoHeight: this.mixingVideoWidth > this.mixingVideoHeight ? this.mixingVideoHeight : this.mixingVideoWidth,
+                videoFps: params.videoEncoderParams.videoFps,
+                videoBitrate: params.videoEncoderParams.videoBitrate,
+                gop: 1,
+                resolutionMode: params.videoEncoderParams.resMode,
+                streamType: trtc_define_1.TRTCVideoStreamType.TRTCVideoStreamTypeBig,
+            };
             if (params.videoEncoderParams.colorRange !== undefined
                 || params.videoEncoderParams.colorSpace !== undefined
                 || params.videoEncoderParams.complexity !== undefined) {
-                this.nodeMediaMixingPlugin.callExperimentalAPI(JSON.stringify({
-                    "api": "setVideoEncodeParamEx",
-                    "params": {
-                        "colorRange": params.videoEncoderParams.colorRange || trtc_define_1.TRTCVideoColorRange.TRTCVideoColorRange_Auto,
-                        "colorSpace": params.videoEncoderParams.colorSpace || trtc_define_1.TRTCVideoColorSpace.TRTCVideoColorSpace_Auto,
-                        "complexity": params.videoEncoderParams.complexity || trtc_define_1.TRTCVideoEncodeComplexity.TRTCVideoEncodeComplexity_Fastest,
-                    }
-                }));
+                encodeParamEx.colorRange = params.videoEncoderParams.colorRange || trtc_define_1.TRTCVideoColorRange.TRTCVideoColorRange_Auto;
+                encodeParamEx.colorSpace = params.videoEncoderParams.colorSpace || trtc_define_1.TRTCVideoColorSpace.TRTCVideoColorSpace_Auto;
+                encodeParamEx.complexity = params.videoEncoderParams.complexity || trtc_define_1.TRTCVideoEncodeComplexity.TRTCVideoEncodeComplexity_Fastest;
             }
+            this.nodeMediaMixingPlugin.callExperimentalAPI(JSON.stringify({
+                api: 'setVideoEncodeParamEx',
+                params: encodeParamEx
+            }));
             return result;
         });
     }
@@ -709,7 +743,7 @@ class TRTCMediaMixingManager {
      * }
      */
     setStreamLayout(layout) {
-        var _a, _b;
+        var _a, _b, _c;
         logger_1.default.log(`${this.logPrefix}setStreamLayout:`, layout);
         if (this.paramsStore) {
             try {
@@ -719,22 +753,7 @@ class TRTCMediaMixingManager {
                 this.paramsStore.streamLayout = undefined;
             }
         }
-        const context = {
-            container: this.view,
-            mixingVideoSize: {
-                width: this.mixingVideoWidth,
-                height: this.mixingVideoHeight
-            },
-            mediaMixingDesigner: this.mediaMixingDesigner
-        };
-        if (!this.streamLayoutManager) {
-            this.streamLayoutManager = StreamLayout_1.StreamLayoutFactory.create(layout.layoutMode, this.nodeMediaMixingPlugin, context);
-        }
-        else if (this.streamLayoutManager.getLayoutMode() !== layout.layoutMode) {
-            this.streamLayoutManager.destroy();
-            this.streamLayoutManager = StreamLayout_1.StreamLayoutFactory.create(layout.layoutMode, this.nodeMediaMixingPlugin, context);
-        }
-        let transferredUserList = layout.userList;
+        this.createOrUpdateLayoutManager(layout);
         if (this.view) {
             const viewRect = this.view.getBoundingClientRect();
             if ((_a = layout.userList) === null || _a === void 0 ? void 0 : _a.length) {
@@ -748,26 +767,13 @@ class TRTCMediaMixingManager {
                         bottom: workingArea.bottom / viewRect.height,
                     }, localUser.fillMode);
                 }
-                transferredUserList = layout.userList.map((user) => {
-                    if (user.rect) {
-                        return Object.assign(Object.assign({}, user), { rect: {
-                                left: user.rect.left * window.devicePixelRatio,
-                                right: user.rect.right * window.devicePixelRatio,
-                                top: user.rect.top * window.devicePixelRatio,
-                                bottom: user.rect.bottom * window.devicePixelRatio,
-                            } });
-                    }
-                    else {
-                        return user;
-                    }
-                });
                 logger_1.default.log(`${this.logPrefix}setStreamLayout transfer layout to pixel unit:`, JSON.stringify(layout));
             }
         }
         else {
             logger_1.default.warn(`${this.logPrefix}setStreamLayout: view is null, no container HTML element. User control the layout manually in device pixel unit.`);
         }
-        this.streamLayoutManager.setLayout(Object.assign(Object.assign({}, layout), { userList: transferredUserList }));
+        (_c = this.streamLayoutManager) === null || _c === void 0 ? void 0 : _c.setLayout(layout);
     }
     /**
      * @private
@@ -830,6 +836,10 @@ class TRTCMediaMixingManager {
             });
         });
     }
+    callExperimentalAPI(jsonStr) {
+        logger_1.default.debug(`${this.logPrefix}callExperimentalAPI:${jsonStr}`);
+        this.nodeMediaMixingPlugin.callExperimentalAPI(jsonStr);
+    }
     /**
      * 注册事件监听
      *
@@ -896,6 +906,18 @@ class TRTCMediaMixingManager {
                 canExceedContainer: true,
             });
             this.listenDesignerEvent();
+            if (this.sourceList.length >= 1) {
+                this.sourceList.forEach((mediaSource => {
+                    var _a;
+                    (_a = this.mediaMixingDesigner) === null || _a === void 0 ? void 0 : _a.addMedia({
+                        id: `${mediaSource.sourceType}__${mediaSource.sourceId}`,
+                        rect: mediaSource.rect,
+                        isSelected: mediaSource.isSelected || false,
+                        zOrder: mediaSource.zOrder,
+                        origin: mediaSource
+                    });
+                }));
+            }
         }
     }
     destroyDesigner() {
@@ -906,6 +928,29 @@ class TRTCMediaMixingManager {
             this.mediaMixingDesigner = null;
         }
     }
+    createOrUpdateLayoutManager(layout) {
+        const context = {
+            container: this.view,
+            mixingVideoSize: {
+                width: this.mixingVideoWidth,
+                height: this.mixingVideoHeight
+            },
+            mediaMixingDesigner: this.mediaMixingDesigner
+        };
+        if (!this.streamLayoutManager) {
+            this.streamLayoutManager = StreamLayout_1.StreamLayoutFactory.create(layout.layoutMode, this.nodeMediaMixingPlugin, context);
+        }
+        else if (this.streamLayoutManager.getLayoutMode() !== layout.layoutMode) {
+            this.streamLayoutManager.destroy();
+            this.streamLayoutManager = StreamLayout_1.StreamLayoutFactory.create(layout.layoutMode, this.nodeMediaMixingPlugin, context);
+        }
+    }
+    destroyLayoutManager() {
+        if (this.streamLayoutManager) {
+            this.streamLayoutManager.destroy();
+            this.streamLayoutManager = null;
+        }
+    }
     updateMixingVideoSize(params) {
         if (resolutionMap.has(params.videoResolution)) {
             const { width, height } = resolutionMap.get(params.videoResolution);
@@ -1002,6 +1047,7 @@ class TRTCMediaMixingManager {
                 id: `${this.sourceList[index].sourceType}__${this.sourceList[index].sourceId}`,
                 rect: this.sourceList[index].rect,
                 isSelected: this.sourceList[index].isSelected || false,
+                zOrder: this.sourceList[index].zOrder,
                 origin: (0, utils_1.safelyParse)(JSON.stringify(this.sourceList[index]))
             });
         });
@@ -1013,8 +1059,10 @@ class TRTCMediaMixingManager {
         // To do: 待完善
         switch (key) {
             case "onMediaSourceAdded":
+                this.onMediaSourceAdded(data);
+                break;
             case "onMediaSourceRemoved":
-                this.onMediaSourceAddedOrRemoved(key, data);
+                this.onMediaSourceRemoved(data);
                 break;
             case TRTCMediaMixingEvent.onMediaSourceSizeChanged:
                 this.onMediaSourceSizeChanged(data);
@@ -1033,18 +1081,64 @@ class TRTCMediaMixingManager {
                 break;
         }
     }
-    onMediaSourceAddedOrRemoved(key, data) {
-        var _a;
-        let promiseKey;
-        if (key === "onMediaSourceAdded") {
-            promiseKey = `${promiseKeys.addMediaSource}-${data.sourceType}-${data.sourceId}`;
+    onMediaSourceAdded(data) {
+        var _a, _b;
+        const promiseKey = `${promiseKeys.addMediaSource}-${data.sourceType}-${data.sourceId}`;
+        let flag = false;
+        if (data.errCode === 0) {
+            flag = this.promiseStore.resolvePromise(promiseKey, undefined);
         }
         else {
-            // 'onMediaSourceRemoved'
-            promiseKey = `${promiseKeys.removeMediaSource}-${data.sourceType}-${data.sourceId}`;
+            const newSourceIndex = this.findMediaSourceIndex({
+                sourceId: data.sourceId,
+                sourceType: data.sourceType,
+            });
+            if (newSourceIndex !== -1) {
+                const newMediaSource = this.sourceList[newSourceIndex];
+                (_a = this.mediaMixingDesigner) === null || _a === void 0 ? void 0 : _a.removeMedia({
+                    id: `${newMediaSource.sourceType}__${newMediaSource.sourceId}`,
+                    rect: newMediaSource.rect,
+                    isSelected: newMediaSource.isSelected || false,
+                    zOrder: newMediaSource.zOrder,
+                    origin: newMediaSource
+                });
+                this.sourceList.splice(newSourceIndex, 1);
+            }
+            flag = this.promiseStore.rejectPromise(promiseKey, {
+                code: data.errCode,
+                message: data.errMsg,
+            });
+        }
+        if (data.errCode !== 0 && !flag) {
+            // event triggered internally, not by method invoked by user
+            const index = this.findMediaSourceIndex(data);
+            let mediaSource = undefined;
+            if (index !== -1) {
+                mediaSource = Object.assign({}, this.sourceList[index]);
+            }
+            (_b = this.eventEmitter) === null || _b === void 0 ? void 0 : _b.emit(TRTCMediaMixingEvent.onError, data.errCode, data.errMsg, mediaSource);
         }
+    }
+    onMediaSourceRemoved(data) {
+        var _a, _b;
+        const promiseKey = `${promiseKeys.removeMediaSource}-${data.sourceType}-${data.sourceId}`;
         let flag = false;
         if (data.errCode === 0) {
+            const sourceIndex = this.findMediaSourceIndex({
+                sourceId: data.sourceId,
+                sourceType: data.sourceType
+            });
+            if (sourceIndex !== -1) {
+                const mediaSource = this.sourceList[sourceIndex];
+                (_a = this.mediaMixingDesigner) === null || _a === void 0 ? void 0 : _a.removeMedia({
+                    id: `${mediaSource.sourceType}__${mediaSource.sourceId}`,
+                    rect: mediaSource.rect,
+                    isSelected: mediaSource.isSelected || false,
+                    zOrder: mediaSource.zOrder,
+                    origin: (0, utils_1.safelyParse)(JSON.stringify(mediaSource))
+                });
+                this.sourceList.splice(sourceIndex, 1);
+            }
             flag = this.promiseStore.resolvePromise(promiseKey, undefined);
         }
         else {
@@ -1060,7 +1154,7 @@ class TRTCMediaMixingManager {
             if (index !== -1) {
                 mediaSource = Object.assign({}, this.sourceList[index]);
             }
-            (_a = this.eventEmitter) === null || _a === void 0 ? void 0 : _a.emit(TRTCMediaMixingEvent.onError, data.errCode, data.errMsg, mediaSource);
+            (_b = this.eventEmitter) === null || _b === void 0 ? void 0 : _b.emit(TRTCMediaMixingEvent.onError, data.errCode, data.errMsg, mediaSource);
         }
     }
     onMediaSourceSizeChanged(data) {
@@ -1133,14 +1227,15 @@ class TRTCMediaMixingManager {
         });
     }
     onMediaMixingServerLost() {
-        var _a;
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             if (this.autoControlServer) {
                 yield this.recoverMediaMixingServer();
             }
             else {
                 this.sourceList = [];
-                (_a = this.eventEmitter) === null || _a === void 0 ? void 0 : _a.emit(TRTCMediaMixingEvent.onMediaMixingServerLost);
+                (_a = this.mediaMixingDesigner) === null || _a === void 0 ? void 0 : _a.removeAllMedia();
+                (_b = this.eventEmitter) === null || _b === void 0 ? void 0 : _b.emit(TRTCMediaMixingEvent.onMediaMixingServerLost);
             }
         });
     }
@@ -1159,14 +1254,7 @@ class TRTCMediaMixingManager {
                     this.setStreamLayout(this.paramsStore.streamLayout);
                 }
                 this.sourceList.forEach((item) => {
-                    var _a;
                     this.nodeMediaMixingPlugin.addMediaSource(item);
-                    (_a = this.mediaMixingDesigner) === null || _a === void 0 ? void 0 : _a.addMedia({
-                        id: `${item.sourceType}__${item.sourceId}`,
-                        rect: item.rect,
-                        isSelected: item.isSelected || false,
-                        origin: item
-                    });
                 });
                 if (((_b = this.trtcParamsStore) === null || _b === void 0 ? void 0 : _b.enterRoomParams) && ((_c = this.trtcParamsStore) === null || _c === void 0 ? void 0 : _c.enterRoomScene)) {
                     this.nodeTRTCCloud.enterRoom(this.trtcParamsStore.enterRoomParams, this.trtcParamsStore.enterRoomScene);
@@ -1178,6 +1266,10 @@ class TRTCMediaMixingManager {
             }
         });
     }
+    onDevicePixelRatioChange() {
+        logger_1.default.debug(`${this.logPrefix}onDevicePixelRatioChange:`, window.devicePixelRatio);
+        this.setDisplayRect();
+    }
     // ******   这一部分接口暴露不合理，暂时不对暴露在 API 文档上   **************/
     startCameraDeviceTest(windowID, rect) {
         var _a;

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

@@ -27,5 +27,6 @@ declare class BaseStreamLayoutManager implements ITRTCStreamLayoutManager {
     private onResize;
     private setResizeObserver;
     private updateDisplayArea;
+    private onDevicePixelRatioChange;
 }
 export default BaseStreamLayoutManager;

package/liteav/extensions/MediaMixingManager/StreamLayout/BaseStreamLayoutManager.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const types_1 = require("../types");
+const DevicePixelRatioObserver_1 = __importDefault(require("../../../base/DevicePixelRatioObserver"));
 const utils_1 = require("../../../utils");
 const logger_1 = __importDefault(require("../../../logger"));
 class BaseStreamLayoutManager {
@@ -33,6 +34,8 @@ class BaseStreamLayoutManager {
         else {
             logger_1.default.warn(`${this.logPrefix}constructor failed, no context.container.`);
         }
+        this.onDevicePixelRatioChange = (0, utils_1.debounce)(this.onDevicePixelRatioChange.bind(this), 100);
+        DevicePixelRatioObserver_1.default.on('change', this.onDevicePixelRatioChange);
     }
     setLayout(layout) {
         this.layout = layout;
@@ -58,6 +61,7 @@ class BaseStreamLayoutManager {
             this.resizeObserver.disconnect();
             this.resizeObserver = null;
         }
+        DevicePixelRatioObserver_1.default.off('change', this.onDevicePixelRatioChange);
     }
     refreshLayout() {
         logger_1.default.warn(`${this.logPrefix}refreshLayout should be implemented by sub-class.`);
@@ -102,5 +106,9 @@ class BaseStreamLayoutManager {
             logger_1.default.warn(`${this.logPrefix}updateDisplayArea failed, no container.`);
         }
     }
+    onDevicePixelRatioChange() {
+        logger_1.default.debug(`${this.logPrefix}onDevicePixelRatioChange:`, window.devicePixelRatio);
+        this.refreshLayout();
+    }
 }
 exports.default = BaseStreamLayoutManager;

package/liteav/extensions/MediaMixingManager/StreamLayout/CustomStreamLayoutManager.js

@@ -23,7 +23,23 @@ class CustomStreamLayoutManager extends BaseStreamLayoutManager_1.default {
     refreshLayout() {
         var _a;
         if (this.layout.userList) {
-            this.nativeStreamLayoutManager.setStreamLayout(this.layout.userList);
+            let transferredUserList = this.layout.userList;
+            if (this.container) {
+                transferredUserList = this.layout.userList.map((user) => {
+                    if (user.rect) {
+                        return Object.assign(Object.assign({}, user), { rect: {
+                                left: user.rect.left * window.devicePixelRatio,
+                                right: user.rect.right * window.devicePixelRatio,
+                                top: user.rect.top * window.devicePixelRatio,
+                                bottom: user.rect.bottom * window.devicePixelRatio,
+                            } });
+                    }
+                    else {
+                        return user;
+                    }
+                });
+            }
+            this.nativeStreamLayoutManager.setStreamLayout(transferredUserList);
         }
         else if (this.layout.size && this.layout.streams) {
             const userList = this.convertRelativeToAbsolute(this.layout);

package/liteav/extensions/MediaMixingManager/StreamLayout/NoneStreamLayoutManager.js

@@ -17,13 +17,22 @@ class NoneStreamLayoutManager extends BaseStreamLayoutManager_1.default {
         this.refreshLayout();
     }
     refreshLayout() {
-        var _a;
+        var _a, _b;
         if (this.context && this.layout.userList) {
             this.centerLiveOwner();
-            (_a = this.nativeStreamLayoutManager) === null || _a === void 0 ? void 0 : _a.setStreamLayout(this.layout.userList);
+            if (this.layout.userList.length === 1 && this.layout.userList[0].rect && this.displayArea.width !== 0 && this.displayArea.height !== 0 && window.devicePixelRatio !== 0) {
+                const workingArea = this.layout.userList[0].rect;
+                (_a = this.context.mediaMixingDesigner) === null || _a === void 0 ? void 0 : _a.setWorkingArea({
+                    left: workingArea.left / this.displayArea.width / window.devicePixelRatio,
+                    top: workingArea.top / this.displayArea.height / window.devicePixelRatio,
+                    right: workingArea.right / this.displayArea.width / window.devicePixelRatio,
+                    bottom: workingArea.bottom / this.displayArea.height / window.devicePixelRatio,
+                }, this.layout.userList[0].fillMode);
+            }
+            (_b = this.nativeStreamLayoutManager) === null || _b === void 0 ? void 0 : _b.setStreamLayout(this.layout.userList);
         }
         else {
-            logger_1.default.error(`${this.logPrefix}setLayout context is null or no user`);
+            logger_1.default.error(`${this.logPrefix}refreshLayout context is null or no user`);
         }
     }
     centerLiveOwner() {

package/liteav/index.d.ts

@@ -1,6 +1,5 @@
 export * from './trtc_define';
 export * from './trtc_code';
-export * from './vod_player';
 export * from './extensions/DeviceManager';
 export * from './extensions/AudioEffectManager';
 export * from './extensions/MediaMixingManager';

package/liteav/index.js

@@ -15,7 +15,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./trtc_define"), exports);
 __exportStar(require("./trtc_code"), exports);
-__exportStar(require("./vod_player"), exports);
 __exportStar(require("./extensions/DeviceManager"), exports);
 __exportStar(require("./extensions/AudioEffectManager"), exports);
 __exportStar(require("./extensions/MediaMixingManager"), exports);

package/liteav/trtc.d.ts

@@ -20,6 +20,7 @@ declare class TRTCCloud extends EventEmitter {
     private logger;
     private id;
     private static isIPCMode;
+    private static ipcModeReferenceCount;
     private static sharedTRTCCloudInstance;
     private static subInstances;
     private stateStore;
@@ -36,7 +37,6 @@ declare class TRTCCloud extends EventEmitter {
     private enableRenderFrame;
     private screenCaptureStreamType;
     private isScreenCapturing;
-    private vodPlayers;
     private localMediaTranscoder;
     private isCaptureLocalVideoEnabled;
     private videoProcessBufferType;
@@ -98,11 +98,11 @@ declare class TRTCCloud extends EventEmitter {
      * rtcCloud.startLocalAudio(); // 主实例开启麦克风采集
      *
      * const childRtcCloud = rtcCloud.createSubCloud();
-     * childRtcCloud.startSystemAudioLoopback(); // 子实例开启系统音采集
+     * childRtcCloud?.startSystemAudioLoopback(); // 子实例开启系统音采集
      *
-     * @returns {TRTCCloud}
+     * @returns {TRTCCloud|null}
      */
-    createSubCloud(config?: TRTCInitConfig): TRTCCloud;
+    createSubCloud(config?: TRTCInitConfig): TRTCCloud | null;
     /**
      * 获取 TRTC 配置对象
      *
@@ -2027,7 +2027,7 @@ declare class TRTCCloud extends EventEmitter {
      *  true // enable highlight
      * );
      */
-    selectScreenCaptureTarget(source: TRTCScreenCaptureSourceInfo | number, captureRect: Rect | string, property: TRTCScreenCaptureProperty | string, deprecatedCaptureRect?: Rect, captureMouse?: boolean, highlightWindow?: boolean): any;
+    selectScreenCaptureTarget(source: TRTCScreenCaptureSourceInfo | number, captureRect: Rect | string, property: TRTCScreenCaptureProperty | string, deprecatedCaptureRect?: Rect, captureMouse?: boolean, highlightWindow?: boolean): void;
     /**
      * 启动屏幕分享，支持选择使用主路或辅路进行屏幕分享。
      *

package/liteav/trtc.js

@@ -174,9 +174,11 @@ class TRTCCloud extends events_1.EventEmitter {
         const newConfig = Object.assign({ jsVersion: pkg.version, componentNO }, config);
         if (!TRTCCloud.isIPCMode) {
             this.rtcCloud = new NodeTRTCEngine.NodeTRTCCloud(newConfig);
+            TRTCCloud.ipcModeReferenceCount = 0;
         }
         else {
             this.rtcCloud = new NodeTRTCEngine.NodeRemoteTRTCCloud(newConfig);
+            TRTCCloud.ipcModeReferenceCount = 1;
         }
         this.stateStore = new Map();
         this.videoRendererMap = new Map();
@@ -212,7 +214,6 @@ class TRTCCloud extends events_1.EventEmitter {
         //VideoCallback 本地和远程
         this.localVideoCallback = null;
         this.remoteVideoCallback = new Map();
-        this.vodPlayers = {};
         secMethods(this);
         // 视频渲染共享buffer
         this.remoteVideoBufferMap = new Map();
@@ -306,16 +307,18 @@ class TRTCCloud extends events_1.EventEmitter {
      * rtcCloud.startLocalAudio(); // 主实例开启麦克风采集
      *
      * const childRtcCloud = rtcCloud.createSubCloud();
-     * childRtcCloud.startSystemAudioLoopback(); // 子实例开启系统音采集
+     * childRtcCloud?.startSystemAudioLoopback(); // 子实例开启系统音采集
      *
-     * @returns {TRTCCloud}
+     * @returns {TRTCCloud|null}
      */
     createSubCloud(config) {
         if (this !== TRTCCloud.sharedTRTCCloudInstance) {
-            throw new Error("createSubCloud() can only be called on the main instance created by getTRTCShareInstance().");
+            this.logger.warn("createSubCloud() can only be called on the main instance created by getTRTCShareInstance().");
+            return null;
         }
         if (TRTCCloud.isIPCMode) {
-            throw new Error("createSubCloud() is not supported when `isIPCMode` is true.");
+            TRTCCloud.ipcModeReferenceCount = TRTCCloud.ipcModeReferenceCount + 1;
+            return TRTCCloud.sharedTRTCCloudInstance;
         }
         return new TRTCCloud(config);
     }
@@ -355,6 +358,12 @@ class TRTCCloud extends events_1.EventEmitter {
      */
     destroy() {
         var _a, _b;
+        if (TRTCCloud.isIPCMode) {
+            TRTCCloud.ipcModeReferenceCount = TRTCCloud.ipcModeReferenceCount - 1;
+            if (TRTCCloud.ipcModeReferenceCount > 0) {
+                return;
+            }
+        }
         if (this === TRTCCloud.sharedTRTCCloudInstance) {
             if (TRTCCloud.subInstances) {
                 TRTCCloud.subInstances.forEach(sub => {
@@ -4875,28 +4884,6 @@ class TRTCCloud extends events_1.EventEmitter {
     //----------------------------------//
     // plugin API -- end
     //----------------------------------//
-    //----------------------------------//
-    // Vod API -- start
-    //----------------------------------//
-    // createVodPlayer(mediaFilePath: string, repeat: boolean) {
-    //     const nativeVodPlayer = this.rtcCloud.createVodPlayer(mediaFilePath, repeat);
-    //     if (nativeVodPlayer) {
-    //         const vodPlayer = new VodPlayer(nativeVodPlayer, mediaFilePath, repeat);
-    //         vodPlayer.setVodPlayerRenderCallback();
-    //         vodPlayer.setVodEventCallback();
-    //         this.vodPlayers[vodPlayer.key] = vodPlayer;
-    //         return vodPlayer;
-    //     }
-    //     return null;
-    // }
-    // destroyVodPlayer(vodPlayer: VodPlayer) {
-    //     vodPlayer.destroyRender();
-    //     this.rtcCloud.destroyVodPlayer(vodPlayer.key);
-    //     delete this.vodPlayers[vodPlayer.key];
-    // }
-    //----------------------------------//
-    // Vod API -- end
-    //----------------------------------//
     _getKey(uid, type) {
         return String(uid) + '_' + String(type);
     }
@@ -5253,6 +5240,9 @@ class TRTCCloud extends events_1.EventEmitter {
         return process.platform == 'darwin';
     }
     _setRemoteVideoBuffer(userId, streamType) {
+        if (TRTCCloud.isIPCMode) {
+            return;
+        }
         const videoBufferInfo = new trtc_define_1.VideoBufferInfo({
             userId: userId,
             id: (0, util_1.generateUniqueId)(),
@@ -5326,7 +5316,7 @@ class TRTCCloud extends events_1.EventEmitter {
             }
         }
         catch (error) {
-            this.logger.warn(`callExperimentalAPI invalid JSON parameter`, error);
+            this.logger.warn(`callExperimentalAPI invalid JSON parameter`, error, jsonStr);
         }
     }
     /**

package/liteav/trtc_define.d.ts

@@ -25,7 +25,8 @@ export declare enum TRTCVideoResolution {
     TRTCVideoResolution_640_360 = 108,
     TRTCVideoResolution_960_540 = 110,
     TRTCVideoResolution_1280_720 = 112,
-    TRTCVideoResolution_1920_1080 = 114
+    TRTCVideoResolution_1920_1080 = 114,
+    TRTCVideoResolution_2560_1440 = 116
 }
 export declare enum TRTCVideoResolutionMode {
     TRTCVideoResolutionModeLandscape = 0,

package/liteav/trtc_define.js

@@ -22,52 +22,48 @@ const util_1 = require("./Renderer/util");
  * @enum {Number}
  */
 const TRTCVideoResolution_HACK_JSDOC = {
-    /// 宽高比1:1
-    /** [C] 建议码率80kbps */
+    /** 宽高比 1:1；分辨率 120x120；建议码率（VideoCall）80kbps; 建议码率（LIVE）120kbps。 */
     TRTCVideoResolution_120_120: 1,
-    /** [C] 建议码率100kbps */
+    /** 宽高比 1:1 分辨率 160x160；建议码率（VideoCall）100kbps; 建议码率（LIVE）150kbps。 */
     TRTCVideoResolution_160_160: 3,
-    /** [C] 建议码率200kbps */
+    /** 宽高比 1:1；分辨率 270x270；建议码率（VideoCall）200kbps; 建议码率（LIVE）300kbps。 */
     TRTCVideoResolution_270_270: 5,
-    /** [C] 建议码率350kbps */
+    /** 宽高比 1:1；分辨率 480x480；建议码率（VideoCall）350kbps; 建议码率（LIVE）500kbps。 */
     TRTCVideoResolution_480_480: 7,
-    /// 宽高比4:3
-    /** [C] 建议码率100kbps */
+    /** 宽高比4:3；分辨率 160x120；建议码率（VideoCall）100kbps; 建议码率（LIVE）150kbps。 */
     TRTCVideoResolution_160_120: 50,
-    /** [C] 建议码率150kbps */
+    /** 宽高比 4:3；分辨率 240x180；建议码率（VideoCall）150kbps; 建议码率（LIVE）250kbps。 */
     TRTCVideoResolution_240_180: 52,
-    /** [C] 建议码率200kbps */
+    /** 宽高比 4:3；分辨率 280x210；建议码率（VideoCall）200kbps; 建议码率（LIVE）300kbps。 */
     TRTCVideoResolution_280_210: 54,
-    /** [C] 建议码率250kbps */
+    /** 宽高比 4:3；分辨率 320x240；建议码率（VideoCall）250kbps; 建议码率（LIVE）375kbps。 */
     TRTCVideoResolution_320_240: 56,
-    /** [C] 建议码率300kbps */
+    /** 宽高比 4:3；分辨率 400x300；建议码率（VideoCall）300kbps; 建议码率（LIVE）450kbps。 */
     TRTCVideoResolution_400_300: 58,
-    /** [C] 建议码率400kbps */
+    /** 宽高比 4:3；分辨率 480x360；建议码率（VideoCall）400kbps; 建议码率（LIVE）600kbps。 */
     TRTCVideoResolution_480_360: 60,
-    /** [C] 建议码率600kbps */
+    /** 宽高比 4:3；分辨率 640x480；建议码率（VideoCall）600kbps; 建议码率（LIVE）900kbps。 */
     TRTCVideoResolution_640_480: 62,
-    /** [C] 建议码率1000kbps */
+    /** 宽高比 4:3；分辨率 960x720；建议码率（VideoCall）1000kbps; 建议码率（LIVE）1500kbps。 */
     TRTCVideoResolution_960_720: 64,
-    /// 宽高比16:9
-    /** [C] 建议码率150kbps */
+    /** 宽高比 16:9；分辨率 160x90；建议码率（VideoCall）150kbps; 建议码率（LIVE）250kbps。*/
     TRTCVideoResolution_160_90: 100,
-    /** [C] 建议码率200kbps */
+    /** 宽高比 16:9；分辨率 256x144；建议码率（VideoCall）200kbps; 建议码率（LIVE）300kbps。 */
     TRTCVideoResolution_256_144: 102,
-    /** [C] 建议码率250kbps */
+    /** 宽高比 16:9；分辨率 320x180；建议码率（VideoCall）250kbps; 建议码率（LIVE）400kbps。 */
     TRTCVideoResolution_320_180: 104,
-    /** [C] 建议码率350kbps */
+    /**宽高比 16:9；分辨率 480x270；建议码率（VideoCall）350kbps; 建议码率（LIVE）550kbps。 */
     TRTCVideoResolution_480_270: 106,
-    /** [C] 建议码率550kbps */
+    /** 宽高比 16:9；分辨率 640x360；建议码率（VideoCall）500kbps; 建议码率（LIVE）900kbps。 */
     TRTCVideoResolution_640_360: 108,
-    /** [C] 建议码率850kbps */
+    /** 宽高比 16:9；分辨率 960x540；建议码率（VideoCall）850kbps; 建议码率（LIVE）1300kbps。 */
     TRTCVideoResolution_960_540: 110,
-    /**
-     * [C] 摄像头采集 - 建议码率1200kbps<br>
-     * [S] 屏幕分享   - 建议码率 低清：1000kbps 高清：1600kbps
-     */
+    /** 宽高比 16:9；分辨率 1280x720；建议码率（VideoCall）1200kbps; 建议码率（LIVE）1800kbps。 */
     TRTCVideoResolution_1280_720: 112,
-    /** [S] 屏幕分享   - 建议码率2000kbps */
+    /** 宽高比 16:9；分辨率 1920x1080；建议码率（VideoCall）2000kbps; 建议码率（LIVE）3000kbps。 */
     TRTCVideoResolution_1920_1080: 114,
+    /** 宽高比 16:9；分辨率 2560x1440；建议码率（VideoCall）4000kbps; 建议码率（LIVE）6000kbps。 */
+    TRTCVideoResolution_2560_1440: 116,
 };
 var TRTCVideoResolution;
 (function (TRTCVideoResolution) {
@@ -91,6 +87,7 @@ var TRTCVideoResolution;
     TRTCVideoResolution[TRTCVideoResolution["TRTCVideoResolution_960_540"] = 110] = "TRTCVideoResolution_960_540";
     TRTCVideoResolution[TRTCVideoResolution["TRTCVideoResolution_1280_720"] = 112] = "TRTCVideoResolution_1280_720";
     TRTCVideoResolution[TRTCVideoResolution["TRTCVideoResolution_1920_1080"] = 114] = "TRTCVideoResolution_1920_1080";
+    TRTCVideoResolution[TRTCVideoResolution["TRTCVideoResolution_2560_1440"] = 116] = "TRTCVideoResolution_2560_1440";
 })(TRTCVideoResolution = exports.TRTCVideoResolution || (exports.TRTCVideoResolution = {}));
 /**
  * 视频分辨率模式

package/package.json

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

package/liteav/vod_player.d.ts

@@ -1,46 +0,0 @@
-/// <reference types="node" />
-import { EventEmitter } from 'events';
-import { TRTCVideoRotation } from './trtc_define';
-export declare enum PlayerEvents {
-    onVodPlayerStarted = "onVodPlayerStarted",
-    onVodPlayerProgress = "onVodPlayerProgress",
-    onVodPlayerPaused = "onVodPlayerPaused",
-    onVodPlayerResumed = "onVodPlayerResumed",
-    onVodPlayerStoped = "onVodPlayerStoped",
-    onVodPlayerError = "onVodPlayerError"
-}
-export declare class VodPlayer extends EventEmitter {
-    private renderer;
-    private nativeVodPlayer;
-    private mediaFilePath;
-    private repeat;
-    private view;
-    private isStarted;
-    private pixelLength;
-    private pixelFormat;
-    private vodPlayerVideoBuffer;
-    constructor(mediaFilePath: string, repeat: boolean);
-    setVodPlayerView(view: HTMLElement): void;
-    start(): void;
-    pause(): void;
-    resume(): void;
-    stop(): void;
-    seek(msPos: number): void;
-    getDuration(): number;
-    getWidth(): number;
-    getHeight(): number;
-    mute(mute: boolean): void;
-    setVolume(volume: number): void;
-    attachTRTC(): void;
-    detachTRTC(): void;
-    publishVideo(): void;
-    publishAudio(): void;
-    unpublishVideo(): void;
-    unpublishAudio(): void;
-    setVodPlayerDataCallback(): void;
-    setVodPlayerEventCallback(): void;
-    _renderVodVideoFrame(data: any, width: number, height: number, timestamp: number, rotation: TRTCVideoRotation): void;
-    handleVideoSizeChange(userId: string, streamType: number, width: number, height: number): void;
-    _initRender(view: HTMLElement): void;
-    destroyRender(): void;
-}

package/liteav/vod_player.js

@@ -1,194 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.VodPlayer = exports.PlayerEvents = void 0;
-const events_1 = require("events");
-const Renderer_1 = require("./Renderer");
-const trtc_define_1 = require("./trtc_define");
-const logger_1 = __importDefault(require("./logger"));
-const util_1 = require("./Renderer/util");
-const NodeTRTCEngine = require('../build/Release/trtc_electron_sdk.node');
-const DEFAULT_VIDEO_WIDTH = 640;
-const DEFAULT_VIDEO_HEIGHT = 360;
-var PlayerEvents;
-(function (PlayerEvents) {
-    PlayerEvents["onVodPlayerStarted"] = "onVodPlayerStarted";
-    PlayerEvents["onVodPlayerProgress"] = "onVodPlayerProgress";
-    PlayerEvents["onVodPlayerPaused"] = "onVodPlayerPaused";
-    PlayerEvents["onVodPlayerResumed"] = "onVodPlayerResumed";
-    PlayerEvents["onVodPlayerStoped"] = "onVodPlayerStoped";
-    PlayerEvents["onVodPlayerError"] = "onVodPlayerError";
-})(PlayerEvents = exports.PlayerEvents || (exports.PlayerEvents = {}));
-class VodPlayer extends events_1.EventEmitter {
-    constructor(mediaFilePath, repeat) {
-        super();
-        this.nativeVodPlayer = new NodeTRTCEngine.NodeVodPlayer(mediaFilePath, repeat);
-        this.mediaFilePath = mediaFilePath;
-        this.repeat = repeat;
-        this.view = null;
-        this.isStarted = false;
-        this.vodPlayerVideoBuffer = new trtc_define_1.VideoBufferInfo();
-        this.pixelLength = 1.5;
-        this.pixelFormat = trtc_define_1.TRTCVideoPixelFormat.TRTCVideoPixelFormat_I420;
-        this.setVodPlayerEventCallback();
-    }
-    setVodPlayerView(view) {
-        this.view = view;
-        this._initRender(this.view);
-    }
-    start() {
-        this.nativeVodPlayer.streamType = trtc_define_1.TRTCVideoStreamType.TRTCVideoStreamTypeBig;
-        this.vodPlayerVideoBuffer.buffer = (0, util_1.allocBuffer)(DEFAULT_VIDEO_WIDTH * DEFAULT_VIDEO_HEIGHT * this.pixelLength);
-        this.nativeVodPlayer.id = (0, util_1.generateUniqueId)();
-        this.nativeVodPlayer.pixelFormat = this.pixelFormat;
-        this.nativeVodPlayer.width = DEFAULT_VIDEO_WIDTH;
-        this.nativeVodPlayer.height = DEFAULT_VIDEO_HEIGHT;
-        this.nativeVodPlayer.setVideoBuffer('', this.vodPlayerVideoBuffer.buffer, this.nativeVodPlayer.streamType, this.nativeVodPlayer.width, this.nativeVodPlayer.height, this.nativeVodPlayer.pixelFormat, this.nativeVodPlayer.id);
-        this.setVodPlayerDataCallback();
-        if (!this.isStarted) {
-            this.nativeVodPlayer.start();
-        }
-        this.isStarted = true;
-    }
-    pause() {
-        this.nativeVodPlayer.pause();
-    }
-    resume() {
-        this.nativeVodPlayer.resume();
-    }
-    stop() {
-        this.isStarted = false;
-        this.nativeVodPlayer.stop();
-        if (this.vodPlayerVideoBuffer.buffer) {
-            this.nativeVodPlayer.setVideoBuffer('', this.vodPlayerVideoBuffer.buffer, this.nativeVodPlayer.streamType, 0, 0, this.nativeVodPlayer.pixelFormat, 0);
-            this.vodPlayerVideoBuffer.buffer = null;
-            this.vodPlayerVideoBuffer.id = 0;
-        }
-    }
-    seek(msPos) {
-        this.nativeVodPlayer.seek(msPos);
-    }
-    getDuration() {
-        return this.nativeVodPlayer.getDuration();
-    }
-    getWidth() {
-        return this.nativeVodPlayer.getWidth();
-    }
-    getHeight() {
-        return this.nativeVodPlayer.getHeight();
-    }
-    mute(mute) {
-        this.nativeVodPlayer.mute(mute);
-    }
-    setVolume(volume) {
-        this.nativeVodPlayer.setVolume(volume);
-    }
-    attachTRTC() {
-        this.nativeVodPlayer.attachTRTC();
-    }
-    detachTRTC() {
-        this.nativeVodPlayer.detachTRTC();
-    }
-    publishVideo() {
-        this.nativeVodPlayer.publishVideo();
-    }
-    publishAudio() {
-        this.nativeVodPlayer.publishAudio();
-    }
-    unpublishVideo() {
-        this.nativeVodPlayer.unpublishVideo();
-    }
-    unpublishAudio() {
-        this.nativeVodPlayer.unpublishAudio();
-    }
-    setVodPlayerDataCallback() {
-        this.nativeVodPlayer.setDataCallback((args) => {
-            const [id, type, width, height, timestamp, rotation, valid, bufferId] = args;
-            if (valid === true) {
-                this._renderVodVideoFrame(this.vodPlayerVideoBuffer.buffer, width, height, timestamp, rotation);
-            }
-            else {
-                this.handleVideoSizeChange(id, type, width, height);
-            }
-        });
-    }
-    setVodPlayerEventCallback() {
-        this.nativeVodPlayer.setEventCallback((args) => {
-            const key = args[0];
-            const data = args[1];
-            switch (key) {
-                case 'onVodPlayerStarted':
-                    this.emit(key, data.msLength);
-                    break;
-                case 'onVodPlayerProgress':
-                    this.emit(key, data.msPos);
-                    break;
-                case 'onVodPlayerPaused':
-                    this.emit(key);
-                    break;
-                case 'onVodPlayerResumed':
-                    this.emit(key);
-                    break;
-                case 'onVodPlayerStoped':
-                    this.emit(key, data.reason);
-                    break;
-                case 'onVodPlayerError':
-                    this.emit(key, data.error);
-                    break;
-                default:
-                    break;
-            }
-        });
-    }
-    _renderVodVideoFrame(data, width, height, timestamp, rotation) {
-        if (!this.renderer || !this.view) {
-            return;
-        }
-        if (data) {
-            const newData = data.slice(0); // Electron 12 及以下版本，来自底层的帧数据必须复制一次，否则 WebGL 渲染阶段会奔溃
-            const realRotation = rotation * 90; //ratation是0, 1, 2, 3. 绘制内部使用0, 90, 180, 270
-            this.renderer.drawFrame({
-                data: newData,
-                width,
-                height,
-                timestamp,
-                rotation: realRotation,
-                isNeedRotate: false,
-            });
-        }
-    }
-    handleVideoSizeChange(userId, streamType, width, height) {
-        if (this.vodPlayerVideoBuffer.width !== width || this.vodPlayerVideoBuffer.height !== height) {
-            this.vodPlayerVideoBuffer.buffer = (0, util_1.allocBuffer)(width * height * this.pixelLength);
-            this.vodPlayerVideoBuffer.id = (0, util_1.generateUniqueId)();
-            this.vodPlayerVideoBuffer.width = width;
-            this.vodPlayerVideoBuffer.height = height;
-            this.vodPlayerVideoBuffer.pixelFormat = this.pixelFormat;
-            this.nativeVodPlayer.setVideoBuffer(userId, this.vodPlayerVideoBuffer.buffer, streamType, width, height, this.vodPlayerVideoBuffer.pixelFormat, this.vodPlayerVideoBuffer.id);
-        }
-    }
-    _initRender(view) {
-        if (this.renderer) {
-            this.destroyRender();
-        }
-        view.innerHTML = ''; // 事先清空一下，避免画面叠加
-        this.renderer = (0, Renderer_1.createRenderer)(trtc_define_1.TRTCVideoPixelFormat.TRTCVideoPixelFormat_I420, view, {
-            type: Renderer_1.RenderType.Video,
-            onContextLost: () => {
-                this.renderer = (0, Renderer_1.createRenderer)(trtc_define_1.TRTCVideoPixelFormat.TRTCVideoPixelFormat_I420, view, { type: Renderer_1.RenderType.Canvas2D });
-            },
-        });
-    }
-    destroyRender() {
-        try {
-            this.renderer.destroy();
-            this.renderer = null;
-        }
-        catch (err) {
-            logger_1.default.error('[VodPlayer]destroyRender failed:', err);
-        }
-    }
-}
-exports.VodPlayer = VodPlayer;