trtc-electron-sdk 9.8.8-alpha.3 → 9.8.8-alpha.4

package/liteav/Render/Canvas3DRGBARenderer/index.js

@@ -77,7 +77,7 @@ class Canvas3DRGBARenderer {
         this.gl.attachShader(this.glProgram, fragmentShader);
         this.gl.linkProgram(this.glProgram);
         if (!this.gl.getProgramParameter(this.glProgram, this.gl.LINK_STATUS)) {
-            console.log('Unable to initialize the shader program.');
+            console.log('trtc:Unable to initialize the shader program.');
             return false;
         }
         else {
@@ -91,7 +91,7 @@ class Canvas3DRGBARenderer {
         this.gl.shaderSource(shader, src);
         this.gl.compileShader(shader);
         if (!this.gl.getShaderParameter(shader, this.gl.COMPILE_STATUS)) {
-            console.log(`Error compiling shader: ${this.gl.getShaderInfoLog(shader)}`);
+            console.log(`trtc:Error compiling shader: ${this.gl.getShaderInfoLog(shader)}`);
             return null;
         }
         return shader;
@@ -154,17 +154,17 @@ class Canvas3DRGBARenderer {
         do {
             ret = this._initGL();
             if (!ret) {
-                console.log('initGL failed');
+                console.log('trtc:init WebGL failed');
                 break;
             }
             ret = this._initShaders();
             if (!ret) {
-                console.log('initShaders failed');
+                console.log('trtc:init WebGL Shader failed');
                 break;
             }
             ret = this._initUniforms();
             if (!ret) {
-                console.log('initUniforms failed');
+                console.log('trtc:int WebGL Uniform failed');
                 break;
             }
         } while (false);
@@ -226,11 +226,12 @@ class Canvas3DRGBARenderer {
         });
         try {
             this.gl.viewport(0, 0, contentWidth, contentHeight);
-            this.gl.texImage2D(this.gl.TEXTURE_2D, 0, this.gl.RGBA, contentWidth, contentHeight, 0, this.gl.RGBA, this.gl.UNSIGNED_BYTE, new Uint8Array(imageData.data));
+            this.gl.texImage2D(this.gl.TEXTURE_2D, 0, this.gl.RGBA, contentWidth, contentHeight, 0, this.gl.RGBA, this.gl.UNSIGNED_BYTE, imageData.data // new Uint8Array(imageData.data)
+            );
             this.gl.drawElements(this.gl.TRIANGLES, 6, this.gl.UNSIGNED_SHORT, 0);
         }
         catch (error) {
-            console.error(error);
+            console.error('trtc:', error);
         }
     }
     setContentMode(mode = 0) {

package/liteav/Render/GlRenderer/index.js

@@ -48,7 +48,7 @@ const TrtcRender = function () {
             gl.getExtension('WEBGL_lose_context').loseContext();
         }
         catch (err) {
-            console.warn(err);
+            console.warn('trtc:', err);
         }
         program = undefined;
         positionLocation = undefined;
@@ -69,7 +69,7 @@ const TrtcRender = function () {
             that.view && that.view.removeChild(that.container);
         }
         catch (e) {
-            console.warn(e);
+            console.warn('trtc:', e);
         }
         that.canvas = undefined;
         that.container = undefined;
@@ -83,7 +83,7 @@ const TrtcRender = function () {
     };
     that.renderImage = function (image) {
         if (!gl) {
-            console.log('!gl');
+            console.log('trtc:no gl');
             return;
         }
         if (image.width != that.initWidth
@@ -93,7 +93,7 @@ const TrtcRender = function () {
             const view = that.view;
             that.unbind();
             initCanvas(view, image.mirror, image.width, image.height, image.rotation, image.isNeedRotate, e => {
-                console.error(`init canvas ${image.width}*${image.height} rotation ${image.rotation} failed. ${e}`);
+                console.error(`trtc:init canvas ${image.width}*${image.height} rotation ${image.rotation} failed. ${e}`);
             });
         }
         gl.bindBuffer(gl.ARRAY_BUFFER, texCoordBuffer);
@@ -175,7 +175,7 @@ const TrtcRender = function () {
         if (config.getDebugMode()) {
             e = gl.getError();
             if (e != gl.NO_ERROR) {
-                console.log('upload y plane ', width, height, yplane.byteLength, ' error', e);
+                console.log('trtc:upload y plane ', width, height, yplane.byteLength, ' error', e);
             }
         }
         gl.activeTexture(gl.TEXTURE1);
@@ -184,7 +184,7 @@ const TrtcRender = function () {
         if (config.getDebugMode()) {
             e = gl.getError();
             if (e != gl.NO_ERROR) {
-                console.log('upload u plane ', width, height, uplane.byteLength, '  error', e);
+                console.log('trtc:upload u plane ', width, height, uplane.byteLength, '  error', e);
             }
         }
         gl.activeTexture(gl.TEXTURE2);
@@ -194,7 +194,7 @@ const TrtcRender = function () {
         if (config.getDebugMode()) {
             e = gl.getError();
             if (e != gl.NO_ERROR) {
-                console.log('upload v plane ', width, height, vplane.byteLength, '  error', e);
+                console.log('trtc:upload v plane ', width, height, vplane.byteLength, '  error', e);
             }
         }
     }
@@ -273,7 +273,7 @@ const TrtcRender = function () {
             }) || that.canvas.getContext('experimental-webgl');
         }
         catch (e) {
-            console.log(e);
+            console.log('trtc:', e);
         }
         if (!gl) {
             gl = undefined;
@@ -361,9 +361,9 @@ const TrtcRender = function () {
             }
         }
         catch (e) {
-            console.log(`updateCanvas error ${that.canvas}`);
-            console.log(that);
-            console.error(e);
+            console.log(`trtc:updateCanvas error ${that.canvas}`);
+            console.log('trtc:', that);
+            console.error('trtc:', e);
             return false;
         }
         return true;

package/liteav/Render/GlRenderer/webgl-utils.js

@@ -51,10 +51,10 @@
     function error(msg) {
         if (topWindow.console) {
             if (topWindow.console.error) {
-                topWindow.console.error(msg);
+                topWindow.console.error('trtc:', msg);
             }
             else if (topWindow.console.log) {
-                topWindow.console.log(msg);
+                topWindow.console.log('trtc:', msg);
             }
         }
     }

package/liteav/Render/RGBRenderer/index.js

@@ -102,7 +102,7 @@ class RGBRenderer {
             ctx.drawImage(tempCanvas, 0, 0);
         }
         catch (error) {
-            console.error('RGBRenderer.drawFrame error:', error);
+            console.error('trtc:RGBRenderer.drawFrame error:', error);
         }
     }
     setContentMode(mode = 0) {

package/liteav/Render/util.d.ts

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

package/liteav/Render/util.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.config = exports.calcVideoStyle = exports.calcCanvasStyle = exports.calcScaleRate = exports.isNeedKeepWidthAndHeight = exports.Config = void 0;
+exports.allocBuffer = exports.config = exports.calcVideoStyle = exports.calcCanvasStyle = exports.calcScaleRate = exports.isNeedKeepWidthAndHeight = exports.Config = void 0;
 /**
  * 配置对象, 可用来打开 debug 模式
  *
@@ -127,3 +127,11 @@ function calcVideoStyle(options = {
 }
 exports.calcVideoStyle = calcVideoStyle;
 exports.config = new Config();
+function allocBuffer(length, userId, streamType) {
+    console.debug('trtc:alloc buffer:', length, userId, streamType);
+    if (length >= 1) {
+        return Buffer.alloc(length);
+    }
+    return null;
+}
+exports.allocBuffer = allocBuffer;

package/liteav/trtc.d.ts

@@ -27,6 +27,7 @@ declare class TRTCCloud extends EventEmitter {
     private remoteVideoCallback;
     private isExternalRenderEnabled;
     private pixelformate;
+    private pixelLength;
     private localRotation;
     private localMirrorType;
     private remoteMainStreamFillMode;
@@ -41,6 +42,7 @@ declare class TRTCCloud extends EventEmitter {
     private playAudioEffectIdList;
     private enableRenderFrame;
     private screenCaptureStreamType;
+    private isScreenCapturing;
     constructor();
     /**
      * 创建 TRTCCloud 对象单例
@@ -596,6 +598,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;
     /**
      * 1.1 进入房间
      *
@@ -2017,8 +2020,8 @@ declare class TRTCCloud extends EventEmitter {
      */
     _isSupportWebGL(): boolean;
     _getRenderer(uid: string, type: TRTCVideoStreamType): any;
-    _onRenderFrame(uid: string, type: TRTCVideoStreamType, width: number, height: number, timestamp: number, rotation: number, data: any): void;
-    _onRealRender(uid: string, type: TRTCVideoStreamType, width: number, height: number, timestamp: number, rotation: number, data: any): void;
+    _onRenderFrame(uid: string, type: TRTCVideoStreamType, width: number, height: number, timestamp: number, rotation: number, data: any, length: number): void;
+    _onRealRender(uid: string, type: TRTCVideoStreamType, width: number, height: number, timestamp: number, rotation: number, data: any, length: number): void;
     _initRender(key: string, view: HTMLElement): void;
     _destroyRender(key: string, onFailure: ((err: Error) => void) | null): void;
     /**

package/liteav/trtc.js

@@ -33,6 +33,25 @@ __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 localVideoBuffer = {
+    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 = {
+    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 remoteVideoBufferMap = new Map();
 const SDK_LOG_LEVEL = 2;
 let genSecFunc = function (instance, key) {
     return function () {
@@ -44,7 +63,7 @@ let genSecFunc = function (instance, key) {
                 return result;
         }
         catch (err) {
-            console.warn(err);
+            console.warn('trtc:', err);
         }
     };
 };
@@ -116,6 +135,7 @@ class TRTCCloud extends events_1.EventEmitter {
         this.firstVideoFrameList = [];
         this.playStreamType = trtc_define_1.TRTCVideoStreamType.TRTCVideoStreamTypeBig;
         this.pixelformate = trtc_define_1.TRTCVideoPixelFormat.TRTCVideoPixelFormat_I420;
+        this.pixelLength = 1.5;
         this.renderMode = this._isSupportWebGL() ? 1 : 2;
         this.isExternalRenderEnabled = false;
         this.localFillMode = trtc_define_1.TRTCVideoFillMode.TRTCVideoFillMode_Fit;
@@ -134,8 +154,9 @@ class TRTCCloud extends events_1.EventEmitter {
         this.playAudioEffectIdList = [];
         this.enableRenderFrame = true;
         this.screenCaptureStreamType = trtc_define_1.TRTCVideoStreamType.TRTCVideoStreamTypeSub;
+        this.isScreenCapturing = false;
         this.initEventHandler();
-        console.log('constructor render:' + this.renderMode + '|sdk version:' + pkg.version +
+        console.log('trtc:constructor render:' + this.renderMode + '|sdk version:' + pkg.version +
             '|native sdk version:' + this.rtcCloud.getSDKVersion());
         //视频数据回调
         this.imageData = null;
@@ -205,7 +226,7 @@ class TRTCCloud extends events_1.EventEmitter {
      */
     initEventHandler() {
         this.rtcCloud.onEvent('apierror', (funcName) => {
-            console.error(`api ${funcName} failed. this is an error
+            console.error(`trtc:api ${funcName} failed. this is an error
               thrown by c++ addon layer. it often means sth is
               going wrong with this function call and it refused
               to do what is asked. kindly check your parameter types
@@ -349,6 +370,8 @@ 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;
             }
@@ -550,6 +573,12 @@ class TRTCCloud extends events_1.EventEmitter {
                 this.firstVideoFrameList = this.firstVideoFrameList.filter(function (item) {
                     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;
+                    remoteVideoBufferMap.delete(userId);
+                }
             }
         }
         this.fire('onUserVideoAvailable', userId, available);
@@ -569,6 +598,10 @@ class TRTCCloud extends events_1.EventEmitter {
                 this.firstVideoFrameList = this.firstVideoFrameList.filter(function (item) {
                     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.buffer = null;
+                }
             }
         }
         this.fire('onUserSubStreamAvailable', userId, available);
@@ -998,6 +1031,14 @@ class TRTCCloud extends events_1.EventEmitter {
      * @event TRTCCallback#onScreenCaptureStarted
      */
     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); /// Buffer.alloc(DEFAULT_VIDEO_WIDTH * DEFAULT_VIDEO_HEIGHT * this.pixelLength);
+        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');
     }
     /**
@@ -1025,6 +1066,13 @@ class TRTCCloud extends events_1.EventEmitter {
      * @param {Number} reason - 停止原因，0：表示用户主动停止；1：表示屏幕分享窗口被关闭
      */
     handleOnScreenCaptureStopped(reason) {
+        if (this.isScreenCapturing) {
+            if (screenVideoBuffer.buffer) {
+                this.rtcCloud.setSubVideoBuffer('', screenVideoBuffer.buffer, screenVideoBuffer.streamType, 0, 0, screenVideoBuffer.pixelFormat);
+                screenVideoBuffer.buffer = null;
+            }
+            this.isScreenCapturing = false;
+        }
         this.fire('onScreenCaptureStoped', reason);
         // 兼容旧版的单词拼写错误，避免旧版用户升级后无法触发回调
         this.fire('onScreenCaptureStopped', reason);
@@ -1114,6 +1162,64 @@ class TRTCCloud extends events_1.EventEmitter {
     handleOnSystemAudioLoopbackError(errCode) {
         this.fire('onSystemAudioLoopbackError', errCode);
     }
+    handleOnVideoSizeChange(userId, streamType, width, height) {
+        if (this.renderMode === 6) {
+            return;
+        }
+        if (userId) {
+            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); // Buffer.alloc(width * height * this.pixelLength);
+                        videoBufferInfo.width = width;
+                        videoBufferInfo.height = height;
+                        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`);
+                }
+            }
+            else {
+                // 远端用户屏幕分享
+                if (screenVideoBuffer.width !== width || screenVideoBuffer.height !== height) {
+                    screenVideoBuffer.buffer = (0, util_1.allocBuffer)(width * height * this.pixelLength, userId, streamType); // Buffer.alloc(width * height * this.pixelLength);
+                    screenVideoBuffer.width = width;
+                    screenVideoBuffer.height = height;
+                    screenVideoBuffer.pixelFormat = this.pixelformate;
+                    this.rtcCloud.setSubVideoBuffer(userId, screenVideoBuffer.buffer, streamType, width, height, screenVideoBuffer.pixelFormat);
+                }
+            }
+        }
+        else {
+            // 本地用户
+            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); // Buffer.alloc(width * height * this.pixelLength);
+                    screenVideoBuffer.width = width;
+                    screenVideoBuffer.height = height;
+                    screenVideoBuffer.pixelFormat = this.pixelformate;
+                    this.rtcCloud.setSubVideoBuffer('', screenVideoBuffer.buffer, screenVideoBuffer.streamType, width, height, screenVideoBuffer.pixelFormat);
+                }
+            }
+            else {
+                // 本地摄像头
+                if (localVideoBuffer.width !== width || localVideoBuffer.height !== height) {
+                    localVideoBuffer.buffer = (0, util_1.allocBuffer)(width * height * this.pixelLength, localVideoBuffer.userId, streamType); // Buffer.alloc(width * height * this.pixelLength);
+                    localVideoBuffer.width = width;
+                    localVideoBuffer.height = height;
+                    localVideoBuffer.pixelFormat = this.pixelformate;
+                    this.rtcCloud.setLocalVideoBuffer(localVideoBuffer.buffer, width, height, localVideoBuffer.pixelFormat);
+                }
+            }
+        }
+    }
     /////////////////////////////////////////////////////////////////////////////////
     //
     //                      （一）房间相关接口函数
@@ -1166,7 +1272,7 @@ class TRTCCloud extends events_1.EventEmitter {
             this.rtcCloud.enterRoom(params.sdkAppId, params.roomId, params.strRoomId, params.userId, params.userSig, params.privateMapKey, params.businessInfo, params.role, params.userDefineRecordId, params.streamId === '' ? null : params.streamId, scene);
         }
         else {
-            console.error('enterRoom, params is not instanceof TRTCParams!');
+            console.error('trtc:enterRoom, params is not instanceof TRTCParams!');
         }
     }
     /**
@@ -1182,6 +1288,20 @@ class TRTCCloud extends events_1.EventEmitter {
         this.streams.forEach((value, key, map) => {
             this._destroyRender(key, null);
         });
+        remoteVideoBufferMap.forEach((value, key) => {
+            this.rtcCloud.setRemoteVideoBuffer(key, value.buffer, value.streamType, 0, 0, value.pixelFormat);
+            value.buffer = null;
+        });
+        remoteVideoBufferMap.clear();
+        if (localVideoBuffer.buffer) {
+            this.rtcCloud.setLocalVideoBuffer(localVideoBuffer.buffer, 0, 0, localVideoBuffer.pixelFormat);
+            localVideoBuffer.buffer = null;
+        }
+        if (screenVideoBuffer.buffer) {
+            this.rtcCloud.setSubVideoBuffer(screenVideoBuffer.userId, screenVideoBuffer.buffer, screenVideoBuffer.streamType, 0, 0, screenVideoBuffer.pixelFormat);
+            screenVideoBuffer.buffer = null;
+            screenVideoBuffer.userId = '';
+        }
         this.rtcCloud.exitRoom();
     }
     /**
@@ -1332,7 +1452,7 @@ class TRTCCloud extends events_1.EventEmitter {
             this.rtcCloud.startPublishCDNStream(param.appId, param.bizId, param.url);
         }
         else {
-            console.error('startPublishCDNStream, param is not instanceof TRTCPublishCDNParam!');
+            console.error('trtc:startPublishCDNStream, param is not instanceof TRTCPublishCDNParam!');
         }
     }
     /**
@@ -1435,7 +1555,7 @@ class TRTCCloud extends events_1.EventEmitter {
             this.rtcCloud.setMixTranscodingConfig(configMode, config.appId, config.bizId, config.videoWidth, config.videoHeight, config.videoBitrate, config.videoFramerate, config.videoGOP, config.audioSampleRate, config.audioBitrate, config.audioChannels, config.backgroundColor, config.backgroundImage, config.streamId, config.mixUsersArray);
         }
         else {
-            console.error('setMixTranscodingConfig, config is not instanceof TRTCTranscodingConfig!');
+            console.error('trtc:setMixTranscodingConfig, config is not instanceof TRTCTranscodingConfig!');
         }
     }
     /////////////////////////////////////////////////////////////////////////////////
@@ -1456,12 +1576,18 @@ class TRTCCloud extends events_1.EventEmitter {
             if (view !== null) {
                 let key = this.getKey('local_video', trtc_define_1.TRTCVideoStreamType.TRTCVideoStreamTypeBig);
                 this._initRender(key, view);
+                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); // Buffer.alloc(DEFAULT_VIDEO_WIDTH * DEFAULT_VIDEO_HEIGHT * this.pixelLength);
+                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(trtc_define_1.TRTCVideoStreamType.TRTCVideoStreamTypeBig);
         }
         else {
-            console.error('startLocalPreview, view is undefined!');
+            console.error('trtc:startLocalPreview, view is undefined!');
         }
     }
     /**
@@ -1474,6 +1600,10 @@ class TRTCCloud extends events_1.EventEmitter {
         this.firstVideoFrameList = this.firstVideoFrameList.filter(function (item) {
             return !('' === item.uid && item.type === trtc_define_1.TRTCVideoStreamType.TRTCVideoStreamTypeBig);
         });
+        if (localVideoBuffer.buffer) {
+            this.rtcCloud.setLocalVideoBuffer(localVideoBuffer.buffer, 0, 0, localVideoBuffer.pixelFormat);
+            localVideoBuffer.buffer = null;
+        }
     }
     /**
      * 3.3 是否屏蔽自己的视频画面
@@ -1513,12 +1643,29 @@ class TRTCCloud extends events_1.EventEmitter {
                 }
                 const key = this.getKey(userId, bindStreamType);
                 this._initRender(key, view);
+                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.TRTCVideoStreamTypeSub) {
+                    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);
+                }
             }
             this.addRemoteVideoRenderCallback(userId, streamType);
             this.rtcCloud.startRemoteView(userId, streamType);
         }
         else {
-            console.error('startRemoteView, view is undefined!');
+            console.error('trtc:startRemoteView, view is undefined!');
         }
     }
     /**
@@ -1536,6 +1683,17 @@ 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);
+        }
+        else if (screenVideoBuffer.userId === userId && screenVideoBuffer.streamType === streamType) {
+            this.rtcCloud.setSubVideoBuffer(userId, screenVideoBuffer.buffer, screenVideoBuffer.streamType, 0, 0, screenVideoBuffer.pixelFormat);
+            screenVideoBuffer.buffer = null;
+            screenVideoBuffer.userId = '';
+        }
     }
     /**
      * 3.6 停止显示所有远端视频画面，同时不再拉取该远端用户的视频数据流
@@ -1550,6 +1708,16 @@ 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;
+        });
+        remoteVideoBufferMap.clear();
+        if (screenVideoBuffer.buffer && !this.isScreenCapturing) {
+            this.rtcCloud.setSubVideoBuffer(screenVideoBuffer.userId, screenVideoBuffer.buffer, screenVideoBuffer.streamType, 0, 0, screenVideoBuffer.pixelFormat);
+            screenVideoBuffer.buffer = null;
+            screenVideoBuffer.userId = '';
+        }
     }
     /**
      * 3.7 暂停接收指定的远端视频流
@@ -1594,7 +1762,7 @@ class TRTCCloud extends events_1.EventEmitter {
             this.rtcCloud.setVideoEncoderParam(params.videoResolution, params.resMode, params.videoFps, params.videoBitrate, params.minVideoBitrate, params.enableAdjustRes);
         }
         else {
-            console.error('setVideoEncoderParam, params is not instanceof TRTCVideoEncParam!');
+            console.error('trtc:setVideoEncoderParam, params is not instanceof TRTCVideoEncParam!');
         }
     }
     /**
@@ -1615,7 +1783,7 @@ class TRTCCloud extends events_1.EventEmitter {
             this.rtcCloud.setNetworkQosParam(params.preference, params.controlMode);
         }
         else {
-            console.error('setNetworkQosParam, params is not instanceof TRTCNetworkQosParam!');
+            console.error('trtc:setNetworkQosParam, params is not instanceof TRTCNetworkQosParam!');
         }
     }
     /**
@@ -1649,7 +1817,7 @@ class TRTCCloud extends events_1.EventEmitter {
             renderer.setContentMode(mode);
         }
         else {
-            console.error('api setLocalViewFillMode failed. the local stream is not exsit.');
+            console.error('trtc:api setLocalViewFillMode failed. the local stream is not exsit.');
         }
     }
     /**
@@ -1694,7 +1862,7 @@ class TRTCCloud extends events_1.EventEmitter {
             renderer.setContentMode(mode);
         }
         else {
-            console.error('api setRemoteViewFillMode failed. the remote stream is not exsit.');
+            console.error('trtc:api setRemoteViewFillMode failed. the remote stream is not exsit.');
         }
     }
     /**
@@ -1795,7 +1963,7 @@ class TRTCCloud extends events_1.EventEmitter {
             this.rtcCloud.enableSmallVideoStream(enable, params.videoResolution, params.resMode, params.videoFps, params.videoBitrate, params.minVideoBitrate, params.enableAdjustRes);
         }
         else {
-            console.error('enableSmallVideoStream, params is not instanceof TRTCVideoEncParam!');
+            console.error('trtc:enableSmallVideoStream, params is not instanceof TRTCVideoEncParam!');
         }
     }
     /**
@@ -1987,7 +2155,7 @@ class TRTCCloud extends events_1.EventEmitter {
             const recordParams = new trtc_define_1.TRTCAudioRecordingParams(path);
             return this.rtcCloud.startAudioRecording(recordParams.filePath, recordParams.recordingContent);
         }
-        console.error('startAudioRecording, params is not instanceof TRTCAudioRecordingParams!');
+        console.error('trtc:startAudioRecording, params is not instanceof TRTCAudioRecordingParams!');
         return -1;
     }
     /**
@@ -2290,7 +2458,7 @@ class TRTCCloud extends events_1.EventEmitter {
             renderer.setContentMode(mode);
         }
         else {
-            console.error('api setRemoteSubStreamViewFillMode failed. the remote sub stream is not exsit.');
+            console.error('trtc:api setRemoteSubStreamViewFillMode failed. the remote sub stream is not exsit.');
         }
     }
     /**
@@ -2377,7 +2545,7 @@ class TRTCCloud extends events_1.EventEmitter {
             return this.rtcCloud.selectScreenCaptureTarget(selSource.type, selSource.sourceId, selSource.sourceName, selSource.isMinimizeWindow, deprecatedCaptureRect.left, deprecatedCaptureRect.top, deprecatedCaptureRect.right, deprecatedCaptureRect.bottom, selProperty.enableCaptureMouse, selProperty.enableHighLight, selProperty.enableHighPerformance, selProperty.highLightColor, selProperty.highLightWidth, selProperty.enableCaptureChildWindow);
         }
         else {
-            console.error('selectScreenCaptureTarget, sourceId or sourcename is undefined!');
+            console.error('trtc:selectScreenCaptureTarget, sourceId or sourcename is undefined!');
         }
     }
     /**
@@ -2396,7 +2564,7 @@ class TRTCCloud extends events_1.EventEmitter {
             type = trtc_define_1.TRTCVideoStreamType.TRTCVideoStreamTypeSub;
         }
         if (params && !(params instanceof trtc_define_1.TRTCVideoEncParam)) {
-            console.error('startScreenCapture, params is not instanceof TRTCVideoEncParam!');
+            console.error('trtc:startScreenCapture, params is not instanceof TRTCVideoEncParam!');
             return;
         }
         this.screenCaptureStreamType = type;
@@ -2457,7 +2625,7 @@ class TRTCCloud extends events_1.EventEmitter {
             this.rtcCloud.setSubStreamEncoderParam(params.videoResolution, params.resMode, params.videoFps, params.videoBitrate, params.minVideoBitrate, params.enableAdjustRes);
         }
         else {
-            console.error('setSubStreamEncoderParam, params is not instanceof TRTCVideoEncParam!');
+            console.error('trtc:setSubStreamEncoderParam, params is not instanceof TRTCVideoEncParam!');
         }
     }
     /**
@@ -2481,7 +2649,7 @@ class TRTCCloud extends events_1.EventEmitter {
      */
     addExcludedShareWindow(win) {
         if (isNaN(+win)) {
-            console.error('addExcludedShareWindow, win: ' + win + 'is not invalid!');
+            console.error('trtc:addExcludedShareWindow, win: ' + win + 'is not invalid!');
             return;
         }
         this.rtcCloud.addExcludedShareWindow(win);
@@ -2494,7 +2662,7 @@ class TRTCCloud extends events_1.EventEmitter {
      */
     removeExcludedShareWindow(win) {
         if (isNaN(+win)) {
-            console.error('removeExcludedShareWindow, win: ' + win + 'is not invalid!');
+            console.error('trtc:removeExcludedShareWindow, win: ' + win + 'is not invalid!');
             return;
         }
         this.rtcCloud.removeExcludedShareWindow(win);
@@ -2541,7 +2709,7 @@ class TRTCCloud extends events_1.EventEmitter {
             return 0;
         }
         else {
-            console.error('setLocalVideoRenderCallback, param is error!');
+            console.error('trtc:setLocalVideoRenderCallback, param is error!');
             return -1;
         }
     }
@@ -2574,7 +2742,7 @@ class TRTCCloud extends events_1.EventEmitter {
             return 0;
         }
         else {
-            console.error('setRemoteVideoRenderCallback, userId is error!');
+            console.error('trtc:setRemoteVideoRenderCallback, userId is error!');
             return -1;
         }
     }
@@ -3043,12 +3211,12 @@ class TRTCCloud extends events_1.EventEmitter {
             }
             this.rtcCloud.startCameraDeviceTest((id, type, width, height, timestamp, rotation, data) => {
                 if (this.enableRenderFrame) {
-                    this._onRenderFrame(id, type, width, height, timestamp, rotation, data);
+                    this._onRenderFrame(id, type, width, height, timestamp, rotation, data, 0);
                 }
             });
         }
         else {
-            console.error('startCameraDeviceTest, view is undefined!');
+            console.error('trtc:startCameraDeviceTest, view is undefined!');
         }
     }
     /**
@@ -3196,40 +3364,55 @@ class TRTCCloud extends events_1.EventEmitter {
     addLocalVideoRenderCallback(streamType) {
         if (this.isExternalRenderEnabled || this.renderMode === 3 || this.renderMode === 5) {
             this.pixelformate = trtc_define_1.TRTCVideoPixelFormat.TRTCVideoPixelFormat_BGRA32;
+            this.pixelLength = 4;
         }
         else if (this.renderMode === 6) {
             this.pixelformate = trtc_define_1.TRTCVideoPixelFormat.TRTCVideoPixelFormat_H264;
+            this.pixelLength = 1;
         }
         else if (this.renderMode === 7 || this.renderMode === 8 || this.renderMode === 9) {
             this.pixelformate = trtc_define_1.TRTCVideoPixelFormat.TRTCVideoPixelFormat_RGBA32;
+            this.pixelLength = 4;
         }
         else {
             // this.renderMode = 1, 2, 4
             this.pixelformate = trtc_define_1.TRTCVideoPixelFormat.TRTCVideoPixelFormat_I420;
+            this.pixelLength = 1.5;
         }
-        this.rtcCloud.addLocalVideoRenderCallback((id, type, width, height, timestamp, rotation, data) => {
-            if (this.enableRenderFrame) {
-                this._onRenderFrame(id, type, width, height, timestamp, rotation, data);
+        this.rtcCloud.addLocalVideoRenderCallback((id, type, width, height, timestamp, rotation, length) => {
+            if (this.isScreenCapturing && this.screenCaptureStreamType === type) {
+                this._onRenderFrame(id, type, width, height, timestamp, rotation, screenVideoBuffer.buffer, length);
+            }
+            else {
+                this._onRenderFrame(id, type, width, height, timestamp, rotation, localVideoBuffer.buffer, length);
             }
         }, this.pixelformate, streamType);
     }
     addRemoteVideoRenderCallback(userId, streamType) {
         if (this.isExternalRenderEnabled || this.renderMode === 3 || this.renderMode === 5) {
             this.pixelformate = trtc_define_1.TRTCVideoPixelFormat.TRTCVideoPixelFormat_BGRA32;
+            this.pixelLength = 4;
         }
         else if (this.renderMode === 6) {
             this.pixelformate = trtc_define_1.TRTCVideoPixelFormat.TRTCVideoPixelFormat_H264;
+            this.pixelLength = 1;
         }
         else if (this.renderMode === 7 || this.renderMode === 8 || this.renderMode === 9) {
             this.pixelformate = trtc_define_1.TRTCVideoPixelFormat.TRTCVideoPixelFormat_RGBA32;
+            this.pixelLength = 4;
         }
         else {
             // this.renderMode = 1, 2, 4
             this.pixelformate = trtc_define_1.TRTCVideoPixelFormat.TRTCVideoPixelFormat_I420;
+            this.pixelLength = 1.5;
         }
-        this.rtcCloud.addRemoteVideoRenderCallback(userId, (id, type, width, height, timestamp, rotation, data) => {
-            if (this.enableRenderFrame) {
-                this._onRenderFrame(id, type, width, height, timestamp, rotation, data);
+        this.rtcCloud.addRemoteVideoRenderCallback(userId, (id, type, width, height, timestamp, rotation, length) => {
+            const videoBufferInfo = remoteVideoBufferMap.get(id);
+            if (videoBufferInfo && videoBufferInfo.streamType === type) {
+                this._onRenderFrame(id, type, width, height, timestamp, rotation, videoBufferInfo.buffer, length);
+            }
+            else {
+                this._onRenderFrame(id, type, width, height, timestamp, rotation, screenVideoBuffer.buffer, length);
             }
         }, this.pixelformate, streamType);
     }
@@ -3257,9 +3440,26 @@ class TRTCCloud extends events_1.EventEmitter {
             this.streams.forEach((value, key, map) => {
                 oldStreams.set(key, value);
             });
+            this.renderMode = mode;
+            if (this.isExternalRenderEnabled || this.renderMode === 3 || this.renderMode === 5) {
+                this.pixelformate = trtc_define_1.TRTCVideoPixelFormat.TRTCVideoPixelFormat_BGRA32;
+                this.pixelLength = 4;
+            }
+            else if (this.renderMode === 6) {
+                this.pixelformate = trtc_define_1.TRTCVideoPixelFormat.TRTCVideoPixelFormat_H264;
+                this.pixelLength = 1;
+            }
+            else if (this.renderMode === 7 || this.renderMode === 8 || this.renderMode === 9) {
+                this.pixelformate = trtc_define_1.TRTCVideoPixelFormat.TRTCVideoPixelFormat_RGBA32;
+                this.pixelLength = 4;
+            }
+            else {
+                // this.renderMode = 1, 2, 4
+                this.pixelformate = trtc_define_1.TRTCVideoPixelFormat.TRTCVideoPixelFormat_I420;
+                this.pixelLength = 1.5;
+            }
             if (renderModePixelFormatMap.get(mode) === renderModePixelFormatMap.get(this.renderMode)) {
                 // 渲染模式切换不需要改变低层编码格式
-                this.renderMode = mode;
                 oldStreams.forEach((value, key, map) => {
                     let view = value.getView();
                     this._initRender(key, view);
@@ -3267,7 +3467,6 @@ class TRTCCloud extends events_1.EventEmitter {
             }
             else {
                 // 渲染模式切换需要改变低层编码格式
-                this.renderMode = mode;
                 oldStreams.forEach((value, key, map) => {
                     const view = value.getView();
                     // this._destroyRender(key, null);
@@ -3311,7 +3510,7 @@ class TRTCCloud extends events_1.EventEmitter {
                     }
                 });
             }
-            console.debug('Render mode changed to:', this.renderMode);
+            console.debug('trtc:Render mode changed to:', this.renderMode);
         }
     }
     //----------------------------------//
@@ -3360,7 +3559,7 @@ class TRTCCloud extends events_1.EventEmitter {
         return String(uid) + '_' + String(type);
     }
     setEnableRenderFrame(enable) {
-        console.log('setEnableRenderFrame:' + enable);
+        console.debug('trtc:setEnableRenderFrame:' + enable);
         this.enableRenderFrame = enable;
     }
     /**
@@ -3397,7 +3596,7 @@ class TRTCCloud extends events_1.EventEmitter {
         let key = this.getKey(uid, type);
         return this.streams.get(key);
     }
-    _onRenderFrame(uid, type, width, height, timestamp, rotation, data) {
+    _onRenderFrame(uid, type, width, height, timestamp, rotation, data, length) {
         // 由于 mac 监听自定义渲染回调后不会回调 onFirstVideoFrame ，所以在这里自己实现回调 onFirstVideoFrame
         if (this._isMacPlatform()) {
             setImmediate(() => {
@@ -3427,7 +3626,7 @@ class TRTCCloud extends events_1.EventEmitter {
                 });
             }
             if (uid.length == 0) {
-                this._onRealRender('local_video', type, width, height, timestamp, rotation, data); //本地社视频返回的是空
+                this._onRealRender('local_video', type, width, height, timestamp, rotation, data, length); //本地社视频返回的是空
                 //回调local view 给用户数据，本地数据
                 if (type == trtc_define_1.TRTCVideoStreamType.TRTCVideoStreamTypeBig) {
                     if (this.localVideoCallback !== null && this.localVideoCallback.callback !== null) {
@@ -3436,7 +3635,7 @@ class TRTCCloud extends events_1.EventEmitter {
                 }
             }
             if (uid === CAMERA_DEVICE_TEST_ID) {
-                this._onRealRender(CAMERA_DEVICE_TEST_VIEW, type, width, height, timestamp, rotation, data); //摄像头测试
+                this._onRealRender(CAMERA_DEVICE_TEST_VIEW, type, width, height, timestamp, rotation, data, length); //摄像头测试
             }
         }
         else {
@@ -3458,7 +3657,7 @@ class TRTCCloud extends events_1.EventEmitter {
                 if (streamType === trtc_define_1.TRTCVideoStreamType.TRTCVideoStreamTypeSmall) {
                     streamType = trtc_define_1.TRTCVideoStreamType.TRTCVideoStreamTypeBig;
                 }
-                this._onRealRender(uid, streamType, width, height, timestamp, rotation, data);
+                this._onRealRender(uid, streamType, width, height, timestamp, rotation, data, length);
             }
             //回调远程给用户数据
             let remoteCallback = this.remoteVideoCallback.get(uid);
@@ -3471,7 +3670,7 @@ class TRTCCloud extends events_1.EventEmitter {
         }
         data = null;
     }
-    _onRealRender(uid, type, width, height, timestamp, rotation, data) {
+    _onRealRender(uid, type, width, height, timestamp, rotation, data, length) {
         const renderer = this._getRenderer(uid, type);
         let isNeedRotate = true;
         if (uid === 'local_video' && this._isMacPlatform() && type !== trtc_define_1.TRTCVideoStreamType.TRTCVideoStreamTypeSub) {
@@ -3492,7 +3691,18 @@ class TRTCCloud extends events_1.EventEmitter {
                 isNeedRotate
             });
         }
-        else if (this.renderMode === 4 || this.renderMode === 5 || this.renderMode === 6 || this.renderMode === 8 || this.renderMode === 9) {
+        else if (this.renderMode === 6) {
+            renderer.drawFrame({
+                width,
+                height,
+                data,
+                timestamp,
+                rotation: realRotation,
+                isNeedRotate,
+                length,
+            });
+        }
+        else if (this.renderMode === 4 || this.renderMode === 5 || this.renderMode === 8 || this.renderMode === 9) {
             renderer.drawFrame({
                 width,
                 height,
@@ -3515,9 +3725,9 @@ class TRTCCloud extends events_1.EventEmitter {
         else {
             let ylen = width * height;
             let ulen = width * height / 4;
-            let ydata = new Uint8Array(data, 0, ylen);
-            let udata = new Uint8Array(data, ylen, ulen);
-            let vdata = new Uint8Array(data, ylen + ulen, ulen);
+            let ydata = new Uint8Array(data.buffer, 0, ylen);
+            let udata = new Uint8Array(data.buffer, ylen, ulen);
+            let vdata = new Uint8Array(data.buffer, ylen + ulen, ulen);
             renderer.drawFrame({
                 width: width,
                 height: height,
@@ -3566,7 +3776,7 @@ class TRTCCloud extends events_1.EventEmitter {
             renderer = new Render_1.default.Canvas3DRGBARenderer(); // RGBA canvas 3D
         }
         else {
-            console.warn('Unknown render mode, fallback to 1');
+            console.warn('trtc:Unknown render mode, fallback to 1');
             renderer = new Render_1.default.GlRenderer();
         }
         view.innerHTML = ''; // 事先清空一下，避免画面叠加
@@ -3606,7 +3816,7 @@ class TRTCCloud extends events_1.EventEmitter {
                 throw err;
             }
             else {
-                console.log(' write file ok, path:' + path);
+                console.warn('trtc:write file ok, path:' + path);
             }
         });
     }

package/liteav/trtc_define.d.ts

@@ -4,6 +4,7 @@
  * @description 分辨率、质量等级等枚举和常量值的定义
  *
  */
+/// <reference types="node" />
 export declare enum TRTCVideoResolution {
     TRTCVideoResolution_120_120 = 1,
     TRTCVideoResolution_160_160 = 3,
@@ -761,3 +762,11 @@ export interface PluginInfo {
     setParameter: (param: string) => number;
     getParameter: (paramKey: string) => string;
 }
+export interface VideoBufferInfo {
+    userId: string;
+    buffer: Buffer | null;
+    streamType: TRTCVideoStreamType;
+    width: number;
+    height: number;
+    pixelFormat: TRTCVideoPixelFormat;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trtc-electron-sdk",
-  "version": "9.8.8-alpha.3",
+  "version": "9.8.8-alpha.4",
   "description": "trtc electron sdk",
   "main": "./liteav/trtc.js",
   "types": "./liteav/trtc.d.ts",