trtc-electron-sdk 11.2.118-beta.0 → 11.2.118-beta.2

package/liteav/Renderer/Canvas2DRenderer/index.js

@@ -41,7 +41,9 @@ class Canvas2dRenderer {
         }
     }
     unbind() {
-        this.viewWrapper && this.viewContainer && this.viewContainer.removeChild(this.viewWrapper);
+        if (this.viewWrapper && this.viewContainer && this.viewWrapper.parentElement === this.viewContainer) {
+            this.viewContainer.removeChild(this.viewWrapper);
+        }
         this.viewContainer = null;
         this.yuv = null;
     }
@@ -128,7 +130,7 @@ class Canvas2dRenderer {
                 const tempCtx = tempCanvas.getContext('2d');
                 if (tempCtx) {
                     tempCtx.putImageData(newImage, 0, 0);
-                    let ctx = this.canvas.getContext("2d");
+                    const ctx = this.canvas.getContext("2d");
                     if (ctx) {
                         ctx.drawImage(tempCanvas, 0, 0);
                     }

package/liteav/Renderer/Canvas3DRenderer/index.js

@@ -87,9 +87,13 @@ class Canvas3dRenderer {
         var _a;
         (_a = this.canvas3DRenderer) === null || _a === void 0 ? void 0 : _a.destroy();
         this.canvas3DRenderer = null;
-        this.canvas && this.viewWrapper && this.viewWrapper.removeChild(this.canvas);
+        if (this.canvas && this.viewWrapper && this.canvas.parentElement === this.viewWrapper) {
+            this.viewWrapper.removeChild(this.canvas);
+        }
         this.canvas = null;
-        this.viewWrapper && this.viewContainer && this.viewContainer.removeChild(this.viewWrapper);
+        if (this.viewWrapper && this.viewContainer && this.viewWrapper.parentElement === this.viewContainer) {
+            this.viewContainer.removeChild(this.viewWrapper);
+        }
         this.viewContainer = null;
     }
     drawFrame(frameData) {

package/liteav/Renderer/VideoRenderer/index.js

@@ -52,7 +52,9 @@ class VideoRenderer {
         }
     }
     unbind() {
-        this.viewWrapper && this.viewContainer && this.viewContainer.removeChild(this.viewWrapper);
+        if (this.viewWrapper && this.viewContainer && this.viewWrapper.parentElement === this.viewContainer) {
+            this.viewContainer.removeChild(this.viewWrapper);
+        }
         this.viewContainer = null;
     }
     drawFrame(frameData) {

package/liteav/trtc.d.ts

@@ -113,7 +113,7 @@ declare class TRTCCloud extends EventEmitter {
      * @param {Number} warningCode - 警告码
      * @param {String} warningMsg  - 警告信息
      */
-    handleOnWarning(warningCode: number, warningMsg: string): void;
+    handleOnWarning(warningCode: number, warningMsg: string, extra: number): void;
     /**
      * 已加入房间的回调
      *
@@ -2238,6 +2238,17 @@ declare class TRTCCloud extends EventEmitter {
      * - 2  yuvcanvs
      */
     setRenderMode(mode?: number): void;
+    /**
+     * 插件管理器初始化接口
+     *
+     * 启动美颜插件管理器，并设置视频在美颜处理时的像素格式和数据传递方式。
+     * @param options 视频预处理参数，非必填。
+     * @param {TRTCVideoPixelFormat} options.pixelFormat - 视频像素格式，默认值：`TRTCVideoPixelFormat_I420`。
+     *  - 当数据传递方式为纹理 `TRTCVideoBufferType_Texture` 时，取值必须时 `TRTCVideoPixelFormat_RGBA32` 格式。
+     * @param {TRTCVideoBufferType} options.bufferType - 视频数据传递方式，默认值：`TRTCVideoBufferType_Buffer`。
+     *
+     * @ignore
+     */
     initPluginManager(options?: {
         pixelFormat: TRTCVideoPixelFormat;
         bufferType?: TRTCVideoBufferType;

package/liteav/trtc.js

@@ -298,7 +298,7 @@ class TRTCCloud extends events_1.EventEmitter {
                     this.handleOnError(int32_1, string_1);
                     break;
                 case 'onWarning':
-                    this.handleOnWarning(int32_1, string_1);
+                    this.handleOnWarning(int32_1, string_1, int32_2);
                     break;
                 case 'onEnterRoom':
                     this.handleOnEnterRoom(int32_1);
@@ -479,8 +479,8 @@ class TRTCCloud extends events_1.EventEmitter {
      * @param {Number} warningCode - 警告码
      * @param {String} warningMsg  - 警告信息
      */
-    handleOnWarning(warningCode, warningMsg) {
-        this.fire('onWarning', warningCode, warningMsg);
+    handleOnWarning(warningCode, warningMsg, extra) {
+        this.fire('onWarning', warningCode, warningMsg, extra);
     }
     /////////////////////////////////////////////////////////////////////////////////
     //
@@ -4029,7 +4029,19 @@ class TRTCCloud extends events_1.EventEmitter {
     //----------------------------------//
     // plugin API -- start
     //----------------------------------//
+    /**
+     * 插件管理器初始化接口
+     *
+     * 启动美颜插件管理器，并设置视频在美颜处理时的像素格式和数据传递方式。
+     * @param options 视频预处理参数，非必填。
+     * @param {TRTCVideoPixelFormat} options.pixelFormat - 视频像素格式，默认值：`TRTCVideoPixelFormat_I420`。
+     *  - 当数据传递方式为纹理 `TRTCVideoBufferType_Texture` 时，取值必须时 `TRTCVideoPixelFormat_RGBA32` 格式。
+     * @param {TRTCVideoBufferType} options.bufferType - 视频数据传递方式，默认值：`TRTCVideoBufferType_Buffer`。
+     *
+     * @ignore
+     */
     initPluginManager(options) {
+        const defaultPixelFormat = !this._isMacPlatform() ? trtc_define_1.TRTCVideoPixelFormat.TRTCVideoPixelFormat_RGBA32 : trtc_define_1.TRTCVideoPixelFormat.TRTCVideoPixelFormat_BGRA32;
         if (options) {
             if (options.bufferType && options.bufferType === trtc_define_1.TRTCVideoBufferType.TRTCVideoBufferType_Texture) {
                 this.videoProcessBufferType = options.bufferType;
@@ -4041,12 +4053,12 @@ class TRTCCloud extends events_1.EventEmitter {
                     this.videoProcessPixelFormat = options.pixelFormat;
                 }
                 else {
-                    this.videoProcessPixelFormat = trtc_define_1.TRTCVideoPixelFormat.TRTCVideoPixelFormat_RGBA32;
+                    this.videoProcessPixelFormat = defaultPixelFormat;
                 }
             }
         }
         else {
-            this.videoProcessPixelFormat = trtc_define_1.TRTCVideoPixelFormat.TRTCVideoPixelFormat_RGBA32;
+            this.videoProcessPixelFormat = defaultPixelFormat;
             this.videoProcessBufferType = trtc_define_1.TRTCVideoBufferType.TRTCVideoBufferType_Buffer;
         }
         this.rtcCloud.initializePluginManager(this.videoProcessPixelFormat, this.videoProcessBufferType);

package/package.json

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