trtc-electron-sdk 10.7.405-beta.0 → 10.7.405

package/liteav/Render/util.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="node" />
-import { TRTCVideoStreamType } from "../trtc_define";
 /**
  * 配置对象, 可用来打开 debug 模式
  *
@@ -43,5 +42,5 @@ export declare function calcVideoStyle(options?: {
     [x: string]: any;
 };
 export declare const config: Config;
-export declare function allocBuffer(length: number, userId?: string, streamType?: TRTCVideoStreamType): Buffer;
+export declare function allocBuffer(length: number): Buffer;
 export declare function generateUniqueId(): number;

package/liteav/Render/util.js

@@ -127,7 +127,7 @@ function calcVideoStyle(options = {
 }
 exports.calcVideoStyle = calcVideoStyle;
 exports.config = new Config();
-function allocBuffer(length, userId, streamType) {
+function allocBuffer(length) {
     if (length >= 1) {
         return Buffer.alloc(length);
     }

package/liteav/Renderer/Canvas2DRenderer/index.js

@@ -157,10 +157,14 @@ class Canvas2dRenderer {
                 return;
             }
             this.cacheCanvasOptions = Object.assign({}, options);
-            const { width, height, transform } = (0, util_1.calcCanvasStyle)(options);
+            const { width, height, zoom, transform } = (0, util_1.calcCanvasStyle)(options);
             this.canvas.width = width;
             this.canvas.height = height;
-            this.canvas.style.transform = transform;
+            // @ts-ignore
+            this.canvas.style.zoom = zoom;
+            if (transform) {
+                this.canvas.style.transform = transform;
+            }
         }
         else {
             throw new Error('canvas element not exist');

package/liteav/Renderer/Canvas3DRenderer/index.js

@@ -181,10 +181,14 @@ class Canvas3dRenderer {
                 return;
             }
             this.cacheCanvasOptions = Object.assign({}, options);
-            const { width, height, transform } = (0, util_1.calcCanvasStyle)(options);
+            const { width, height, zoom, transform } = (0, util_1.calcCanvasStyle)(options);
             this.canvas.width = width;
             this.canvas.height = height;
-            this.canvas.style.transform = transform;
+            // @ts-ignore
+            this.canvas.style.zoom = zoom;
+            if (transform) {
+                this.canvas.style.transform = transform;
+            }
         }
         else {
             throw new Error('canvas element not exist');

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/Renderer/util.d.ts

@@ -1,4 +1,4 @@
-import { TRTCVideoStreamType } from "../trtc_define";
+/// <reference types="node" />
 /**
  * 配置对象, 可用来打开 debug 模式
  *
@@ -42,7 +42,8 @@ export declare function calcVideoStyle(options?: {
     [x: string]: any;
 };
 export declare const config: Config;
-export declare function allocBuffer(length: number, userId?: string, streamType?: TRTCVideoStreamType): Uint8Array | null;
+export declare function allocBuffer(length: number): Buffer | null;
+export declare function generateUniqueId(): number;
 export declare function transferBGRA2RGBA(data: Uint8Array | ArrayBuffer, width: number, height: number): Uint8Array | ArrayBuffer;
 /**
  * 判断是否支持webGL

package/liteav/Renderer/util.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isSupportWebGL = exports.transferBGRA2RGBA = exports.allocBuffer = exports.config = exports.calcVideoStyle = exports.calcCanvasStyle = exports.calcScaleRate = exports.isNeedKeepWidthAndHeight = exports.Config = void 0;
+exports.isSupportWebGL = exports.transferBGRA2RGBA = exports.generateUniqueId = exports.allocBuffer = exports.config = exports.calcVideoStyle = exports.calcCanvasStyle = exports.calcScaleRate = exports.isNeedKeepWidthAndHeight = exports.Config = void 0;
 /**
  * 配置对象, 可用来打开 debug 模式
  *
@@ -72,7 +72,8 @@ function calcCanvasStyle(options = {
     const style = {
         width: 0,
         height: 0,
-        transform: ''
+        transform: '',
+        zoom: 1
     };
     const isKeepWidthHeight = isNeedKeepWidthAndHeight(options.rotation, options.isNeedRotate);
     if (isKeepWidthHeight) {
@@ -84,9 +85,9 @@ function calcCanvasStyle(options = {
         style.width = options.contentHeight;
     }
     const scale = calcScaleRate(!isKeepWidthHeight, options.contentMode, style.width, style.height, options.containerWidth, options.containerHeight);
-    style.transform = `scale(${scale})`;
+    style.zoom = scale;
     if (options.isNeedMirror) {
-        style.transform = `${style.transform} rotateY(180deg)`;
+        style.transform = `rotateY(180deg)`;
     }
     return style;
 }
@@ -127,14 +128,17 @@ function calcVideoStyle(options = {
 }
 exports.calcVideoStyle = calcVideoStyle;
 exports.config = new Config();
-function allocBuffer(length, userId, streamType) {
-    console.debug('trtc:alloc buffer:', length, userId, streamType);
+function allocBuffer(length) {
     if (length >= 1) {
         return Buffer.alloc(length);
     }
     return null;
 }
 exports.allocBuffer = allocBuffer;
+function generateUniqueId() {
+    return Date.now() * 1000 + Math.floor(Math.random() * 1000);
+}
+exports.generateUniqueId = generateUniqueId;
 function transferBGRA2RGBA(data, width, height) {
     const bgraData = new Uint8ClampedArray((data.buffer || data).slice(0));
     const rgbaData = new Uint8ClampedArray((data.buffer || data).slice(0));

package/liteav/trtc.d.ts

@@ -69,7 +69,7 @@ declare class TRTCCloud extends EventEmitter {
      *
      * @returns {TRTCConfig}
      */
