npm - trtc-electron-sdk - Versions diffs - 10.2.0-beta.1 → 10.3.8-beta.2 - Mend

trtc-electron-sdk 10.2.0-beta.1 → 10.3.8-beta.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/liteav/trtc.d.ts CHANGED Viewed

@@ -1886,7 +1886,15 @@ declare class TRTCCloud extends EventEmitter {
      */
     stopSpeedTest(): void;
     /**
-     * 13.3 开始进行摄像头测试
+     * 13.3 设置 SDK 使用的音频设备根据跟随系统默认设备
+     *
+     * @param {TRTCDeviceType} deviceType - 设备类型
+     * @param {Boolean} enable - 是否跟随系统默认的音频设备。 true：跟随, 当系统默认音频设备发生改变时，SDK 立即切换音频设备; false：不跟随, 只有当 SDK 使用的音频设备被移除后或插入新的音频设备为系统默认设备时，SDK 才切换至系统默认的音频设备。
+     *
+     */
+    enableFollowingDefaultAudioDevice(deviceType: TRTCDeviceType, enable: boolean): void;
+    /**
+     * 13.4 开始进行摄像头测试
      *
      * 会触发 onFirstVideoFrame 回调接口
      *
@@ -1896,11 +1904,11 @@ declare class TRTCCloud extends EventEmitter {
      */
     startCameraDeviceTest(view: HTMLElement): void;
     /**
-     * 13.4 停止摄像头测试
+     * 13.5 停止摄像头测试
      */
     stopCameraDeviceTest(): void;
     /**
-     * 13.5 开始进行麦克风测试
+     * 13.6 开始进行麦克风测试
      *
      * 回调接口 onTestMicVolume 获取测试数据
      *
@@ -1910,11 +1918,11 @@ declare class TRTCCloud extends EventEmitter {
      */
     startMicDeviceTest(interval: number): void;
     /**
-     * 13.6 停止麦克风测试
+     * 13.7 停止麦克风测试
      */
     stopMicDeviceTest(): void;
     /**
-     * 13.7 开始进行扬声器测试
+     * 13.8 开始进行扬声器测试
      *
      * 回调接口 onTestSpeakerVolume 获取测试数据
      *
@@ -1924,7 +1932,7 @@ declare class TRTCCloud extends EventEmitter {
      */
     startSpeakerDeviceTest(testAudioFilePath: string): void;
     /**
-     * 13.8 停止扬声器测试
+     * 13.9 停止扬声器测试
      */
     stopSpeakerDeviceTest(): void;
     /**

package/liteav/trtc.js CHANGED Viewed

@@ -1040,13 +1040,16 @@ class TRTCCloud extends events_1.EventEmitter {
      */
     handleOnScreenCaptureStarted() {
         this.isScreenCapturing = true;
-        screenVideoBuffer.userId = '';
-        screenVideoBuffer.streamType = this.screenCaptureStreamType;
-        screenVideoBuffer.buffer = (0, util_1.allocBuffer)(DEFAULT_VIDEO_WIDTH * DEFAULT_VIDEO_HEIGHT * this.pixelLength, screenVideoBuffer.userId, screenVideoBuffer.streamType);
-        screenVideoBuffer.pixelFormat = this.pixelformate;
-        screenVideoBuffer.width = DEFAULT_VIDEO_WIDTH;
-        screenVideoBuffer.height = DEFAULT_VIDEO_HEIGHT;
-        this.rtcCloud.setSubVideoBuffer('', screenVideoBuffer.buffer, screenVideoBuffer.streamType, screenVideoBuffer.width, screenVideoBuffer.height, screenVideoBuffer.pixelFormat);
+        // 只有在 Buffer 为 null 时才新建，否则只能在 onVideoSizeChange 事件中重新申请 Buffer
+        if (!screenVideoBuffer.buffer) {
+            screenVideoBuffer.userId = '';
+            screenVideoBuffer.streamType = this.screenCaptureStreamType;
+            screenVideoBuffer.buffer = (0, util_1.allocBuffer)(DEFAULT_VIDEO_WIDTH * DEFAULT_VIDEO_HEIGHT * this.pixelLength, screenVideoBuffer.userId, screenVideoBuffer.streamType);
+            screenVideoBuffer.pixelFormat = this.pixelformate;
+            screenVideoBuffer.width = DEFAULT_VIDEO_WIDTH;
+            screenVideoBuffer.height = DEFAULT_VIDEO_HEIGHT;
+            this.rtcCloud.setSubVideoBuffer('', screenVideoBuffer.buffer, screenVideoBuffer.streamType, screenVideoBuffer.width, screenVideoBuffer.height, screenVideoBuffer.pixelFormat);
+        }
         this.fire('onScreenCaptureStarted');
     }
     /**
@@ -1171,10 +1174,7 @@ class TRTCCloud extends events_1.EventEmitter {
         this.fire('onSystemAudioLoopbackError', errCode);
     }
     handleOnVideoSizeChange(userId, streamType, width, height) {
-        if (this.renderMode === 6) {
-            return;
-        }
-        if (userId) {
+        if (userId && userId !== CAMERA_DEVICE_TEST_ID) {
             if (streamType !== trtc_define_1.TRTCVideoStreamType.TRTCVideoStreamTypeSub) {
                 const videoBufferInfo = remoteVideoBufferMap.get(userId);
                 if (videoBufferInfo) {
@@ -1185,9 +1185,6 @@ class TRTCCloud extends events_1.EventEmitter {
                         videoBufferInfo.pixelFormat = this.pixelformate;
                         this.rtcCloud.setRemoteVideoBuffer(userId, videoBufferInfo.buffer, streamType, width, height, videoBufferInfo.pixelFormat);
                     }
-                    else {
-                        // 宽高尺寸未变，不用重新分配Buffer
-                    }
                 }
                 else {
                     console.error(`trtc:onVideoSizeChange error: ${userId} ${streamType} buffer not exist`);
@@ -1217,17 +1214,8 @@ class TRTCCloud extends events_1.EventEmitter {
                 }
             }
             else {
-                // 本地摄像头
-                if (localVideoBuffer.buffer) {
-                    if (localVideoBuffer.width !== width || localVideoBuffer.height !== height) {
-                        localVideoBuffer.buffer = (0, util_1.allocBuffer)(width * height * this.pixelLength, localVideoBuffer.userId, streamType);
-                        localVideoBuffer.width = width;
-                        localVideoBuffer.height = height;
-                        localVideoBuffer.pixelFormat = this.pixelformate;
-                        this.rtcCloud.setLocalVideoBuffer(localVideoBuffer.buffer, width, height, localVideoBuffer.pixelFormat);
-                    }
-                }
-                else if (cameraTestVideoBuffer.buffer) {
+                if (userId === CAMERA_DEVICE_TEST_ID) {
+                    // 摄像头检测
                     if (cameraTestVideoBuffer.width !== width || cameraTestVideoBuffer.height !== height) {
                         cameraTestVideoBuffer.buffer = (0, util_1.allocBuffer)(width * height * this.pixelLength, cameraTestVideoBuffer.userId, streamType);
                         cameraTestVideoBuffer.width = width;
@@ -1236,6 +1224,16 @@ class TRTCCloud extends events_1.EventEmitter {
                         this.rtcCloud.setCameraTestVideoBuffer(cameraTestVideoBuffer.buffer, width, height, cameraTestVideoBuffer.pixelFormat);
                     }
                 }
+                else {
+                    // 本地摄像头
+                    if (localVideoBuffer.width !== width || localVideoBuffer.height !== height) {
+                        localVideoBuffer.buffer = (0, util_1.allocBuffer)(width * height * this.pixelLength, localVideoBuffer.userId, streamType);
+                        localVideoBuffer.width = width;
+                        localVideoBuffer.height = height;
+                        localVideoBuffer.pixelFormat = this.pixelformate;
+                        this.rtcCloud.setLocalVideoBuffer(localVideoBuffer.buffer, width, height, localVideoBuffer.pixelFormat);
+                    }
+                }
             }
         }
     }
@@ -1601,13 +1599,16 @@ class TRTCCloud extends events_1.EventEmitter {
                 this._initRender(key, view);
             }
             // view 为 null 时，可能启动了自定义渲染，所以 Buffer 还是要创建，否则自定义渲染就拿不到数据；
-            // view 非 null 时，当然必须创建 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);
-            localVideoBuffer.pixelFormat = this.pixelformate;
-            localVideoBuffer.width = DEFAULT_VIDEO_WIDTH;
-            localVideoBuffer.height = DEFAULT_VIDEO_HEIGHT;
-            this.rtcCloud.setLocalVideoBuffer(localVideoBuffer.buffer, localVideoBuffer.width, localVideoBuffer.height, localVideoBuffer.pixelFormat);
+            // view 非 null 时，当然必须创建 Buffer
+            // 只有在 Buffer 为 null 时才新建，否则只能在 onVideoSizeChange 事件中重新申请 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);
+                localVideoBuffer.pixelFormat = this.pixelformate;
+                localVideoBuffer.width = DEFAULT_VIDEO_WIDTH;
+                localVideoBuffer.height = DEFAULT_VIDEO_HEIGHT;
+                this.rtcCloud.setLocalVideoBuffer(localVideoBuffer.buffer, localVideoBuffer.width, localVideoBuffer.height, localVideoBuffer.pixelFormat);
+            }
             this.rtcCloud.startLocalPreview();
             this.addLocalVideoRenderCallback();
         }
@@ -1670,7 +1671,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),
@@ -1680,13 +1681,19 @@ class TRTCCloud extends events_1.EventEmitter {
                 pixelFormat: this.pixelformate,
             };
             if (streamType !== trtc_define_1.TRTCVideoStreamType.TRTCVideoStreamTypeSub) {
-                remoteVideoBufferMap.set(userId, videoBufferInfo);
-                this.rtcCloud.setRemoteVideoBuffer(userId, videoBufferInfo.buffer, videoBufferInfo.streamType, videoBufferInfo.width, videoBufferInfo.height, videoBufferInfo.pixelFormat);
+                if (!remoteVideoBufferMap.get(userId)) {
+                    // Buffer 不存在时才新建，否则只能在 onVideoSizeChange 事件中重新申请 Buffer
+                    remoteVideoBufferMap.set(userId, videoBufferInfo);
+                    this.rtcCloud.setRemoteVideoBuffer(userId, videoBufferInfo.buffer, videoBufferInfo.streamType, videoBufferInfo.width, videoBufferInfo.height, videoBufferInfo.pixelFormat);
+                }
             }
             else {
                 // 远端屏幕分享
-                Object.assign(screenVideoBuffer, videoBufferInfo);
-                this.rtcCloud.setSubVideoBuffer(screenVideoBuffer.userId, screenVideoBuffer.buffer, screenVideoBuffer.streamType, screenVideoBuffer.width, screenVideoBuffer.height, screenVideoBuffer.pixelFormat);
+                // Buffer 为 null 时才新建，否则只能在 onVideoSizeChange 事件中重新申请 Buffer
+                if (!screenVideoBuffer.buffer) {
+                    Object.assign(screenVideoBuffer, videoBufferInfo);
+                    this.rtcCloud.setSubVideoBuffer(screenVideoBuffer.userId, screenVideoBuffer.buffer, screenVideoBuffer.streamType, screenVideoBuffer.width, screenVideoBuffer.height, screenVideoBuffer.pixelFormat);
+                }
             }
             this.addRemoteVideoRenderCallback(userId);
             this.rtcCloud.startRemoteView(userId, streamType);
@@ -3220,7 +3227,17 @@ class TRTCCloud extends events_1.EventEmitter {
         this.rtcCloud.stopSpeedTest();
     }
     /**
-     * 13.3 开始进行摄像头测试
+     * 13.3 设置 SDK 使用的音频设备根据跟随系统默认设备
+     *
+     * @param {TRTCDeviceType} deviceType - 设备类型
+     * @param {Boolean} enable - 是否跟随系统默认的音频设备。 true：跟随, 当系统默认音频设备发生改变时，SDK 立即切换音频设备; false：不跟随, 只有当 SDK 使用的音频设备被移除后或插入新的音频设备为系统默认设备时，SDK 才切换至系统默认的音频设备。
+     *
+     */
+    enableFollowingDefaultAudioDevice(deviceType, enable) {
+        this.rtcCloud.enableFollowingDefaultAudioDevice(deviceType, enable);
+    }
+    /**
+     * 13.4 开始进行摄像头测试
      *
      * 会触发 onFirstVideoFrame 回调接口
      *
@@ -3236,13 +3253,16 @@ class TRTCCloud extends events_1.EventEmitter {
                 const renderer = this.streams.get(key);
                 renderer.setContentMode(trtc_define_1.TRTCVideoFillMode.TRTCVideoFillMode_Fill);
             }
-            const streamType = trtc_define_1.TRTCVideoStreamType.TRTCVideoStreamTypeBig;
-            cameraTestVideoBuffer.streamType = streamType;
-            cameraTestVideoBuffer.pixelFormat = this.pixelformate;
-            cameraTestVideoBuffer.buffer = (0, util_1.allocBuffer)(DEFAULT_VIDEO_WIDTH * DEFAULT_VIDEO_HEIGHT * this.pixelLength, cameraTestVideoBuffer.userId, streamType);
-            cameraTestVideoBuffer.width = DEFAULT_VIDEO_WIDTH;
-            cameraTestVideoBuffer.height = DEFAULT_VIDEO_HEIGHT;
-            this.rtcCloud.setCameraTestVideoBuffer(cameraTestVideoBuffer.buffer, cameraTestVideoBuffer.width, cameraTestVideoBuffer.height, cameraTestVideoBuffer.pixelFormat);
+            // Buffer 为 null 时才新建，否则只能在 onVideoSizeChange 事件中重新申请 Buffer
+            if (!cameraTestVideoBuffer.buffer) {
+                const streamType = trtc_define_1.TRTCVideoStreamType.TRTCVideoStreamTypeBig;
+                cameraTestVideoBuffer.streamType = streamType;
+                cameraTestVideoBuffer.pixelFormat = this.pixelformate;
+                cameraTestVideoBuffer.buffer = (0, util_1.allocBuffer)(DEFAULT_VIDEO_WIDTH * DEFAULT_VIDEO_HEIGHT * this.pixelLength, cameraTestVideoBuffer.userId, streamType);
+                cameraTestVideoBuffer.width = DEFAULT_VIDEO_WIDTH;
+                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) => {
                 if (this.enableRenderFrame) {
                     this._onRenderFrame(id, type, width, height, timestamp, rotation, cameraTestVideoBuffer.buffer);
@@ -3254,7 +3274,7 @@ class TRTCCloud extends events_1.EventEmitter {
         }
     }
     /**
-     * 13.4 停止摄像头测试
+     * 13.5 停止摄像头测试
      */
     stopCameraDeviceTest() {
         let key = this.getKey(CAMERA_DEVICE_TEST_VIEW, trtc_define_1.TRTCVideoStreamType.TRTCVideoStreamTypeBig);
@@ -3269,7 +3289,7 @@ class TRTCCloud extends events_1.EventEmitter {
         }
     }
     /**
-     * 13.5 开始进行麦克风测试
+     * 13.6 开始进行麦克风测试
      *
      * 回调接口 onTestMicVolume 获取测试数据
      *
@@ -3281,13 +3301,13 @@ class TRTCCloud extends events_1.EventEmitter {
         this.rtcCloud.startMicDeviceTest(interval);
     }
     /**
-     * 13.6 停止麦克风测试
+     * 13.7 停止麦克风测试
      */
     stopMicDeviceTest() {
         this.rtcCloud.stopMicDeviceTest();
     }
     /**
-     * 13.7 开始进行扬声器测试
+     * 13.8 开始进行扬声器测试
      *
      * 回调接口 onTestSpeakerVolume 获取测试数据
      *
@@ -3300,7 +3320,7 @@ class TRTCCloud extends events_1.EventEmitter {
         this.rtcCloud.startSpeakerDeviceTest(testAudioFilePath);
     }
     /**
-     * 13.8 停止扬声器测试
+     * 13.9 停止扬声器测试
      */
     stopSpeakerDeviceTest() {
         this.rtcCloud.stopSpeakerDeviceTest();
@@ -3768,7 +3788,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 CHANGED Viewed

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