trtc-electron-sdk 9.3.111-beta.0 → 9.3.301

package/liteav/trtc.d.ts

@@ -39,7 +39,7 @@ declare class TRTCCloud extends EventEmitter {
     private audioQuality;
     private bgmId;
     private playAudioEffectIdList;
-    private isStartLocalPreview;
+    private enableRenderFrame;
     constructor();
     /**
      * 创建 TRTCCloud 对象单例
@@ -1978,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}
@@ -2005,6 +2006,5 @@ declare class TRTCCloud extends EventEmitter {
     _YUV2RGBA(width: number, height: number, buffer: ArrayBufferLike): Uint8ClampedArray;
     _BGRA2RGBA(data: ArrayBuffer, width: number, height: number): Uint8ClampedArray;
     _isMacPlatform(): boolean;
-    _isLocalUser(uid: string): boolean;
 }
 export default TRTCCloud;

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,7 +120,7 @@ class TRTCCloud extends events_1.EventEmitter {
         // 生成一个足够大, 不会与用户输入重复的 id
         this.bgmId = 1 << 29;
         this.playAudioEffectIdList = [];
-        this.isStartLocalPreview = false;
+        this.enableRenderFrame = true;
         this.initEventHandler();
         console.log('constructor render:' + this.renderMode + '|sdk version:' + pkg.version +
             '|native sdk version:' + this.rtcCloud.getSDKVersion());
@@ -161,7 +165,6 @@ class TRTCCloud extends events_1.EventEmitter {
      */
     destroy() {
         this.firstVideoFrameList = [];
-        this.isStartLocalPreview = false;
         this.playAudioEffectIdList = [];
         this.rtcCloud.destroy();
     }
@@ -420,7 +423,6 @@ class TRTCCloud extends events_1.EventEmitter {
      */
     handleOnExitRoom(reason) {
         this.firstVideoFrameList = [];
-        this.isStartLocalPreview = false;
         this.fire('onExitRoom', reason);
     }
     /**
@@ -1426,7 +1428,6 @@ class TRTCCloud extends events_1.EventEmitter {
                 let key = this.getKey('local_video', trtc_define_1.TRTCVideoStreamType.TRTCVideoStreamTypeBig);
                 this._initRender(key, view);
             }
-            this.isStartLocalPreview = true;
             this.rtcCloud.startLocalPreview();
             this.addLocalVideoRenderCallback();
         }
@@ -1441,9 +1442,8 @@ class TRTCCloud extends events_1.EventEmitter {
         let key = this.getKey('local_video', trtc_define_1.TRTCVideoStreamType.TRTCVideoStreamTypeBig);
         this._destroyRender(key, null);
         this.rtcCloud.stopLocalPreview();
-        this.isStartLocalPreview = false;
-        this.firstVideoFrameList = this.firstVideoFrameList.filter((item) => {
-            return !(this._isLocalUser(item.uid) && item.type === trtc_define_1.TRTCVideoStreamType.TRTCVideoStreamTypeBig);
+        this.firstVideoFrameList = this.firstVideoFrameList.filter(function (item) {
+            return !('' === item.uid && item.type === trtc_define_1.TRTCVideoStreamType.TRTCVideoStreamTypeBig);
         });
     }
     /**
@@ -2960,8 +2960,8 @@ class TRTCCloud extends events_1.EventEmitter {
         let key = this.getKey('camera_device_test_view', trtc_define_1.TRTCVideoStreamType.TRTCVideoStreamTypeBig);
         this._destroyRender(key, null);
         this.rtcCloud.stopCameraDeviceTest();
-        this.firstVideoFrameList = this.firstVideoFrameList.filter((item) => {
-            return !(this._isLocalUser(item.uid) && item.type === trtc_define_1.TRTCVideoStreamType.TRTCVideoStreamTypeBig);
+        this.firstVideoFrameList = this.firstVideoFrameList.filter(function (item) {
+            return !('' === item.uid && item.type === trtc_define_1.TRTCVideoStreamType.TRTCVideoStreamTypeBig);
         });
     }
     /**
@@ -3103,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) {
@@ -3114,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);
     }
     //----------------------------------//
@@ -3185,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}
@@ -3220,7 +3228,6 @@ class TRTCCloud extends events_1.EventEmitter {
         return this.streams.get(key);
     }
     _onRenderFrame(uid, type, width, height, timestamp, rotation, data) {
-        const isCurrentLocalUser = this._isLocalUser(uid);
         // 由于 mac 监听自定义渲染回调后不会回调 onFirstVideoFrame ，所以在这里自己实现回调 onFirstVideoFrame
         if (this._isMacPlatform()) {
             setImmediate(() => {
@@ -3228,14 +3235,12 @@ class TRTCCloud extends events_1.EventEmitter {
                     return uid === item.uid && type === item.type;
                 });
                 if (index === -1) {
-                    if (!isCurrentLocalUser || this.isStartLocalPreview) {
-                        this.emit('onFirstVideoFrame', uid, type, width, height);
-                        this.firstVideoFrameList.push({ uid: uid, type: type });
-                    }
+                    this.emit('onFirstVideoFrame', uid, type, width, height);
+                    this.firstVideoFrameList.push({ uid: uid, type: type });
                 }
             });
         }
-        if (isCurrentLocalUser) {
+        if (uid.length == 0) {
             if (this.isExternalRenderEnabled) {
                 this.fire(CUSTOM_VIDEO_DATA, {
                     uid: '', type, rotation, timestamp,
@@ -3476,9 +3481,6 @@ class TRTCCloud extends events_1.EventEmitter {
     _isMacPlatform() {
         return process.platform == 'darwin';
     }
-    _isLocalUser(uid) {
-        return uid === '';
-    }
 }
 class VideoRenderCallback {
     constructor() {

package/package.json

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