trtc-electron-sdk 9.3.112-beta.0 → 9.3.112-beta.3

package/liteav/Render/SoftwareRenderer/index.js

@@ -74,7 +74,6 @@ class Renderer {
         this.yuv = null;
         this.element = null;
         this.canvas = null;
-        this.view = null;
     }
     refreshCanvas() {
     }
@@ -109,11 +108,49 @@ class Renderer {
             this.canvas.style.transform = 'rotateY(180deg)';
         }
     }
+    _adjustImageData(imageData) {
+        const { width, height, yUint8Array, uUint8Array, vUint8Array } = imageData;
+        const widthBase = 8;
+        const w8Modulo = width % widthBase;
+        if (w8Modulo !== 0) {
+            const newWidth = width - w8Modulo;
+            const newYSize = newWidth * height;
+            const newYArrayBuffer = new ArrayBuffer(newYSize);
+            const newYUint8Array = new Uint8Array(newYArrayBuffer);
+            let oldIndex = -1, newIndex = -1;
+            for (let h = 0; h < height; h += 1) {
+                for (let w = 0; w < newWidth; w += 1) {
+                    oldIndex = width * h + w;
+                    newIndex = newWidth * h + w;
+                    newYUint8Array[newIndex] = yUint8Array[oldIndex];
+                }
+            }
+            const oldChromaWidth = width / 2;
+            const newChromaWidth = newWidth / 2;
+            const chromaHeight = height / 2;
+            const newChromaSize = newChromaWidth * chromaHeight;
+            const newUArrayBuffer = new ArrayBuffer(newChromaSize);
+            const newUInt8Array = new Uint8Array(newUArrayBuffer);
+            const newVArrayBuffer = new ArrayBuffer(newChromaSize);
+            const newVInt8Array = new Uint8Array(newVArrayBuffer);
+            for (let h = 0; h < chromaHeight; h += 1) {
+                for (let w = 0; w < newChromaWidth; w += 1) {
+                    oldIndex = oldChromaWidth * h + w;
+                    newIndex = newChromaWidth * h + w;
+                    newUInt8Array[newIndex] = uUint8Array[oldIndex];
+                    newVInt8Array[newIndex] = vUint8Array[oldIndex];
+                }
+            }
+            return Object.assign(Object.assign({}, imageData), { width: newWidth, height, yUint8Array: newYUint8Array, uUint8Array: newUInt8Array, vUint8Array: newVInt8Array });
+        }
+        return imageData;
+    }
     drawFrame(imageData) {
         if (!this.ready) {
             this.ready = true;
             this.event.emit('ready');
         }
+        imageData = this._adjustImageData(imageData);
         const mirror = 0;
         const contentWidth = imageData.width;
         const contentHeight = imageData.height;

package/liteav/trtc.d.ts

@@ -39,6 +39,7 @@ declare class TRTCCloud extends EventEmitter {
     private audioQuality;
     private bgmId;
     private playAudioEffectIdList;
+    private enableRenderFrame;
     constructor();
     /**
      * 创建 TRTCCloud 对象单例
@@ -1977,6 +1978,7 @@ declare class TRTCCloud extends EventEmitter {
     createPlugin(pluginId: string): PluginInfo;
     setPluginCallback(pluginCb: (pluginId: string, errorCode: number, msg: string) => void): void;
     getKey(uid: string, type: TRTCVideoStreamType): string;
+    setEnableRenderFrame(enable: boolean): void;
     /**
      * 判断是否支持webGL
      * @returns {boolean}

package/liteav/trtc.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -116,6 +120,7 @@ class TRTCCloud extends events_1.EventEmitter {
         // 生成一个足够大, 不会与用户输入重复的 id
         this.bgmId = 1 << 29;
         this.playAudioEffectIdList = [];
+        this.enableRenderFrame = true;
         this.initEventHandler();
         console.log('constructor render:' + this.renderMode + '|sdk version:' + pkg.version +
             '|native sdk version:' + this.rtcCloud.getSDKVersion());
@@ -3098,7 +3103,9 @@ class TRTCCloud extends events_1.EventEmitter {
             this.pixelformate = trtc_define_1.TRTCVideoPixelFormat.TRTCVideoPixelFormat_I420;
         }
         this.rtcCloud.addLocalVideoRenderCallback((id, type, width, height, timestamp, rotation, data) => {
-            this._onRenderFrame(id, type, width, height, timestamp, rotation, data);
+            if (this.enableRenderFrame) {
+                this._onRenderFrame(id, type, width, height, timestamp, rotation, data);
+            }
         }, this.pixelformate);
     }
     addRemoteVideoRenderCallback(userid) {
@@ -3109,7 +3116,9 @@ class TRTCCloud extends events_1.EventEmitter {
             this.pixelformate = trtc_define_1.TRTCVideoPixelFormat.TRTCVideoPixelFormat_I420;
         }
         this.rtcCloud.addRemoteVideoRenderCallback(userid, (id, type, width, height, timestamp, rotation, data) => {
-            this._onRenderFrame(id, type, width, height, timestamp, rotation, data);
+            if (this.enableRenderFrame) {
+                this._onRenderFrame(id, type, width, height, timestamp, rotation, data);
+            }
         }, this.pixelformate);
     }
     //----------------------------------//
@@ -3180,6 +3189,10 @@ class TRTCCloud extends events_1.EventEmitter {
     getKey(uid, type) {
         return String(uid) + '_' + String(type);
     }
+    setEnableRenderFrame(enable) {
+        console.log('setEnableRenderFrame:' + enable);
+        this.enableRenderFrame = enable;
+    }
     /**
      * 判断是否支持webGL
      * @returns {boolean}
@@ -3309,7 +3322,7 @@ class TRTCCloud extends events_1.EventEmitter {
             let ulen = width * height / 4;
             let ydata = new Uint8Array(data, 0, ylen);
             let udata = new Uint8Array(data, ylen, ulen);
-            let vdata = new Uint8Array(data, ylen + ulen, data.le);
+            let vdata = new Uint8Array(data, ylen + ulen, ulen);
             renderer.drawFrame({
                 width: width,
                 height: height,

package/package.json

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