-    getConfigObject(): import("./Render/util").Config;
+    getConfigObject(): import("./Renderer/util").Config;
     setExternalRenderEnabled(enabled: boolean): void;
     /**
      * 清理资源

package/liteav/trtc.js

@@ -19,7 +19,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const events_1 = require("events");
 const Renderer_1 = require("./Renderer");
-const util_1 = require("./Render/util");
+const util_1 = require("./Renderer/util");
 const yuv_buffer_1 = __importDefault(require("./Renderer/yuv-buffer"));
 const vod_player_1 = require("./vod_player");
 // @ts-ignore
@@ -36,36 +36,12 @@ 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 localVideoBuffer = {
-    id: 0,
-    userId: '',
-    buffer: null,
-    streamType: trtc_define_1.TRTCVideoStreamType.TRTCVideoStreamTypeBig,
-    width: DEFAULT_VIDEO_WIDTH,
-    height: DEFAULT_VIDEO_HEIGHT,
-    pixelFormat: trtc_define_1.TRTCVideoPixelFormat.TRTCVideoPixelFormat_I420,
-};
-const screenVideoBuffer = {
-    id: 0,
-    userId: '',
-    buffer: null,
-    streamType: trtc_define_1.TRTCVideoStreamType.TRTCVideoStreamTypeSub,
-    width: DEFAULT_VIDEO_WIDTH,
-    height: DEFAULT_VIDEO_HEIGHT,
-    pixelFormat: trtc_define_1.TRTCVideoPixelFormat.TRTCVideoPixelFormat_I420,
-};
-const cameraTestVideoBuffer = {
-    id: 0,
-    userId: CAMERA_DEVICE_TEST_ID,
-    buffer: null,
-    streamType: trtc_define_1.TRTCVideoStreamType.TRTCVideoStreamTypeBig,
-    width: DEFAULT_VIDEO_WIDTH,
-    height: DEFAULT_VIDEO_HEIGHT,
-    pixelFormat: trtc_define_1.TRTCVideoPixelFormat.TRTCVideoPixelFormat_I420,
-};
-const remoteVideoBufferMap = new Map();
 const SDK_LOG_LEVEL = 2;
-let genSecFunc = function (instance, key) {
+const localVideoBuffer = new trtc_define_1.VideoBufferInfo();
+const screenVideoBufferMap = new Map();
+const cameraTestVideoBuffer = new trtc_define_1.VideoBufferInfo();
+const remoteVideoBufferMap = new Map();
+const genSecFunc = function (instance, key) {
     return function () {
         let param = Array.from(arguments);
         let result = undefined;
@@ -79,7 +55,7 @@ let genSecFunc = function (instance, key) {
         }
     };
 };
-let copyMethods = function (instance) {
+const copyMethods = function (instance) {
     for (let key in instance) {
         if (typeof instance[key] != 'function' || key === 'constructor' || key.slice(0, 1) === '_' || typeof instance[key] != 'undefined') {
             continue;
@@ -88,7 +64,7 @@ let copyMethods = function (instance) {
     }
 };
 let copyPropMethods = function (instance) {
-    let disList = Object.getOwnPropertyDescriptors(Object.getPrototypeOf(instance));
+    const disList = Object.getOwnPropertyDescriptors(Object.getPrototypeOf(instance));
     for (let key in disList) {
         if (typeof instance[key] != 'function' || key === 'constructor' || key.slice(0, 1) === '_' || typeof instance[key] != 'undefined') {
             continue;
@@ -96,13 +72,13 @@ let copyPropMethods = function (instance) {
         instance[key] = genSecFunc(key, instance);
     }
 };
-let secMethods = function (instance) {
+const secMethods = function (instance) {
     copyMethods(instance);
     copyPropMethods(instance);
 };
-let formatLogParams = function (params) {
+const formatLogParams = function (params) {
     let logParamsStr = '';
-    let paramsKeyList = Object.keys(params);
+    const paramsKeyList = Object.keys(params);
     for (let i = 0; i < paramsKeyList.length; i++) {
         const paramKey = paramsKeyList[i];
         logParamsStr += `${paramKey}:${params[paramKey]}`;
@@ -113,32 +89,46 @@ let formatLogParams = function (params) {
     return logParamsStr;
 };
 const getComponentNO = function () {
-    var _a;
+    var _a, _b;
     let componentName = '';
     // @ts-ignore
-    if (global.__TRTCElectron && global.__TRTCElectron.componentName) {
+    if ((_a = window === null || window === void 0 ? void 0 : window.__TRTCElectron) === null || _a === void 0 ? void 0 : _a.componentName) {
         // @ts-ignore
-        componentName = global.__TRTCElectron.componentName;
+        componentName = window.__TRTCElectron.componentName;
     }
     else {
-        const jsonStr = (_a = global.localStorage) === null || _a === void 0 ? void 0 : _a.getItem('__TRTCElectron');
-        if (jsonStr) {
-            try {
-                const jsonObj = JSON.parse(jsonStr);
-                if (jsonObj.componentName && typeof jsonObj.componentName === 'string') {
-                    componentName = jsonObj.componentName;
+        if ((_b = window === null || window === void 0 ? void 0 : window.localStorage) === null || _b === void 0 ? void 0 : _b.getItem) {
+            const jsonStr = window.localStorage.getItem('__TRTCElectron');
+            if (jsonStr) {
+                try {
+                    const jsonObj = JSON.parse(jsonStr);
+                    if (jsonObj.componentName && typeof jsonObj.componentName === 'string') {
+                        componentName = jsonObj.componentName;
+                    }
+                }
+                catch (error) {
+                    console.warn('trtc: localstorage TRTCElectron parse error.', error);
                 }
-            }
-            catch (error) {
-                console.warn('trtc: localstorage TRTCElectron parse error.', error);
             }
         }
+        else {
+            /**
+             * localStorage not defined or accessing is denied.
+             *
+             * Will occur when third-party scripts cookies are disallowed and access to localStorage may result in thrown SecurityError exceptions.
+             * ref 1: https://www.chromium.org/for-testers/bug-reporting-guidelines/uncaught-securityerror-failed-to-read-the-localstorage-property-from-window-access-is-denied-for-this-document/
+             * ref 2: https://cloud.tencent.com/developer/article/1803097
+             */
+        }
     }
     let componentNO = '';
     switch (componentName) {
         case 'TUIRoom':
             componentNO = '5';
             break;
+        case 'TUIRoomKit':
+            componentNO = '16';
+            break;
         default:
             break;
     }
