trtc-electron-sdk 12.2.703-beta.2 → 12.2.703

package/liteav/Live/Pusher/index.js

@@ -39,6 +39,7 @@ class V2LivePusher {
         this.logger = new logger_1.Logger(`V2LivePusher_${this}`);
         this._pusherVideoRenderCallback = this._pusherVideoRenderCallback.bind(this);
         this._cameraTestVideoRenderCallback = this._cameraTestVideoRenderCallback.bind(this);
+        this._initPusherRender();
     }
     /**
      * 创建 V2LivePusher 实例
@@ -93,13 +94,9 @@ class V2LivePusher {
      * @param {HTMLElement | null} view     - 本地摄像头预览 View。
      */
     setRenderView(view) {
+        var _a;
         this.logger.debug(`setRenderView view:${view}`);
-        if (view !== null) {
-            this._initPusherRender(view);
-        }
-        else {
-            this._destroyPusherRender();
-        }
+        (_a = this.pusherVideoRender) === null || _a === void 0 ? void 0 : _a.setRenderView(view);
     }
     /**
      * 设置本地摄像头预览镜像
@@ -157,9 +154,13 @@ class V2LivePusher {
      * @return {Number}             - 参考 V2LiveCode 的定义
      */
     startCamera(cameraId) {
-        var _a;
+        var _a, _b;
         this.logger.debug(`startCamera cameraId:${cameraId}`);
-        return (_a = this.livePusher) === null || _a === void 0 ? void 0 : _a.startCamera(cameraId);
+        (_a = this.pusherVideoRender) === null || _a === void 0 ? void 0 : _a.createRender();
+        this._setVideoRenderBuffer();
+        this._addVideoRenderCallback();
+        this.enableCustomVideoRender(true, this.pixelFormat, live_define_1.V2LiveBufferType.V2LiveBufferTypeByteBuffer);
+        return (_b = this.livePusher) === null || _b === void 0 ? void 0 : _b.startCamera(cameraId);
     }
     /**
      * 关闭本地摄像头
@@ -167,9 +168,12 @@ class V2LivePusher {
      * @return {Number}             - 参考 V2LiveCode 的定义
      */
     stopCamera() {
-        var _a;
+        var _a, _b;
         this.logger.debug(`stopCamera`);
-        return (_a = this.livePusher) === null || _a === void 0 ? void 0 : _a.stopCamera();
+        (_a = this.pusherVideoRender) === null || _a === void 0 ? void 0 : _a.destroyRender();
+        this._removeVideoRenderCallback();
+        this.enableCustomVideoRender(false, this.pixelFormat, live_define_1.V2LiveBufferType.V2LiveBufferTypeByteBuffer);
+        return (_b = this.livePusher) === null || _b === void 0 ? void 0 : _b.stopCamera();
     }
     /**
      * 打开麦克风
@@ -343,6 +347,7 @@ class V2LivePusher {
             // camera videoRender
             this.cameraTestVideoRender = new video_render_1.VideoRender();
             this.cameraTestVideoRender.setRenderView(view);
+            this.cameraTestVideoRender.setVideoFillMode(trtc_define_1.TRTCVideoFillMode.TRTCVideoFillMode_Fit);
             const trtcPixelFormat = (0, converter_1.convertPixelFormatFromLive)(this.pixelFormat);
             this.cameraTestVideoRender.setVideoPixelFormat(trtcPixelFormat);
             // camera vudeoRender buffer
@@ -355,8 +360,10 @@ class V2LivePusher {
      * 停止摄像头测试
      */
     stopCameraDeviceTest() {
+        var _a;
         this.logger.debug(`stopCameraDeviceTest`);
         this.deviceManager.stopCameraDeviceTest();
+        (_a = this.cameraTestVideoRender) === null || _a === void 0 ? void 0 : _a.destroy();
         this.cameraTestVideoRender = null;
     }
     /**
@@ -519,21 +526,14 @@ class V2LivePusher {
         (_a = this.livePusher) === null || _a === void 0 ? void 0 : _a.enableCustomVideoRender(enable, pixelFormat, bufferType);
     }
     // videoRender
-    _initPusherRender(view) {
-        if (this.pusherVideoRender === null) {
-            // js videoRender
-            this.pusherVideoRender = new video_render_1.VideoRender();
-            const trtcPixelFormat = (0, converter_1.convertPixelFormatFromLive)(this.pixelFormat);
-            this.pusherVideoRender.setVideoPixelFormat(trtcPixelFormat);
-            // sdk add renderBuffer and callback
-            this._setVideoRenderBuffer();
-            this._addVideoRenderCallback();
-            this.enableCustomVideoRender(true, this.pixelFormat, live_define_1.V2LiveBufferType.V2LiveBufferTypeByteBuffer);
-        }
-        this.pusherVideoRender.setRenderView(view);
+    _initPusherRender() {
+        this.pusherVideoRender = new video_render_1.VideoRender();
+        const trtcPixelFormat = (0, converter_1.convertPixelFormatFromLive)(this.pixelFormat);
+        this.pusherVideoRender.setVideoPixelFormat(trtcPixelFormat);
     }
     _destroyPusherRender() {
         if (this.pusherVideoRender) {
+            this.pusherVideoRender.destroy();
             this.pusherVideoRender = null;
         }
         this._removeVideoRenderCallback();

package/liteav/Live/Pusher/video-render.d.ts

@@ -5,8 +5,12 @@ export declare class VideoRender {
     private pixelFormat;
     private videoBuffer;
     private pixelLength;
+    private mode;
     constructor();
-    setRenderView(view: HTMLElement): void;
+    destroy(): void;
+    setRenderView(view: HTMLElement | null): void;
+    createRender(): void;
+    destroyRender(): void;
     getVideoBuffer(): VideoBufferInfo;
     setVideoFillMode(mode: TRTCVideoFillMode): void;
     setVideoPixelFormat(format: TRTCVideoPixelFormat): void;

package/liteav/Live/Pusher/video-render.js

@@ -13,27 +13,38 @@ class VideoRender {
         this.pixelFormat = trtc_define_1.TRTCVideoPixelFormat.TRTCVideoPixelFormat_I420;
         this.videoBuffer = new trtc_define_1.VideoBufferInfo();
         this.pixelLength = 1.5;
+        this.mode = trtc_define_1.TRTCVideoFillMode.TRTCVideoFillMode_Fill;
         this._initVideoBuffer();
     }
+    destroy() {
+        this.destroyRender();
+    }
     setRenderView(view) {
         if (this.view === view) {
             return;
         }
-        if (view === null) {
-            this.videoRender = null;
+        this.view = view;
+        this.destroyRender();
+        if (view !== null) {
+            this.createRender();
         }
-        else {
-            if (this.view !== null) {
-                this.videoRender = null;
-            }
-            this.videoRender = (0, index_1.createRenderer)(this.pixelFormat, view, { type: index_1.RenderType.Video });
+    }
+    createRender() {
+        if (this.view !== null && this.videoRender === null) {
+            this.videoRender = (0, index_1.createRenderer)(this.pixelFormat, this.view, { type: index_1.RenderType.Video });
+            this.videoRender.setContentMode(this.mode);
         }
-        this.view = view;
+    }
+    destroyRender() {
+        var _a;
+        (_a = this.videoRender) === null || _a === void 0 ? void 0 : _a.destroy();
+        this.videoRender = null;
     }
     getVideoBuffer() { return this.videoBuffer; }
     setVideoFillMode(mode) {
         var _a;
-        (_a = this.videoRender) === null || _a === void 0 ? void 0 : _a.setContentMode(mode);
+        this.mode = mode;
+        (_a = this.videoRender) === null || _a === void 0 ? void 0 : _a.setContentMode(this.mode);
     }
     setVideoPixelFormat(format) {
         if (this.pixelFormat === format) {

package/package.json

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