trtc-electron-sdk 10.2.8-beta.4 → 10.3.8-beta.10

package/liteav/trtc.d.ts

@@ -608,7 +608,7 @@ declare class TRTCCloud extends EventEmitter {
      * - ERR_AUDIO_PLUGIN_INSTALL_FAILED (-1332) ：安装音频驱动插件失败
      */
     handleOnSystemAudioLoopbackError(errCode: number): void;
-    handleOnVideoSizeChange(userId: string, streamType: number, width: number, height: number): void;
+    handleVideoSizeChange(userId: string, streamType: number, width: number, height: number): void;
     /**
      * 1.1 进入房间
      *
@@ -1940,8 +1940,9 @@ declare class TRTCCloud extends EventEmitter {
      * 该方法测试麦克风是否能正常工作，volume 的取值范围为0 - 100。
      *
      * @param {Number} interval - 反馈音量提示的时间间隔（ms），建议设置到大于 200 毫秒
+     * @param {Boolean} playback - 是否开启回播麦克风声音，开启后用户测试麦克风时会听到自己的声音。默认值 true
      */
-    startMicDeviceTest(interval: number): void;
+    startMicDeviceTest(interval: number, playback?: boolean): void;
     /**
      * 13.6 停止麦克风测试
      */

package/liteav/trtc.js

@@ -33,8 +33,8 @@ __exportStar(require("./trtc_code"), exports);
 const CUSTOM_VIDEO_DATA = 'onVideoData';
 const CAMERA_DEVICE_TEST_VIEW = 'camera_device_test_view';
 const CAMERA_DEVICE_TEST_ID = 'camera_device_test';
-const DEFAULT_VIDEO_WIDTH = 640;
-const DEFAULT_VIDEO_HEIGHT = 360;
+const DEFAULT_VIDEO_WIDTH = 8;
+const DEFAULT_VIDEO_HEIGHT = 8;
 const localVideoBuffer = {
     userId: '',
     buffer: null,
@@ -420,8 +420,6 @@ class TRTCCloud extends events_1.EventEmitter {
                 case 'onSystemAudioLoopbackError':
                     this.handleOnSystemAudioLoopbackError(int32_1);
                     break;
-                case 'onVideoSizeChange':
-                    this.handleOnVideoSizeChange(string_1, int32_1, int32_2, int32_3);
                 default:
                     break;
             }
@@ -1084,7 +1082,7 @@ class TRTCCloud extends events_1.EventEmitter {
     handleOnScreenCaptureStarted() {
         console.debug('trtc:onScreenCaptureStarted');
         this.isScreenCapturing = true;
-        // 只有在 Buffer 为 null 时才新建，否则只能在 onVideoSizeChange 事件中重新申请 Buffer         
+        // 只有在 Buffer 为 null 时才新建，否则只能在 handleVideoSizeChange 事件中重新申请 Buffer
         if (!screenVideoBuffer.buffer) {
             screenVideoBuffer.userId = '';
             screenVideoBuffer.streamType = this.screenCaptureStreamType;
@@ -1220,7 +1218,8 @@ class TRTCCloud extends events_1.EventEmitter {
     handleOnSystemAudioLoopbackError(errCode) {
         this.fire('onSystemAudioLoopbackError', errCode);
     }
-    handleOnVideoSizeChange(userId, streamType, width, height) {
+    handleVideoSizeChange(userId, streamType, width, height) {
+        console.debug('trtc:handleVideoSizeChange', userId, streamType, width, height);
         if (userId && userId !== CAMERA_DEVICE_TEST_ID) {
             if (streamType !== trtc_define_1.TRTCVideoStreamType.TRTCVideoStreamTypeSub) {
                 const videoBufferInfo = remoteVideoBufferMap.get(userId);
@@ -1234,7 +1233,7 @@ class TRTCCloud extends events_1.EventEmitter {
                     }
                 }
                 else {
-                    console.error(`trtc:onVideoSizeChange error: ${userId} ${streamType} buffer not exist`);
+                    console.error(`trtc:handleVideoSizeChange error: ${userId} ${streamType} buffer not exist`);
                 }
             }
             else {
@@ -1648,8 +1647,8 @@ class TRTCCloud extends events_1.EventEmitter {
                 this._initRender(key, view);
             }
             // view 为 null 时，可能启动了自定义渲染，所以 Buffer 还是要创建，否则自定义渲染就拿不到数据；
-            // view 非 null 时，当然必须创建 Buffer 
-            // 只有在 Buffer 为 null 时才新建，否则只能在 onVideoSizeChange 事件中重新申请 Buffer
+            // view 非 null 时，当然必须创建 Buffer
+            // 只有在 Buffer 为 null 时才新建，否则只能在 handleVideoSizeChange 事件中重新申请 Buffer
             if (!localVideoBuffer.buffer) {
                 localVideoBuffer.streamType = trtc_define_1.TRTCVideoStreamType.TRTCVideoStreamTypeBig;
                 localVideoBuffer.buffer = (0, util_1.allocBuffer)(DEFAULT_VIDEO_WIDTH * DEFAULT_VIDEO_HEIGHT * this.pixelLength, localVideoBuffer.userId, localVideoBuffer.streamType);
@@ -1727,7 +1726,7 @@ class TRTCCloud extends events_1.EventEmitter {
                 this._initRender(key, view);
             }
             // view 为 null 时，可能启动了自定义渲染，所以 Buffer 还是要创建，否则自定义渲染就拿不到数据；
-            // view 非 null 时，当然必须创建 Buffer 
+            // view 非 null 时，当然必须创建 Buffer
             const videoBufferInfo = {
                 userId: userId,
                 buffer: (0, util_1.allocBuffer)(DEFAULT_VIDEO_WIDTH * DEFAULT_VIDEO_HEIGHT * this.pixelLength, userId, streamType),
@@ -1738,14 +1737,14 @@ class TRTCCloud extends events_1.EventEmitter {
             };
             if (streamType !== trtc_define_1.TRTCVideoStreamType.TRTCVideoStreamTypeSub) {
                 if (!remoteVideoBufferMap.get(userId)) {
-                    // Buffer 不存在时才新建，否则只能在 onVideoSizeChange 事件中重新申请 Buffer
+                    // Buffer 不存在时才新建，否则只能在 handleVideoSizeChange 事件中重新申请 Buffer
                     remoteVideoBufferMap.set(userId, videoBufferInfo);
                     this.rtcCloud.setRemoteVideoBuffer(userId, videoBufferInfo.buffer, videoBufferInfo.streamType, videoBufferInfo.width, videoBufferInfo.height, videoBufferInfo.pixelFormat);
                 }
             }
             else {
                 // 远端屏幕分享
-                // Buffer 为 null 时才新建，否则只能在 onVideoSizeChange 事件中重新申请 Buffer
+                // Buffer 为 null 时才新建，否则只能在 handleVideoSizeChange 事件中重新申请 Buffer
                 if (!screenVideoBuffer.buffer) {
                     Object.assign(screenVideoBuffer, videoBufferInfo);
                     this.rtcCloud.setSubVideoBuffer(screenVideoBuffer.userId, screenVideoBuffer.buffer, screenVideoBuffer.streamType, screenVideoBuffer.width, screenVideoBuffer.height, screenVideoBuffer.pixelFormat);
@@ -3315,12 +3314,12 @@ class TRTCCloud extends events_1.EventEmitter {
     startCameraDeviceTest(view) {
         if (view !== undefined) {
             if (view !== null) {
-                let key = this.getKey(CAMERA_DEVICE_TEST_VIEW, trtc_define_1.TRTCVideoStreamType.TRTCVideoStreamTypeBig);
+                const key = this.getKey(CAMERA_DEVICE_TEST_VIEW, trtc_define_1.TRTCVideoStreamType.TRTCVideoStreamTypeBig);
                 this._initRender(key, view);
                 const renderer = this.streams.get(key);
                 renderer.setContentMode(trtc_define_1.TRTCVideoFillMode.TRTCVideoFillMode_Fill);
             }
-            // Buffer 为 null 时才新建，否则只能在 onVideoSizeChange 事件中重新申请 Buffer
+            // Buffer 为 null 时才新建，否则只能在 handleVideoSizeChange 事件中重新申请 Buffer
             if (!cameraTestVideoBuffer.buffer) {
                 const streamType = trtc_define_1.TRTCVideoStreamType.TRTCVideoStreamTypeBig;
                 cameraTestVideoBuffer.streamType = streamType;
@@ -3330,9 +3329,14 @@ class TRTCCloud extends events_1.EventEmitter {
                 cameraTestVideoBuffer.height = DEFAULT_VIDEO_HEIGHT;
                 this.rtcCloud.setCameraTestVideoBuffer(cameraTestVideoBuffer.buffer, cameraTestVideoBuffer.width, cameraTestVideoBuffer.height, cameraTestVideoBuffer.pixelFormat);
             }
-            this.rtcCloud.startCameraDeviceTest((id, type, width, height, timestamp, rotation) => {
+            this.rtcCloud.startCameraDeviceTest((id, type, width, height, timestamp, rotation, valid) => {
                 if (this.enableRenderFrame) {
-                    this._onRenderFrame(id, type, width, height, timestamp, rotation, cameraTestVideoBuffer.buffer);
+                    if (valid === 1 && width === cameraTestVideoBuffer.width && height === cameraTestVideoBuffer.height) {
+                        this._onRenderFrame(id, type, width, height, timestamp, rotation, cameraTestVideoBuffer.buffer);
+                    }
+                    else {
+                        this.handleVideoSizeChange(id, type, width, height);
+                    }
                 }
             });
         }
@@ -3363,9 +3367,10 @@ class TRTCCloud extends events_1.EventEmitter {
      * 该方法测试麦克风是否能正常工作，volume 的取值范围为0 - 100。
      *
      * @param {Number} interval - 反馈音量提示的时间间隔（ms），建议设置到大于 200 毫秒
+     * @param {Boolean} playback - 是否开启回播麦克风声音，开启后用户测试麦克风时会听到自己的声音。默认值 true
      */
-    startMicDeviceTest(interval) {
-        this.rtcCloud.startMicDeviceTest(interval);
+    startMicDeviceTest(interval, playback = true) {
+        this.rtcCloud.startMicDeviceTest(interval, playback);
     }
     /**
      * 13.6 停止麦克风测试
@@ -3494,13 +3499,25 @@ class TRTCCloud extends events_1.EventEmitter {
             console.error('trtc: not supported renderMode:', this.renderMode);
             return;
         }
-        this.rtcCloud.addLocalVideoRenderCallback((id, type, width, height, timestamp, rotation) => {
+        this.rtcCloud.addLocalVideoRenderCallback((id, type, width, height, timestamp, rotation, valid) => {
             if (this.enableRenderFrame) {
-                if (this.isScreenCapturing && this.screenCaptureStreamType === type) {
-                    this._onRenderFrame(id, type, width, height, timestamp, rotation, screenVideoBuffer.buffer);
+                if (valid === 1) {
+                    let targetBuffer;
+                    if (this.isScreenCapturing && this.screenCaptureStreamType === type) {
+                        targetBuffer = screenVideoBuffer;
+                    }
+                    else {
+                        targetBuffer = localVideoBuffer;
+                    }
+                    if (width === targetBuffer.width && height === targetBuffer.height) {
+                        this._onRenderFrame(id, type, width, height, timestamp, rotation, targetBuffer.buffer);
+                    }
+                    else {
+                        this.handleVideoSizeChange(id, type, width, height);
+                    }
                 }
                 else {
-                    this._onRenderFrame(id, type, width, height, timestamp, rotation, localVideoBuffer.buffer);
+                    this.handleVideoSizeChange(id, type, width, height);
                 }
             }
         }, this.pixelformate);
@@ -3522,14 +3539,26 @@ class TRTCCloud extends events_1.EventEmitter {
             console.error('trtc: not supported renderMode:', this.renderMode);
             return;
         }
-        this.rtcCloud.addRemoteVideoRenderCallback(userId, (id, type, width, height, timestamp, rotation) => {
+        this.rtcCloud.addRemoteVideoRenderCallback(userId, (id, type, width, height, timestamp, rotation, valid) => {
             if (this.enableRenderFrame) {
-                const videoBufferInfo = remoteVideoBufferMap.get(id);
-                if (videoBufferInfo && videoBufferInfo.streamType === type) {
-                    this._onRenderFrame(id, type, width, height, timestamp, rotation, videoBufferInfo.buffer);
+                if (valid === 1) {
+                    const videoBufferInfo = remoteVideoBufferMap.get(id);
+                    let targetBuffer;
+                    if (videoBufferInfo && videoBufferInfo.streamType === type) {
+                        targetBuffer = videoBufferInfo;
+                    }
+                    else {
+                        targetBuffer = screenVideoBuffer;
+                    }
+                    if (width === targetBuffer.width && height === targetBuffer.height) {
+                        this._onRenderFrame(id, type, width, height, timestamp, rotation, targetBuffer.buffer);
+                    }
+                    else {
+                        this.handleVideoSizeChange(id, type, width, height);
+                    }
                 }
                 else {
-                    this._onRenderFrame(id, type, width, height, timestamp, rotation, screenVideoBuffer.buffer);
+                    this.handleVideoSizeChange(id, type, width, height);
                 }
             }
         }, this.pixelformate);
@@ -3850,7 +3879,7 @@ class TRTCCloud extends events_1.EventEmitter {
             renderer = new Render_1.default.RGBRenderer(); // RGBA32 Canvas 2D
         }
         else if (this.renderMode === 4) {
-            renderer = new Render_1.default.Canvas3DRGBARenderer(); // RGBA canvas 3D 
+            renderer = new Render_1.default.Canvas3DRGBARenderer(); // RGBA canvas 3D
         }
         else if (this.renderMode === 5) {
             renderer = new Render_1.default.I420VideoRenderer(); // I420 video(html)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trtc-electron-sdk",
-  "version": "10.2.8-beta.4",
+  "version": "10.3.8-beta.10",
   "description": "trtc electron sdk",
   "main": "./liteav/trtc.js",
   "types": "./liteav/trtc.d.ts",