@@ -668,11 +658,13 @@ class TRTCCloud extends events_1.EventEmitter {
                     return !(userId === item.uid && item.type === trtc_define_1.TRTCVideoStreamType.TRTCVideoStreamTypeSub);
                 });
             }
-            if (screenVideoBuffer.buffer && screenVideoBuffer.userId === userId) {
-                this.rtcCloud.setSubVideoBuffer(userId, screenVideoBuffer.buffer, screenVideoBuffer.streamType, 0, 0, screenVideoBuffer.pixelFormat, screenVideoBuffer.id);
-                screenVideoBuffer.buffer = null;
-                screenVideoBuffer.id = 0;
-                screenVideoBuffer.userId = '';
+            if (screenVideoBufferMap.has(userId)) {
+                const targetVideoBuffer = screenVideoBufferMap.get(userId);
+                if (targetVideoBuffer && targetVideoBuffer.buffer) {
+                    this.rtcCloud.setSubVideoBuffer(userId, targetVideoBuffer.buffer, targetVideoBuffer.streamType, 0, 0, targetVideoBuffer.pixelFormat, targetVideoBuffer.id);
+                    targetVideoBuffer.buffer = null;
+                }
+                screenVideoBufferMap.delete(userId);
             }
         }
         this.fire('onUserSubStreamAvailable', userId, available);
@@ -1104,15 +1096,21 @@ class TRTCCloud extends events_1.EventEmitter {
     handleOnScreenCaptureStarted() {
         this.isScreenCapturing = true;
         // 只有在 Buffer 为 null 时才新建，否则只能在 handleVideoSizeChange 事件中重新申请 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.id = (0, util_1.generateUniqueId)();
-            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, screenVideoBuffer.id);
+        const currentUserId = '';
+        let targetVideoBuffer = screenVideoBufferMap.get(currentUserId);
+        if (!targetVideoBuffer || !targetVideoBuffer.buffer) {
+            if (!targetVideoBuffer) {
+                targetVideoBuffer = new trtc_define_1.VideoBufferInfo();
+            }
+            targetVideoBuffer.userId = currentUserId;
+            targetVideoBuffer.streamType = this.screenCaptureStreamType;
+            targetVideoBuffer.buffer = (0, util_1.allocBuffer)(DEFAULT_VIDEO_WIDTH * DEFAULT_VIDEO_HEIGHT * this.pixelLength);
+            targetVideoBuffer.id = (0, util_1.generateUniqueId)();
+            targetVideoBuffer.pixelFormat = this.pixelformate;
+            targetVideoBuffer.width = DEFAULT_VIDEO_WIDTH;
+            targetVideoBuffer.height = DEFAULT_VIDEO_HEIGHT;
+            this.rtcCloud.setSubVideoBuffer(targetVideoBuffer.userId, targetVideoBuffer.buffer, targetVideoBuffer.streamType, targetVideoBuffer.width, targetVideoBuffer.height, targetVideoBuffer.pixelFormat, targetVideoBuffer.id);
+            screenVideoBufferMap.set(targetVideoBuffer.userId, targetVideoBuffer);
         }
         this.fire('onScreenCaptureStarted');
     }
