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

package/liteav/Renderer/types.d.ts

@@ -1,5 +1,5 @@
 import { TRTCVideoFillMode } from "../trtc_define";
-export declare type TFrameData = {
+export type TFrameData = {
     data: Uint8Array | ArrayBuffer;
     width: number;
     height: number;
@@ -7,7 +7,7 @@ export declare type TFrameData = {
     rotation: number;
     isNeedRotate: boolean;
 };
-export declare type TCanvasImageSourceStyleOptions = {
+export type TCanvasImageSourceStyleOptions = {
     contentWidth: number;
     contentHeight: number;
     containerWidth: number;

package/liteav/trtc.d.ts

@@ -1066,11 +1066,11 @@ declare class TRTCCloud extends EventEmitter {
      * 如果该 userId 没有开启双路编码模式，则此操作无效。
      *
      * @param {String} userId - 用户 ID
-     * @param {TRTCVideoStreamType} type - 视频流类型，即选择看大画面还是小画面，默认为 TRTCVideoStreamTypeBig
+     * @param {TRTCVideoStreamType} streamType - 视频流类型，即选择看大画面还是小画面，默认为 TRTCVideoStreamTypeBig
      * - TRTCVideoStreamTypeBig  : 大画面视频流
      * - TRTCVideoStreamTypeSmall: 小画面视频流
      */
-    setRemoteVideoStreamType(userId: string, type: TRTCVideoStreamType): void;
+    setRemoteVideoStreamType(userId: string, streamType: TRTCVideoStreamType): void;
     /**
      * 3.22 视频画面截图
      *
@@ -1568,6 +1568,28 @@ declare class TRTCCloud extends EventEmitter {
      * @note 该方法只有在 TRTCScreenCaptureSourceInfo 中的 type 指定为 TRTCScreenCaptureSourceTypeScreen 时生效，即分享屏幕时生效
      */
     removeAllExcludedShareWindow(): void;
+    /**
+     * 8.16 将指定窗口加入屏幕分享的包含列表中（该接口仅支持桌面系统）
+     *
+     * @param {String} win - 希望被分享出去的窗口（Windows 平台下为窗口句柄： HWND）
+     * - 该方法只有在 TRTCScreenCaptureSourceInfo 中的 type 指定为 TRTCScreenCaptureSourceTypeWindow 时生效，即分享窗口内容时，额外包含指定窗口的功能才生效。
+     * - 您在 startScreenCapture 之前和之后调用均可。
+     * - 通过该方法添加到包含列表中的窗口，会在退出房间后被 SDK 自动清除。
+     */
+    addIncludedShareWindow(win: string): void;
+    /**
+     * 8.17 将指定窗口从屏幕分享的包含列表中移除（该接口仅支持桌面系统）
+     *
+     * @param {String} win - 希望被分享出去的窗口（Mac 平台: 窗口 ID；Windows 平台： HWND）
+     * - 该方法只有在 TRTCScreenCaptureSourceInfo 中的 type 指定为 TRTCScreenCaptureSourceTypeWindow 时生效，即分享窗口内容时，额外包含指定窗口的功能才生效。
+     */
+    removeIncludedShareWindow(win: string): void;
+    /**
+     * 8.18 将全部窗口从屏幕分享的包含列表中移除（该接口仅支持桌面系统）
+     *
+     * @note 该方法只有在 TRTCScreenCaptureSourceInfo 中的 type 指定为 TRTCScreenCaptureSourceTypeWindow 时生效，即分享窗口内容时，额外包含指定窗口的功能才生效。
+     */
+    removeAllIncludedShareWindow(): void;
     /**
      * @private
      * 9.5 设置本地视频自定义渲染（Electron 平台下不可用）

package/liteav/trtc.js

@@ -619,10 +619,16 @@ class TRTCCloud extends events_1.EventEmitter {
                     return !(userId === item.uid && item.type !== trtc_define_1.TRTCVideoStreamType.TRTCVideoStreamTypeSub);
                 });
             }
-            const videoBufferInfo = remoteVideoBufferMap.get(userId);
-            if (videoBufferInfo) {
-                this.rtcCloud.setRemoteVideoBuffer(userId, videoBufferInfo.buffer, videoBufferInfo.streamType, 0, 0, videoBufferInfo.pixelFormat);
-                videoBufferInfo.buffer = null;
+            const remoteUserVideoBuffers = remoteVideoBufferMap.get(userId);
+            if (remoteUserVideoBuffers) {
+                if (remoteUserVideoBuffers.big) {
+                    this.rtcCloud.setRemoteVideoBuffer(userId, remoteUserVideoBuffers.big.buffer, remoteUserVideoBuffers.big.streamType, 0, 0, remoteUserVideoBuffers.big.pixelFormat);
+                    remoteUserVideoBuffers.big.buffer = null;
+                }
+                if (remoteUserVideoBuffers.small) {
+                    this.rtcCloud.setRemoteVideoBuffer(userId, remoteUserVideoBuffers.small.buffer, remoteUserVideoBuffers.small.streamType, 0, 0, remoteUserVideoBuffers.small.pixelFormat);
+                    remoteUserVideoBuffers.small.buffer = null;
+                }
                 remoteVideoBufferMap.delete(userId);
             }
         }
@@ -1078,7 +1084,7 @@ class TRTCCloud extends events_1.EventEmitter {
      */
     handleOnScreenCaptureStarted() {
         this.isScreenCapturing = true;
-        // 只有在 Buffer 为 null 时才新建，否则只能在 handleVideoSizeChange 事件中重新申请 Buffer         
+        // 只有在 Buffer 为 null 时才新建，否则只能在 handleVideoSizeChange 事件中重新申请 Buffer
         if (!screenVideoBuffer.buffer) {
             screenVideoBuffer.userId = '';
             screenVideoBuffer.streamType = this.screenCaptureStreamType;
@@ -1215,14 +1221,25 @@ class TRTCCloud extends events_1.EventEmitter {
         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);
-                if (videoBufferInfo) {
-                    if (videoBufferInfo.width !== width || videoBufferInfo.height !== height) {
-                        videoBufferInfo.buffer = (0, util_1.allocBuffer)(width * height * this.pixelLength, userId, streamType);
-                        videoBufferInfo.width = width;
-                        videoBufferInfo.height = height;
-                        videoBufferInfo.pixelFormat = this.pixelformate;
-                        this.rtcCloud.setRemoteVideoBuffer(userId, videoBufferInfo.buffer, streamType, width, height, videoBufferInfo.pixelFormat);
+                const remoteUserVideoBuffers = remoteVideoBufferMap.get(userId);
+                if (remoteUserVideoBuffers) {
+                    if (streamType === trtc_define_1.TRTCVideoStreamType.TRTCVideoStreamTypeBig && remoteUserVideoBuffers.big) {
+                        if (remoteUserVideoBuffers.big.width !== width || remoteUserVideoBuffers.big.height !== height) {
+                            remoteUserVideoBuffers.big.buffer = (0, util_1.allocBuffer)(width * height * this.pixelLength, userId, streamType);
+                            remoteUserVideoBuffers.big.width = width;
+                            remoteUserVideoBuffers.big.height = height;
+                            remoteUserVideoBuffers.big.pixelFormat = this.pixelformate;
+                            this.rtcCloud.setRemoteVideoBuffer(userId, remoteUserVideoBuffers.big.buffer, streamType, width, height, remoteUserVideoBuffers.big.pixelFormat);
+                        }
+                    }
+                    else if (streamType === trtc_define_1.TRTCVideoStreamType.TRTCVideoStreamTypeSmall && remoteUserVideoBuffers.small) {
+                        if (remoteUserVideoBuffers.small.width !== width || remoteUserVideoBuffers.small.height !== height) {
+                            remoteUserVideoBuffers.small.buffer = (0, util_1.allocBuffer)(width * height * this.pixelLength, userId, streamType);
+                            remoteUserVideoBuffers.small.width = width;
+                            remoteUserVideoBuffers.small.height = height;
+                            remoteUserVideoBuffers.small.pixelFormat = this.pixelformate;
+                            this.rtcCloud.setRemoteVideoBuffer(userId, remoteUserVideoBuffers.small.buffer, streamType, width, height, remoteUserVideoBuffers.small.pixelFormat);
+                        }
                     }
                 }
                 else {
@@ -1345,8 +1362,14 @@ class TRTCCloud extends events_1.EventEmitter {
             this._destroyRender(key, null);
         });
         remoteVideoBufferMap.forEach((value, key) => {
-            this.rtcCloud.setRemoteVideoBuffer(key, value.buffer, value.streamType, 0, 0, value.pixelFormat);
-            value.buffer = null;
+            if (value.big) {
+                this.rtcCloud.setRemoteVideoBuffer(key, value.big.buffer, value.big.streamType, 0, 0, value.big.pixelFormat);
+                value.big.buffer = null;
+            }
+            if (value.small) {
+                this.rtcCloud.setRemoteVideoBuffer(key, value.small.buffer, value.small.streamType, 0, 0, value.small.pixelFormat);
+                value.small.buffer = null;
+            }
         });
         remoteVideoBufferMap.clear();
         if (localVideoBuffer.buffer) {
@@ -1640,7 +1663,7 @@ class TRTCCloud extends events_1.EventEmitter {
                 this._initRender(key, view);
             }
             // view 为 null 时，可能启动了自定义渲染，所以 Buffer 还是要创建，否则自定义渲染就拿不到数据；
-            // view 非 null 时，当然必须创建 Buffer 
+            // view 非 null 时，当然必须创建 Buffer
             // 只有在 Buffer 为 null 时才新建，否则只能在 handleVideoSizeChange 事件中重新申请 Buffer
             if (!localVideoBuffer.buffer) {
                 localVideoBuffer.streamType = trtc_define_1.TRTCVideoStreamType.TRTCVideoStreamTypeBig;
@@ -1719,7 +1742,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),
@@ -1729,11 +1752,27 @@ class TRTCCloud extends events_1.EventEmitter {
                 pixelFormat: this.pixelformate,
             };
             if (streamType !== trtc_define_1.TRTCVideoStreamType.TRTCVideoStreamTypeSub) {
-                if (!remoteVideoBufferMap.get(userId)) {
+                const remoteUserVideoBuffers = remoteVideoBufferMap.get(userId);
+                if (!remoteUserVideoBuffers) {
                     // Buffer 不存在时才新建，否则只能在 handleVideoSizeChange 事件中重新申请 Buffer
-                    remoteVideoBufferMap.set(userId, videoBufferInfo);
+                    if (streamType === trtc_define_1.TRTCVideoStreamType.TRTCVideoStreamTypeBig) {
+                        remoteVideoBufferMap.set(userId, { big: videoBufferInfo });
+                    }
+                    else if (streamType === trtc_define_1.TRTCVideoStreamType.TRTCVideoStreamTypeSmall) {
+                        remoteVideoBufferMap.set(userId, { small: videoBufferInfo });
+                    }
                     this.rtcCloud.setRemoteVideoBuffer(userId, videoBufferInfo.buffer, videoBufferInfo.streamType, videoBufferInfo.width, videoBufferInfo.height, videoBufferInfo.pixelFormat);
                 }
+                else {
+                    if (streamType === trtc_define_1.TRTCVideoStreamType.TRTCVideoStreamTypeBig && !remoteUserVideoBuffers.big) {
+                        remoteUserVideoBuffers.big = videoBufferInfo;
+                        this.rtcCloud.setRemoteVideoBuffer(userId, videoBufferInfo.buffer, videoBufferInfo.streamType, videoBufferInfo.width, videoBufferInfo.height, videoBufferInfo.pixelFormat);
+                    }
+                    else if (streamType === trtc_define_1.TRTCVideoStreamType.TRTCVideoStreamTypeSmall && !remoteUserVideoBuffers.small) {
+                        remoteUserVideoBuffers.small = videoBufferInfo;
+                        this.rtcCloud.setRemoteVideoBuffer(userId, videoBufferInfo.buffer, videoBufferInfo.streamType, videoBufferInfo.width, videoBufferInfo.height, videoBufferInfo.pixelFormat);
+                    }
+                }
             }
             else {
                 // 远端屏幕分享
@@ -1765,11 +1804,21 @@ class TRTCCloud extends events_1.EventEmitter {
         let key = this.getKey(userId, streamType);
         this._destroyRender(key, null);
         this.rtcCloud.stopRemoteView(userId, streamType);
-        const videoBufferInfo = remoteVideoBufferMap.get(userId);
-        if (videoBufferInfo && videoBufferInfo.streamType === streamType) {
-            this.rtcCloud.setRemoteVideoBuffer(userId, videoBufferInfo.buffer, videoBufferInfo.streamType, 0, 0, videoBufferInfo.pixelFormat);
-            videoBufferInfo.buffer = null;
-            remoteVideoBufferMap.delete(userId);
+        const remoteUserVideoBuffers = remoteVideoBufferMap.get(userId);
+        if (remoteUserVideoBuffers && streamType !== trtc_define_1.TRTCVideoStreamType.TRTCVideoStreamTypeSub) {
+            if (streamType === trtc_define_1.TRTCVideoStreamType.TRTCVideoStreamTypeBig && remoteUserVideoBuffers.big) {
+                this.rtcCloud.setRemoteVideoBuffer(userId, remoteUserVideoBuffers.big.buffer, remoteUserVideoBuffers.big.streamType, 0, 0, remoteUserVideoBuffers.big.pixelFormat);
+                remoteUserVideoBuffers.big.buffer = null;
+                remoteUserVideoBuffers.big = undefined;
+            }
+            else if (streamType === trtc_define_1.TRTCVideoStreamType.TRTCVideoStreamTypeSmall && remoteUserVideoBuffers.small) {
+                this.rtcCloud.setRemoteVideoBuffer(userId, remoteUserVideoBuffers.small.buffer, remoteUserVideoBuffers.small.streamType, 0, 0, remoteUserVideoBuffers.small.pixelFormat);
+                remoteUserVideoBuffers.small.buffer = null;
+                remoteUserVideoBuffers.small = undefined;
+            }
+            if (!remoteUserVideoBuffers.big && !remoteUserVideoBuffers.small) {
+                remoteVideoBufferMap.delete(userId);
+            }
         }
         else if (screenVideoBuffer.userId === userId && screenVideoBuffer.streamType === streamType) {
             this.rtcCloud.setSubVideoBuffer(userId, screenVideoBuffer.buffer, screenVideoBuffer.streamType, 0, 0, screenVideoBuffer.pixelFormat);
@@ -1791,8 +1840,14 @@ class TRTCCloud extends events_1.EventEmitter {
         });
         this.rtcCloud.stopAllRemoteView();
         remoteVideoBufferMap.forEach((value, key) => {
-            this.rtcCloud.setRemoteVideoBuffer(key, value.buffer, value.streamType, 0, 0, value.pixelFormat);
-            value.buffer = null;
+            if (value.big) {
+                this.rtcCloud.setRemoteVideoBuffer(key, value.big.buffer, value.big.streamType, 0, 0, value.big.pixelFormat);
+                value.big.buffer = null;
+            }
+            if (value.small) {
+                this.rtcCloud.setRemoteVideoBuffer(key, value.small.buffer, value.small.streamType, 0, 0, value.small.pixelFormat);
+                value.small.buffer = null;
+            }
         });
         remoteVideoBufferMap.clear();
         if (screenVideoBuffer.buffer && !this.isScreenCapturing) {
@@ -2055,12 +2110,34 @@ class TRTCCloud extends events_1.EventEmitter {
      * 如果该 userId 没有开启双路编码模式，则此操作无效。
      *
      * @param {String} userId - 用户 ID
-     * @param {TRTCVideoStreamType} type - 视频流类型，即选择看大画面还是小画面，默认为 TRTCVideoStreamTypeBig
+     * @param {TRTCVideoStreamType} streamType - 视频流类型，即选择看大画面还是小画面，默认为 TRTCVideoStreamTypeBig
      * - TRTCVideoStreamTypeBig  : 大画面视频流
      * - TRTCVideoStreamTypeSmall: 小画面视频流
      */
-    setRemoteVideoStreamType(userId, type) {
-        this.rtcCloud.setRemoteVideoStreamType(userId, type);
+    setRemoteVideoStreamType(userId, streamType) {
+        const remoteUserVideoBuffers = remoteVideoBufferMap.get(userId);
+        if (remoteUserVideoBuffers) {
+            const videoBufferInfo = {
+                userId: userId,
+                buffer: (0, util_1.allocBuffer)(DEFAULT_VIDEO_WIDTH * DEFAULT_VIDEO_HEIGHT * this.pixelLength, userId, streamType),
+                streamType: streamType,
+                width: DEFAULT_VIDEO_WIDTH,
+                height: DEFAULT_VIDEO_HEIGHT,
+                pixelFormat: this.pixelformate,
+            };
+            if (streamType === trtc_define_1.TRTCVideoStreamType.TRTCVideoStreamTypeBig && !remoteUserVideoBuffers.big) {
+                remoteUserVideoBuffers.big = videoBufferInfo;
+                this.rtcCloud.setRemoteVideoBuffer(userId, videoBufferInfo.buffer, videoBufferInfo.streamType, videoBufferInfo.width, videoBufferInfo.height, videoBufferInfo.pixelFormat);
+            }
+            else if (streamType === trtc_define_1.TRTCVideoStreamType.TRTCVideoStreamTypeSmall && !remoteUserVideoBuffers.small) {
+                remoteUserVideoBuffers.small = videoBufferInfo;
+                this.rtcCloud.setRemoteVideoBuffer(userId, videoBufferInfo.buffer, videoBufferInfo.streamType, videoBufferInfo.width, videoBufferInfo.height, videoBufferInfo.pixelFormat);
+            }
+            else {
+                videoBufferInfo.buffer = null;
+            }
+        }
+        this.rtcCloud.setRemoteVideoStreamType(userId, streamType);
     }
     /**
      * 3.22 视频画面截图
@@ -2770,6 +2847,42 @@ class TRTCCloud extends events_1.EventEmitter {
     removeAllExcludedShareWindow() {
         this.rtcCloud.removeAllExcludedShareWindow();
     }
+    /**
+     * 8.16 将指定窗口加入屏幕分享的包含列表中（该接口仅支持桌面系统）
+     *
+     * @param {String} win - 希望被分享出去的窗口（Windows 平台下为窗口句柄： HWND）
+     * - 该方法只有在 TRTCScreenCaptureSourceInfo 中的 type 指定为 TRTCScreenCaptureSourceTypeWindow 时生效，即分享窗口内容时，额外包含指定窗口的功能才生效。
+     * - 您在 startScreenCapture 之前和之后调用均可。
+     * - 通过该方法添加到包含列表中的窗口，会在退出房间后被 SDK 自动清除。
+     */
+    addIncludedShareWindow(win) {
+        if (isNaN(+win)) {
+            console.error('trtc:addIncludedShareWindow, win: ' + win + 'is not invalid!');
+            return;
+        }
+        this.rtcCloud.addIncludedShareWindow(win);
+    }
+    /**
+     * 8.17 将指定窗口从屏幕分享的包含列表中移除（该接口仅支持桌面系统）
+     *
+     * @param {String} win - 希望被分享出去的窗口（Mac 平台: 窗口 ID；Windows 平台： HWND）
+     * - 该方法只有在 TRTCScreenCaptureSourceInfo 中的 type 指定为 TRTCScreenCaptureSourceTypeWindow 时生效，即分享窗口内容时，额外包含指定窗口的功能才生效。
+     */
+    removeIncludedShareWindow(win) {
+        if (isNaN(+win)) {
+            console.error('trtc:removeIncludedShareWindow, win: ' + win + 'is not invalid!');
+            return;
+        }
+        this.rtcCloud.removeIncludedShareWindow(win);
+    }
+    /**
+     * 8.18 将全部窗口从屏幕分享的包含列表中移除（该接口仅支持桌面系统）
+     *
+     * @note 该方法只有在 TRTCScreenCaptureSourceInfo 中的 type 指定为 TRTCScreenCaptureSourceTypeWindow 时生效，即分享窗口内容时，额外包含指定窗口的功能才生效。
+     */
+    removeAllIncludedShareWindow() {
+        this.rtcCloud.removeAllIncludedShareWindow();
+    }
     /////////////////////////////////////////////////////////////////////////////////
     //
     //                      （九）自定义采集和渲染
@@ -3493,9 +3606,14 @@ class TRTCCloud extends events_1.EventEmitter {
         this.rtcCloud.addRemoteVideoRenderCallback(userId, (id, type, width, height, timestamp, rotation, valid) => {
             if (this.enableRenderFrame) {
                 if (valid === 1) {
-                    const videoBufferInfo = remoteVideoBufferMap.get(id);
-                    if (videoBufferInfo && videoBufferInfo.streamType === type) {
-                        this._onRenderFrame(id, type, width, height, timestamp, rotation, videoBufferInfo.buffer);
+                    const remoteUserVideoBuffers = remoteVideoBufferMap.get(id);
+                    if (remoteUserVideoBuffers && type !== trtc_define_1.TRTCVideoStreamType.TRTCVideoStreamTypeSub) {
+                        if (type === trtc_define_1.TRTCVideoStreamType.TRTCVideoStreamTypeBig && remoteUserVideoBuffers.big) {
+                            this._onRenderFrame(id, type, width, height, timestamp, rotation, remoteUserVideoBuffers.big.buffer);
+                        }
+                        else if (type === trtc_define_1.TRTCVideoStreamType.TRTCVideoStreamTypeSmall && remoteUserVideoBuffers.small) {
+                            this._onRenderFrame(id, type, width, height, timestamp, rotation, remoteUserVideoBuffers.small.buffer);
+                        }
                     }
                     else {
                         this._onRenderFrame(id, type, width, height, timestamp, rotation, screenVideoBuffer.buffer);

package/package.json

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