@@ -1142,10 +1140,14 @@ class TRTCCloud extends events_1.EventEmitter {
      */
     handleOnScreenCaptureStopped(reason) {
         if (this.isScreenCapturing) {
-            if (screenVideoBuffer.buffer) {
-                this.rtcCloud.setSubVideoBuffer('', screenVideoBuffer.buffer, screenVideoBuffer.streamType, 0, 0, screenVideoBuffer.pixelFormat, screenVideoBuffer.id);
-                screenVideoBuffer.buffer = null;
-                screenVideoBuffer.id = 0;
+            const currentUserId = '';
+            const targetVideoBuffer = screenVideoBufferMap.get(currentUserId);
+            if (targetVideoBuffer) {
+                if (targetVideoBuffer.buffer) {
+                    this.rtcCloud.setSubVideoBuffer(targetVideoBuffer.userId, targetVideoBuffer.buffer, targetVideoBuffer.streamType, 0, 0, targetVideoBuffer.pixelFormat, targetVideoBuffer.id);
+                    targetVideoBuffer.buffer = null;
+                }
+                screenVideoBufferMap.delete(currentUserId);
             }
             this.isScreenCapturing = false;
         }
@@ -1290,7 +1292,7 @@ class TRTCCloud extends events_1.EventEmitter {
                 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.buffer = (0, util_1.allocBuffer)(width * height * this.pixelLength);
                             remoteUserVideoBuffers.big.id = (0, util_1.generateUniqueId)();
                             remoteUserVideoBuffers.big.width = width;
                             remoteUserVideoBuffers.big.height = height;
@@ -1300,7 +1302,7 @@ class TRTCCloud extends events_1.EventEmitter {
                     }
                     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.buffer = (0, util_1.allocBuffer)(width * height * this.pixelLength);
                             remoteUserVideoBuffers.small.id = (0, util_1.generateUniqueId)();
                             remoteUserVideoBuffers.small.width = width;
                             remoteUserVideoBuffers.small.height = height;
@@ -1315,13 +1317,19 @@ class TRTCCloud extends events_1.EventEmitter {
             }
             else {
                 // 远端用户屏幕分享
-                if (screenVideoBuffer.width !== width || screenVideoBuffer.height !== height) {
-                    screenVideoBuffer.buffer = (0, util_1.allocBuffer)(width * height * this.pixelLength, userId, streamType);
-                    screenVideoBuffer.id = (0, util_1.generateUniqueId)();
-                    screenVideoBuffer.width = width;
-                    screenVideoBuffer.height = height;
-                    screenVideoBuffer.pixelFormat = this.pixelformate;
-                    this.rtcCloud.setSubVideoBuffer(userId, screenVideoBuffer.buffer, streamType, width, height, screenVideoBuffer.pixelFormat, screenVideoBuffer.id);
+                const targetVideoBuffer = screenVideoBufferMap.get(userId);
+                if (targetVideoBuffer) {
+                    if (targetVideoBuffer.width !== width || targetVideoBuffer.height !== height) {
+                        targetVideoBuffer.buffer = (0, util_1.allocBuffer)(width * height * this.pixelLength);
+                        targetVideoBuffer.id = (0, util_1.generateUniqueId)();
+                        targetVideoBuffer.width = width;
+                        targetVideoBuffer.height = height;
+                        targetVideoBuffer.pixelFormat = this.pixelformate;
+                        this.rtcCloud.setSubVideoBuffer(userId, targetVideoBuffer.buffer, targetVideoBuffer.streamType, width, height, targetVideoBuffer.pixelFormat, targetVideoBuffer.id);
+                    }
+                }
+                else {
+                    console.error('trtc: remote user screen-share video buffer not exist');
                 }
             }
         }
@@ -1329,20 +1337,27 @@ class TRTCCloud extends events_1.EventEmitter {
             // 本地用户
             if (this.isScreenCapturing && this.screenCaptureStreamType === streamType) {
                 // 本地屏幕分享
-                if (screenVideoBuffer.width !== width || screenVideoBuffer.height !== height) {
-                    screenVideoBuffer.buffer = (0, util_1.allocBuffer)(width * height * this.pixelLength, screenVideoBuffer.userId, streamType);
-                    screenVideoBuffer.id = (0, util_1.generateUniqueId)();
-                    screenVideoBuffer.width = width;
-                    screenVideoBuffer.height = height;
-                    screenVideoBuffer.pixelFormat = this.pixelformate;
-                    this.rtcCloud.setSubVideoBuffer('', screenVideoBuffer.buffer, screenVideoBuffer.streamType, width, height, screenVideoBuffer.pixelFormat, screenVideoBuffer.id);
+                const currentUserId = '';
+                const targetVideoBuffer = screenVideoBufferMap.get(currentUserId);
+                if (targetVideoBuffer) {
+                    if (targetVideoBuffer.width !== width || targetVideoBuffer.height !== height) {
+                        targetVideoBuffer.buffer = (0, util_1.allocBuffer)(width * height * this.pixelLength);
+                        targetVideoBuffer.id = (0, util_1.generateUniqueId)();
+                        targetVideoBuffer.width = width;
+                        targetVideoBuffer.height = height;
+                        targetVideoBuffer.pixelFormat = this.pixelformate;
+                        this.rtcCloud.setSubVideoBuffer(currentUserId, targetVideoBuffer.buffer, targetVideoBuffer.streamType, width, height, targetVideoBuffer.pixelFormat, targetVideoBuffer.id);
+                    }
+                }
+                else {
+                    console.error('trtc: current user screen-share video buffer not exist');
                 }
             }
             else {
                 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.buffer = (0, util_1.allocBuffer)(width * height * this.pixelLength);
                         cameraTestVideoBuffer.id = (0, util_1.generateUniqueId)();
                         cameraTestVideoBuffer.width = width;
                         cameraTestVideoBuffer.height = height;
@@ -1353,7 +1368,7 @@ class TRTCCloud extends events_1.EventEmitter {
                 else {
                     // 本地摄像头
                     if (localVideoBuffer.width !== width || localVideoBuffer.height !== height) {
-                        localVideoBuffer.buffer = (0, util_1.allocBuffer)(width * height * this.pixelLength, localVideoBuffer.userId, streamType);
+                        localVideoBuffer.buffer = (0, util_1.allocBuffer)(width * height * this.pixelLength);
                         localVideoBuffer.id = (0, util_1.generateUniqueId)();
                         localVideoBuffer.width = width;
                         localVideoBuffer.height = height;
@@ -1448,12 +1463,11 @@ class TRTCCloud extends events_1.EventEmitter {
             localVideoBuffer.buffer = null;
             localVideoBuffer.id = 0;
         }
-        if (screenVideoBuffer.buffer) {
-            this.rtcCloud.setSubVideoBuffer(screenVideoBuffer.userId, screenVideoBuffer.buffer, screenVideoBuffer.streamType, 0, 0, screenVideoBuffer.pixelFormat, screenVideoBuffer.id);
-            screenVideoBuffer.buffer = null;
-            screenVideoBuffer.id = 0;
-            screenVideoBuffer.userId = '';
-        }
+        screenVideoBufferMap.forEach((videoBufferInfo, key) => {
+            this.rtcCloud.setSubVideoBuffer(videoBufferInfo.userId, videoBufferInfo.buffer, videoBufferInfo.streamType, 0, 0, videoBufferInfo.pixelFormat, videoBufferInfo.id);
+            videoBufferInfo.buffer = null;
+        });
+        screenVideoBufferMap.clear();
         if (cameraTestVideoBuffer.buffer) {
             this.rtcCloud.setCameraTestVideoBuffer(cameraTestVideoBuffer.buffer, 0, 0, cameraTestVideoBuffer.pixelFormat, cameraTestVideoBuffer.id);
             cameraTestVideoBuffer.buffer = null;
@@ -1745,7 +1759,7 @@ class TRTCCloud extends events_1.EventEmitter {
             // 只有在 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);
+                localVideoBuffer.buffer = (0, util_1.allocBuffer)(DEFAULT_VIDEO_WIDTH * DEFAULT_VIDEO_HEIGHT * this.pixelLength);
                 localVideoBuffer.id = (0, util_1.generateUniqueId)();
                 localVideoBuffer.pixelFormat = this.pixelformate;
                 localVideoBuffer.width = DEFAULT_VIDEO_WIDTH;
@@ -1849,15 +1863,14 @@ class TRTCCloud extends events_1.EventEmitter {
             }
             // view 为 null 时，可能启动了自定义渲染，所以 Buffer 还是要创建，否则自定义渲染就拿不到数据；
             // view 非 null 时，当然必须创建 Buffer
-            const videoBufferInfo = {
+            const videoBufferInfo = new trtc_define_1.VideoBufferInfo({
                 userId: userId,
-                buffer: (0, util_1.allocBuffer)(DEFAULT_VIDEO_WIDTH * DEFAULT_VIDEO_HEIGHT * this.pixelLength, userId, streamType),
                 id: (0, util_1.generateUniqueId)(),
                 streamType: streamType,
                 width: DEFAULT_VIDEO_WIDTH,
                 height: DEFAULT_VIDEO_HEIGHT,
                 pixelFormat: this.pixelformate,
-            };
+            });
             if (streamType !== trtc_define_1.TRTCVideoStreamType.TRTCVideoStreamTypeSub) {
                 const remoteUserVideoBuffers = remoteVideoBufferMap.get(userId);
                 if (!remoteUserVideoBuffers) {
@@ -1884,9 +1897,11 @@ class TRTCCloud extends events_1.EventEmitter {
             else {
                 // 远端屏幕分享
                 // 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, screenVideoBuffer.id);
+                let targetVideoBuffer = screenVideoBufferMap.get(userId);
+                if (!targetVideoBuffer || !targetVideoBuffer.buffer) {
+                    targetVideoBuffer = videoBufferInfo;
+                    this.rtcCloud.setSubVideoBuffer(targetVideoBuffer.userId, targetVideoBuffer.buffer, targetVideoBuffer.streamType, targetVideoBuffer.width, targetVideoBuffer.height, targetVideoBuffer.pixelFormat, targetVideoBuffer.id);
+                    screenVideoBufferMap.set(userId, targetVideoBuffer);
                 }
             }
             this.addRemoteVideoRenderCallback(userId);
@@ -1927,11 +1942,13 @@ class TRTCCloud extends events_1.EventEmitter {
                 remoteVideoBufferMap.delete(userId);
             }
         }
-        else if (screenVideoBuffer.userId === userId && screenVideoBuffer.streamType === streamType) {
-            this.rtcCloud.setSubVideoBuffer(userId, screenVideoBuffer.buffer, screenVideoBuffer.streamType, 0, 0, screenVideoBuffer.pixelFormat, screenVideoBuffer.id);
-            screenVideoBuffer.buffer = null;
-            screenVideoBuffer.id = 0;
-            screenVideoBuffer.userId = '';
+        else {
+            const targetVideoBuffer = screenVideoBufferMap.get(userId);
+            if (targetVideoBuffer && targetVideoBuffer.streamType === streamType) {
+                this.rtcCloud.setSubVideoBuffer(userId, targetVideoBuffer.buffer, targetVideoBuffer.streamType, 0, 0, targetVideoBuffer.pixelFormat, targetVideoBuffer.id);
+                targetVideoBuffer.buffer = null;
+                screenVideoBufferMap.delete(userId);
+            }
         }
     }
     /**
@@ -1994,12 +2011,16 @@ class TRTCCloud extends events_1.EventEmitter {
             }
         });
         remoteVideoBufferMap.clear();
-        if (screenVideoBuffer.buffer && !this.isScreenCapturing) {
-            this.rtcCloud.setSubVideoBuffer(screenVideoBuffer.userId, screenVideoBuffer.buffer, screenVideoBuffer.streamType, 0, 0, screenVideoBuffer.pixelFormat, screenVideoBuffer.id);
-            screenVideoBuffer.buffer = null;
-            screenVideoBuffer.id = 0;
-            screenVideoBuffer.userId = '';
-        }
+        const currentUserId = '';
+        screenVideoBufferMap.forEach((videoBufferInfo, key) => {
+            if (key !== currentUserId) {
+                if (videoBufferInfo.buffer) {
+                    this.rtcCloud.setSubVideoBuffer(videoBufferInfo.userId, videoBufferInfo.buffer, videoBufferInfo.streamType, 0, 0, videoBufferInfo.pixelFormat, videoBufferInfo.id);
+                    videoBufferInfo.buffer = null;
+                }
+                screenVideoBufferMap.delete(videoBufferInfo.userId);
+            }
+        });
     }
     /**
      * 3.9 暂停接收指定的远端视频流
@@ -2257,15 +2278,14 @@ class TRTCCloud extends events_1.EventEmitter {
     setRemoteVideoStreamType(userId, streamType) {
         const remoteUserVideoBuffers = remoteVideoBufferMap.get(userId);
         if (remoteUserVideoBuffers) {
-            const videoBufferInfo = {
+            const videoBufferInfo = new trtc_define_1.VideoBufferInfo({
                 userId: userId,
-                buffer: (0, util_1.allocBuffer)(DEFAULT_VIDEO_WIDTH * DEFAULT_VIDEO_HEIGHT * this.pixelLength, userId, streamType),
                 id: (0, util_1.generateUniqueId)(),
                 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, videoBufferInfo.id);
@@ -2988,7 +3008,9 @@ class TRTCCloud extends events_1.EventEmitter {
             console.error('trtc:startScreenCapture, params is not instanceof TRTCVideoEncParam!');
             return;
         }
-        if (this.isScreenCapturing && this.screenCaptureStreamType !== type && screenVideoBuffer.buffer) {
+        const currentUserId = '';
+        const targetVideoBuffer = screenVideoBufferMap.get(currentUserId);
+        if (this.isScreenCapturing && this.screenCaptureStreamType !== type && targetVideoBuffer && targetVideoBuffer.buffer) {
             // 已经在分享中，切换分享流类型，停止当前正在进行的分享
             this.stopScreenCapture();
         }
@@ -3158,10 +3180,10 @@ class TRTCCloud extends events_1.EventEmitter {
         if (userId !== undefined && userId !== null
             && pixelFormat !== undefined && bufferType !== undefined && callback !== undefined) {
             if (callback !== null) {
-                let remotecallback = new VideoRenderCallback();
-                remotecallback.callback = callback;
-                remotecallback.pixelFormat = pixelFormat;
-                this.remoteVideoCallback.set(String(userId), remotecallback);
+                const remoteCallback = new VideoRenderCallback();
+                remoteCallback.callback = callback;
+                remoteCallback.pixelFormat = pixelFormat;
+                this.remoteVideoCallback.set(String(userId), remoteCallback);
             }
             else {
                 this.remoteVideoCallback.delete(String(userId));
@@ -3647,7 +3669,7 @@ class TRTCCloud extends events_1.EventEmitter {
                 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.buffer = (0, util_1.allocBuffer)(DEFAULT_VIDEO_WIDTH * DEFAULT_VIDEO_HEIGHT * this.pixelLength);
                 cameraTestVideoBuffer.id = (0, util_1.generateUniqueId)();
                 cameraTestVideoBuffer.width = DEFAULT_VIDEO_WIDTH;
                 cameraTestVideoBuffer.height = DEFAULT_VIDEO_HEIGHT;
@@ -3815,8 +3837,13 @@ class TRTCCloud extends events_1.EventEmitter {
         this.rtcCloud.addLocalVideoRenderCallback((id, type, width, height, timestamp, rotation, valid, bufferId) => {
             if (this.enableRenderFrame) {
                 if (valid === 1) {
-                    if (this.isScreenCapturing && this.screenCaptureStreamType === type && screenVideoBuffer.id === bufferId) {
-                        this._onRenderFrame(id, type, width, height, timestamp, rotation, screenVideoBuffer.buffer);
+                    const currentUserId = '';
+                    const localScreenShareVideoBuffer = screenVideoBufferMap.get(currentUserId);
+                    if (this.isScreenCapturing
+                        && this.screenCaptureStreamType === type
+                        && localScreenShareVideoBuffer
+                        && localScreenShareVideoBuffer.id === bufferId) {
+                        this._onRenderFrame(id, type, width, height, timestamp, rotation, localScreenShareVideoBuffer.buffer);
                     }
                     else if (localVideoBuffer.id === bufferId) {
                         this._onRenderFrame(id, type, width, height, timestamp, rotation, localVideoBuffer.buffer);
@@ -3833,6 +3860,7 @@ class TRTCCloud extends events_1.EventEmitter {
     }
     addRemoteVideoRenderCallback(userId) {
         this.rtcCloud.addRemoteVideoRenderCallback(userId, (id, type, width, height, timestamp, rotation, valid, bufferId) => {
+            var _a, _b;
             if (this.enableRenderFrame) {
                 if (valid === 1) {
                     const remoteUserVideoBuffers = remoteVideoBufferMap.get(id);
@@ -3845,9 +3873,9 @@ class TRTCCloud extends events_1.EventEmitter {
                             this._onRenderFrame(id, type, width, height, timestamp, rotation, remoteUserVideoBuffers.small.buffer);
                         }
                     }
-                    else if (screenVideoBuffer.id === bufferId) {
+                    else if (((_a = screenVideoBufferMap.get(id)) === null || _a === void 0 ? void 0 : _a.id) === bufferId) {
                         // 辅流
-                        this._onRenderFrame(id, type, width, height, timestamp, rotation, screenVideoBuffer.buffer);
+                        this._onRenderFrame(id, type, width, height, timestamp, rotation, (_b = screenVideoBufferMap.get(id)) === null || _b === void 0 ? void 0 : _b.buffer);
                     }
                     else {
                         console.log(`trtc: ${id} ${type} video buffer reallocated`);
@@ -4016,7 +4044,7 @@ class TRTCCloud extends events_1.EventEmitter {
                 this._onRealRender(uid, streamType, width, height, timestamp, rotation, data);
             }
             //回调远程给用户数据
-            let remoteCallback = this.remoteVideoCallback.get(uid);
+            const remoteCallback = this.remoteVideoCallback.get(uid);
             if (remoteCallback !== undefined &&
                 remoteCallback !== null &&
                 remoteCallback.callback !== undefined &&

package/liteav/trtc_define.d.ts

@@ -772,7 +772,7 @@ export interface PluginInfo {
     setParameter: (param: string) => number;
     getParameter: (paramKey: string) => string;
 }
-export interface VideoBufferInfo {
+export declare class VideoBufferInfo {
     id: number;
     userId: string;
     buffer: Buffer | null;
@@ -780,4 +780,13 @@ export interface VideoBufferInfo {
     width: number;
     height: number;
     pixelFormat: TRTCVideoPixelFormat;
+    pixelLength: number;
+    constructor(options?: {
+        id: number;
+        userId: string;
+        width: number;
+        height: number;
+        streamType: TRTCVideoStreamType;
+        pixelFormat: TRTCVideoPixelFormat;
+    });
 }

package/liteav/trtc_define.js

@@ -6,7 +6,8 @@
  *
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TRTCSwitchRoomParam = exports.AudioMusicParam = exports.TRTCStatistics = exports.TRTCRemoteStatistics = exports.TRTCLocalStatistics = exports.TRTCAudioEffectParam = exports.TRTCAudioRecordingParams = exports.TRTCPublishCDNParam = exports.TRTCTranscodingConfig = exports.TRTCAudioRecordingContent = exports.TRTCMixInputType = exports.TRTCTranscodingConfigMode = exports.TRTCMixUser = exports.Rect = exports.TRTCSpeedTestResult = exports.TRTCSpeedTestParams = exports.TRTCVolumeInfo = exports.TRTCQualityInfo = exports.TRTCNetworkQosParam = exports.TRTCRenderParams = exports.TRTCVideoEncParam = exports.TRTCParams = exports.TRTCWaterMarkSrcType = exports.TRTCDeviceType = exports.TRTCDeviceState = exports.TRTCLogLevel = exports.TRTCVideoFrame = exports.TRTCDeviceInfo = exports.TRTCScreenCaptureProperty = exports.TRTCScreenCaptureSourceInfo = exports.TRTCImageBuffer = exports.TRTCAudioQuality = exports.TRTCScreenCaptureSourceType = exports.TRTCAudioFrameFormat = exports.TRTCVideoQosPreference = exports.TRTCQosControlMode = exports.TRTCRoleType = exports.TRTCAppScene = exports.TRTCRecordType = exports.TRTCVideoMirrorType = exports.TRTCVideoBufferType = exports.TRTCVideoPixelFormat = exports.TRTCBeautyStyle = exports.TRTCVideoRotation = exports.TRTCVideoFillMode = exports.TRTCQuality = exports.TRTCVideoStreamType = exports.TRTCVideoResolutionMode = exports.TRTCVideoResolution = void 0;
+exports.VideoBufferInfo = exports.TRTCSwitchRoomParam = exports.AudioMusicParam = exports.TRTCStatistics = exports.TRTCRemoteStatistics = exports.TRTCLocalStatistics = exports.TRTCAudioEffectParam = exports.TRTCAudioRecordingParams = exports.TRTCPublishCDNParam = exports.TRTCTranscodingConfig = exports.TRTCAudioRecordingContent = exports.TRTCMixInputType = exports.TRTCTranscodingConfigMode = exports.TRTCMixUser = exports.Rect = exports.TRTCSpeedTestResult = exports.TRTCSpeedTestParams = exports.TRTCVolumeInfo = exports.TRTCQualityInfo = exports.TRTCNetworkQosParam = exports.TRTCRenderParams = exports.TRTCVideoEncParam = exports.TRTCParams = exports.TRTCWaterMarkSrcType = exports.TRTCDeviceType = exports.TRTCDeviceState = exports.TRTCLogLevel = exports.TRTCVideoFrame = exports.TRTCDeviceInfo = exports.TRTCScreenCaptureProperty = exports.TRTCScreenCaptureSourceInfo = exports.TRTCImageBuffer = exports.TRTCAudioQuality = exports.TRTCScreenCaptureSourceType = exports.TRTCAudioFrameFormat = exports.TRTCVideoQosPreference = exports.TRTCQosControlMode = exports.TRTCRoleType = exports.TRTCAppScene = exports.TRTCRecordType = exports.TRTCVideoMirrorType = exports.TRTCVideoBufferType = exports.TRTCVideoPixelFormat = exports.TRTCBeautyStyle = exports.TRTCVideoRotation = exports.TRTCVideoFillMode = exports.TRTCQuality = exports.TRTCVideoStreamType = exports.TRTCVideoResolutionMode = exports.TRTCVideoResolution = void 0;
+const util_1 = require("./Renderer/util");
 /////////////////////////////////////////////////////////////////////////////////
 //
 //                    【（一）视频相关枚举值定义】
@@ -1395,3 +1396,27 @@ class TRTCSwitchRoomParam {
     }
 }
 exports.TRTCSwitchRoomParam = TRTCSwitchRoomParam;
+class VideoBufferInfo {
+    constructor(options) {
+        this.id = -1;
+        this.userId = "";
+        this.buffer = null;
+        this.streamType = TRTCVideoStreamType.TRTCVideoStreamTypeBig;
+        this.width = 0;
+        this.height = 0;
+        this.pixelFormat = TRTCVideoPixelFormat.TRTCVideoPixelFormat_I420;
+        this.pixelLength = 1.5;
+        if (options) {
+            const { id, userId, width, height, streamType, pixelFormat } = options;
+            this.id = id;
+            this.userId = userId;
+            this.width = width;
+            this.height = height;
+            this.streamType = streamType;
+            this.pixelFormat = pixelFormat;
+            this.pixelLength = this.pixelFormat === TRTCVideoPixelFormat.TRTCVideoPixelFormat_I420 ? 1.5 : 4;
+            this.buffer = (0, util_1.allocBuffer)(width * height * this.pixelLength);
+        }
+    }
+}
+exports.VideoBufferInfo = VideoBufferInfo;

package/package.json

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