trtc-electron-sdk 9.9.8-beta.0 → 10.0.100-beta.2

package/liteav/Render/Canvas3DRGBARenderer/index.js

@@ -0,0 +1,240 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const EventEmitter = require('events').EventEmitter;
+const isEqual = require('lodash.isequal');
+const { calcCanvasStyle } = require('../util');
+class Canvas3DRGBARenderer {
+    constructor() {
+        this.cacheCanvasOpts = {};
+        this.event = new EventEmitter();
+        this.ready = false;
+        this.contentMode = 1;
+        this.container = null;
+        this.canvas = null;
+        this.element = null;
+        this.gl = null;
+        this.glProgram = null;
+        this.vShader = null;
+        this.fShader = null;
+        this.samplerUniform = null;
+        this.texture = null;
+        this.vertex = [
+            -1, -1, 0,
+            1, -1, 0.0,
+            1, 1, 0.0,
+            -1, 1, 0.0
+        ];
+        this.vertexIndices = [
+            0, 1, 2,
+            0, 2, 3
+        ];
+        this.triangleTexCoords = [
+            0.0, 0.0,
+            1.0, 0.0,
+            1.0, 1.0,
+            0.0, 1.0
+        ];
+    }
+    _initGL() {
+        try {
+            this.gl = this.canvas.getContext('webgl', { alpha: true, premultipliedAlpha: false });
+        }
+        catch (e) {
+            return false;
+        }
+        if (this.gl) {
+            return true;
+        }
+        else {
+            return false;
+        }
+    }
+    _initShaders() {
+        const VSHADER_SOURCE = 'attribute vec3 aPos;                    ' +
+            'attribute vec2 aVertexTextureCoord;     ' +
+            'varying mediump vec2 vTextureCoord;       ' +
+            'void main(void){                        ' +
+            '    gl_Position = vec4(aPos, 1);        ' +
+            '    vTextureCoord = aVertexTextureCoord;' +
+            '}';
+        const FSHADER_SOURCE = 'varying mediump vec2 vTextureCoord;                                               ' +
+            'uniform sampler2D uSampler;                                                     ' +
+            'void main(void) {                                                               ' +
+            '    gl_FragColor = texture2D(uSampler, vec2(vTextureCoord.s, vTextureCoord.t)); ' +
+            '}';
+        // compile shaders
+        const vertexShader = this._makeShader(VSHADER_SOURCE, this.gl.VERTEX_SHADER);
+        const fragmentShader = this._makeShader(FSHADER_SOURCE, this.gl.FRAGMENT_SHADER);
+        this.vShader = vertexShader;
+        this.fShader = fragmentShader;
+        if (!vertexShader || !fragmentShader) {
+            return false;
+        }
+        // create program
+        this.glProgram = this.gl.createProgram();
+        // attach and link shaders to the program
+        this.gl.attachShader(this.glProgram, vertexShader);
+        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.');
+            return false;
+        }
+        else {
+            this.gl.useProgram(this.glProgram);
+            return true;
+        }
+    }
+    _makeShader(src, type) {
+        //compile the vertex shader
+        const shader = this.gl.createShader(type);
+        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)}`);
+            return null;
+        }
+        return shader;
+    }
+    _initUniforms() {
+        this.samplerUniform = this.gl.getUniformLocation(this.glProgram, 'uSampler');
+        return true;
+    }
+    _initTexture() {
+        this.texture = this.gl.createTexture();
+        this.gl.bindTexture(this.gl.TEXTURE_2D, this.texture);
+        // this.gl.pixelStorei(this.gl.UNPACK_FLIP_Y_WEBGL, true);
+        this.gl.texParameteri(this.gl.TEXTURE_2D, this.gl.TEXTURE_MIN_FILTER, this.gl.LINEAR);
+        this.gl.texParameteri(this.gl.TEXTURE_2D, this.gl.TEXTURE_MAG_FILTER, this.gl.LINEAR);
+        this.gl.texParameteri(this.gl.TEXTURE_2D, this.gl.TEXTURE_WRAP_S, this.gl.CLAMP_TO_EDGE);
+        this.gl.texParameteri(this.gl.TEXTURE_2D, this.gl.TEXTURE_WRAP_T, this.gl.CLAMP_TO_EDGE);
+    }
+    _initTextureAttribute() {
+        // vertex data
+        const vertexBuffer = this.gl.createBuffer();
+        this.gl.bindBuffer(this.gl.ARRAY_BUFFER, vertexBuffer);
+        this.gl.bufferData(this.gl.ARRAY_BUFFER, new Float32Array(this.vertex), this.gl.STATIC_DRAW);
+        // indices data
+        const vertexIndicesBuffer = this.gl.createBuffer();
+        this.gl.bindBuffer(this.gl.ELEMENT_ARRAY_BUFFER, vertexIndicesBuffer);
+        this.gl.bufferData(this.gl.ELEMENT_ARRAY_BUFFER, new Uint16Array(this.vertexIndices), this.gl.STATIC_DRAW);
+        // set position attribute
+        const aVertexPosition = this.gl.getAttribLocation(this.glProgram, 'aPos');
+        this.gl.vertexAttribPointer(aVertexPosition, 3, this.gl.FLOAT, false, 0, 0);
+        this.gl.enableVertexAttribArray(aVertexPosition);
+        // texture coordinate data
+        const trianglesTexCoordBuffer = this.gl.createBuffer();
+        this.gl.bindBuffer(this.gl.ARRAY_BUFFER, trianglesTexCoordBuffer);
+        this.gl.bufferData(this.gl.ARRAY_BUFFER, new Float32Array(this.triangleTexCoords), this.gl.STATIC_DRAW);
+        // set texture coordinate attribute
+        const vertexTexCoordAttribute = this.gl.getAttribLocation(this.glProgram, 'aVertexTextureCoord');
+        this.gl.enableVertexAttribArray(vertexTexCoordAttribute);
+        this.gl.vertexAttribPointer(vertexTexCoordAttribute, 2, this.gl.FLOAT, false, 0, 0);
+    }
+    getView() {
+        return this.element;
+    }
+    bind(element) {
+        this.element = element;
+        const container = document.createElement('div');
+        Object.assign(container.style, {
+            width: '100%',
+            height: '100%',
+            display: 'flex',
+            justifyContent: 'center',
+            alignItems: 'center',
+            willChange: 'transform',
+        });
+        this.container = container;
+        element.appendChild(this.container);
+        this.canvas = document.createElement('canvas');
+        this.container.appendChild(this.canvas);
+        // init webgl & context
+        let ret = false;
+        do {
+            ret = this._initGL();
+            if (!ret) {
+                console.log('initGL failed');
+                break;
+            }
+            ret = this._initShaders();
+            if (!ret) {
+                console.log('initShaders failed');
+                break;
+            }
+            ret = this._initUniforms();
+            if (!ret) {
+                console.log('initUniforms failed');
+                break;
+            }
+        } while (false);
+        if (ret) {
+            this._initTextureAttribute();
+            this._initTexture();
+        }
+    }
+    unbind() {
+        this.texture = null;
+        this.samplerUniform = null;
+        this.vShader = null;
+        this.fShader = null;
+        this.glProgram = null;
+        this.gl = null;
+        this.container && this.container.removeChild(this.canvas);
+        this.element && this.element.removeChild(this.container);
+        this.container = null;
+        this.element = null;
+    }
+    updateCanvas(options = {
+        contentWidth: 0,
+        contentHeight: 0,
+        rotation: 0,
+        mirrorView: false,
+        contentMode: 0,
+        containerWidth: 0,
+        containerHeight: 0,
+        isNeedRotate: true
+    }) {
+        if (isEqual(this.cacheCanvasOpts, options)) {
+            return;
+        }
+        this.cacheCanvasOpts = Object.assign({}, options);
+        const { width, height, transform } = calcCanvasStyle(options);
+        this.canvas.width = width;
+        this.canvas.height = height;
+        this.canvas.style.transform = `${transform} rotateX(180deg)`;
+    }
+    drawFrame(imageData) {
+        if (!this.ready) {
+            this.ready = true;
+            this.event.emit('ready');
+        }
+        const mirror = false;
+        const contentWidth = imageData.width;
+        const contentHeight = imageData.height;
+        const rotation = imageData.rotation;
+        const isNeedRotate = imageData.isNeedRotate;
+        this.updateCanvas({
+            contentWidth,
+            contentHeight,
+            rotation,
+            mirrorView: mirror,
+            contentMode: this.contentMode,
+            containerWidth: this.container.clientWidth,
+            containerHeight: this.container.clientHeight,
+            isNeedRotate
+        });
+        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.drawElements(this.gl.TRIANGLES, 6, this.gl.UNSIGNED_SHORT, 0);
+        }
+        catch (error) {
+            console.error(error);
+        }
+    }
+    setContentMode(mode = 0) {
+        this.contentMode = mode;
+    }
+}
+exports.default = Canvas3DRGBARenderer;

package/liteav/Render/RGBRenderer/index.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const EventEmitter = require('events').EventEmitter;
 const isEqual = require('lodash.isequal');
-const { isNeedKeepWidthAndHeight } = require('../util');
+const { calcCanvasStyle } = require('../util');
 /* contentMode
 * - 0: Cropped mode. Uniformly scale the video until it fills the visible boundaries (cropped). One dimension of the video may have clipped contents.
 * - 1: Fit mode. Uniformly scale the video until one of its dimension fits the boundary (zoomed to fit). Areas that are not filled due to the disparity
@@ -21,33 +21,6 @@ class RGBRenderer {
     getView() {
         return this.element;
     }
-    _calcZoom(vertical = false, contentMode = 0, width, height, clientWidth, clientHeight) {
-        let localRatio = clientWidth / clientHeight;
-        let tempRatio = width / height;
-        if (isNaN(localRatio) || isNaN(tempRatio)) {
-            return 1;
-        }
-        if (!contentMode) {
-            if (vertical) {
-                return localRatio > tempRatio ?
-                    clientHeight / height : clientWidth / width;
-            }
-            else {
-                return localRatio < tempRatio ?
-                    clientHeight / height : clientWidth / width;
-            }
-        }
-        else {
-            if (vertical) {
-                return localRatio < tempRatio ?
-                    clientHeight / height : clientWidth / width;
-            }
-            else {
-                return localRatio > tempRatio ?
-                    clientHeight / height : clientWidth / width;
-            }
-        }
-    }
     bind(element) {
         this.element = element;
         let container = document.createElement('div');
@@ -73,64 +46,59 @@ class RGBRenderer {
     refreshCanvas() {
     }
     updateCanvas(options = {
-        width: 0,
-        height: 0,
+        contentWidth: 0,
+        contentHeight: 0,
         rotation: 0,
         mirrorView: false,
         contentMode: 0,
-        clientWidth: 0,
-        clientHeight: 0,
+        containerWidth: 0,
+        containerHeight: 0,
         isNeedRotate: true
     }) {
         if (isEqual(this.cacheCanvasOpts, options)) {
             return;
         }
         this.cacheCanvasOpts = Object.assign({}, options);
-        if ([0, 90, 180, 270].indexOf(options.rotation) === -1) {
-            throw new Error('Invalid value for rotation. Only support 0, 90, 180, 270');
-        }
-        const isKeepWidthHeight = isNeedKeepWidthAndHeight(options.rotation, options.isNeedRotate);
-        if (isKeepWidthHeight) {
-            this.canvas.width = options.width;
-            this.canvas.height = options.height;
-        }
-        else {
-            this.canvas.height = options.width;
-            this.canvas.width = options.height;
-        }
-        this.canvas.style.zoom = this._calcZoom(!isKeepWidthHeight, options.contentMode, options.width, options.height, options.clientWidth, options.clientHeight);
-        if (options.mirrorView) {
-            this.canvas.style.transform = 'rotateY(180deg)';
-        }
+        const { width, height, transform } = calcCanvasStyle(options);
+        this.canvas.width = width;
+        this.canvas.height = height;
+        this.canvas.style.transform = transform;
     }
     drawFrame(imageData) {
         if (!this.ready) {
             this.ready = true;
             this.event.emit('ready');
         }
-        let mirror = 0;
-        let contentWidth = imageData.width;
-        let contentHeight = imageData.height;
-        const isNeedRotate = imageData.isNeedRotate;
-        let left = 0;
-        let top = 0;
-        let right = 0;
-        let bottom = 0;
-        let rotation = imageData.rotation;
-        let ts = imageData.timestamp;
-        let width = contentWidth + left + right;
-        let height = contentHeight + top + bottom;
-        this.updateCanvas({
-            width, height, rotation,
-            mirrorView: mirror,
-            contentMode: this.contentMode,
-            clientWidth: this.container.clientWidth,
-            clientHeight: this.container.clientHeight,
-            isNeedRotate
-        });
-        let ctx = this.canvas.getContext("2d");
-        let tmpimage = new ImageData(imageData.data, width, height);
-        ctx.putImageData(tmpimage, 0, 0);
+        try {
+            let mirror = false;
+            let contentWidth = imageData.width;
+            let contentHeight = imageData.height;
+            const isNeedRotate = imageData.isNeedRotate;
+            let left = 0;
+            let top = 0;
+            let right = 0;
+            let bottom = 0;
+            let rotation = imageData.rotation;
+            let ts = imageData.timestamp;
+            let width = contentWidth + left + right;
+            let height = contentHeight + top + bottom;
+            this.updateCanvas({
+                contentWidth: width,
+                contentHeight: height,
+                rotation,
+                mirrorView: mirror,
+                contentMode: this.contentMode,
+                containerWidth: this.container.clientWidth,
+                containerHeight: this.container.clientHeight,
+                isNeedRotate
+            });
+            let ctx = this.canvas.getContext("2d");
+            let newImage = new ImageData(new Uint8ClampedArray(imageData.data), width, height);
+            ctx.putImageData(newImage, 0, 0);
+        }
+        catch (error) {
+            console.error('RGBRenderer.drawFrame error:', error);
+        }
     }
     setContentMode(mode = 0) {
         this.contentMode = mode;

package/liteav/Render/SoftwareRenderer/index.js

@@ -4,7 +4,7 @@ const EventEmitter = require('events').EventEmitter;
 const isEqual = require('lodash.isequal');
 const YUVBuffer = require('yuv-buffer');
 const YUVCanvas = require('yuv-canvas');
-const { isNeedKeepWidthAndHeight } = require('../util');
+const { calcCanvasStyle } = require('../util');
 /* contentMode
 * - 0: Cropped mode. Uniformly scale the video until it fills the visible boundaries (cropped).
 * One dimension of the video may have clipped contents.
@@ -25,33 +25,6 @@ class Renderer {
     getView() {
         return this.element;
     }
-    _calcZoom(vertical = false, contentMode = 0, width, height, clientWidth, clientHeight) {
-        const localRatio = clientWidth / clientHeight;
-        const tempRatio = width / height;
-        if (isNaN(localRatio) || isNaN(tempRatio)) {
-            return 1;
-        }
-        if (!contentMode) {
-            if (vertical) {
-                return localRatio > tempRatio
-                    ? clientHeight / height : clientWidth / width;
-            }
-            else {
-                return localRatio < tempRatio
-                    ? clientHeight / height : clientWidth / width;
-            }
-        }
-        else {
-            if (vertical) {
-                return localRatio < tempRatio
-                    ? clientHeight / height : clientWidth / width;
-            }
-            else {
-                return localRatio > tempRatio
-                    ? clientHeight / height : clientWidth / width;
-            }
-        }
-    }
     bind(element) {
         this.element = element;
         const container = document.createElement('div');
@@ -78,35 +51,23 @@ class Renderer {
     refreshCanvas() {
     }
     updateCanvas(options = {
-        width: 0,
-        height: 0,
+        contentWidth: 0,
+        contentHeight: 0,
         rotation: 0,
         mirrorView: false,
         contentMode: 0,
-        clientWidth: 0,
-        clientHeight: 0,
+        containerWidth: 0,
+        containerHeight: 0,
         isNeedRotate: true
     }) {
         if (isEqual(this.cacheCanvasOpts, options)) {
             return;
         }
         this.cacheCanvasOpts = Object.assign({}, options);
-        if ([0, 90, 180, 270].indexOf(options.rotation) === -1) {
-            throw new Error('Invalid value for rotation. Only support 0, 90, 180, 270');
-        }
-        const isKeepWidthHeight = isNeedKeepWidthAndHeight(options.rotation, options.isNeedRotate);
-        if (isNeedKeepWidthAndHeight(options.rotation, options.isNeedRotate)) {
-            this.canvas.width = options.width;
-            this.canvas.height = options.height;
-        }
-        else {
-            this.canvas.height = options.width;
-            this.canvas.width = options.height;
-        }
-        this.canvas.style.zoom = this._calcZoom(!isKeepWidthHeight, options.contentMode, options.width, options.height, options.clientWidth, options.clientHeight);
-        if (options.mirrorView) {
-            this.canvas.style.transform = 'rotateY(180deg)';
-        }
+        const { width, height, transform } = calcCanvasStyle(options);
+        this.canvas.width = width;
+        this.canvas.height = height;
+        this.canvas.style.transform = transform;
     }
     _adjustImageData(imageData) {
         const { width, height, yUint8Array, uUint8Array, vUint8Array } = imageData;
@@ -151,7 +112,7 @@ class Renderer {
             this.event.emit('ready');
         }
         imageData = this._adjustImageData(imageData);
-        const mirror = 0;
+        const mirror = false;
         const contentWidth = imageData.width;
         const contentHeight = imageData.height;
         const left = 0;
@@ -164,11 +125,13 @@ class Renderer {
         const width = contentWidth + left + right;
         const height = contentHeight + top + bottom;
         this.updateCanvas({
-            width, height, rotation,
+            contentWidth: width,
+            contentHeight: height,
+            rotation,
             mirrorView: mirror,
             contentMode: this.contentMode,
-            clientWidth: this.container.clientWidth,
-            clientHeight: this.container.clientHeight,
+            containerWidth: this.container.clientWidth,
+            containerHeight: this.container.clientHeight,
             isNeedRotate
         });
         const format = YUVBuffer.format({

package/liteav/Render/index.d.ts

@@ -50,5 +50,6 @@ declare const _default: {
     GlRenderer: typeof GlRenderer;
     SoftwareRenderer: any;
     RGBRenderer: any;
+    Canvas3DRGBARenderer: any;
 };
 export default _default;

package/liteav/Render/index.js

@@ -9,6 +9,7 @@ const GlRenderer_1 = __importDefault(require("./GlRenderer"));
 const SoftwareRenderer_1 = __importDefault(require("./SoftwareRenderer"));
 // @ts-ignore
 const RGBRenderer_1 = __importDefault(require("./RGBRenderer"));
+const Canvas3DRGBARenderer_1 = __importDefault(require("./Canvas3DRGBARenderer"));
 class GlRenderer {
     constructor() {
         // @ts-ignore
@@ -51,5 +52,6 @@ exports.default = {
     CustomRenderer,
     GlRenderer,
     SoftwareRenderer: SoftwareRenderer_1.default,
-    RGBRenderer: RGBRenderer_1.default
+    RGBRenderer: RGBRenderer_1.default,
+    Canvas3DRGBARenderer: Canvas3DRGBARenderer_1.default,
 };

package/liteav/Render/util.d.ts

@@ -14,5 +14,18 @@ export declare class Config {
     setDebugMode(enable: boolean): void;
     getDebugMode(): boolean;
 }
-export declare function isNeedKeepWidthAndHeight(rotation: number, isNeedRotate: boolean): boolean;
 export declare const config: Config;
+export declare function isNeedKeepWidthAndHeight(rotation: number, isNeedRotate: boolean): boolean;
+export declare function calcScaleRate(vertical: boolean, contentMode: number, contentWidth: number, contentHeight: number, containerWidth: number, containerHeight: number): number;
+export declare function calcCanvasStyle(options?: {
+    contentWidth: number;
+    contentHeight: number;
+    rotation: number;
+    mirrorView: boolean;
+    contentMode: number;
+    containerWidth: number;
+    containerHeight: number;
+    isNeedRotate: boolean;
+}): {
+    [x: string]: any;
+};

package/liteav/Render/util.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.config = exports.isNeedKeepWidthAndHeight = exports.Config = void 0;
+exports.calcCanvasStyle = exports.calcScaleRate = exports.isNeedKeepWidthAndHeight = exports.config = exports.Config = void 0;
 /**
  * 配置对象, 可用来打开 debug 模式
  *
@@ -23,9 +23,72 @@ class Config {
     }
 }
 exports.Config = Config;
+exports.config = new Config();
 function isNeedKeepWidthAndHeight(rotation, isNeedRotate) {
     // 需保持宽高不做变化
     return rotation === 0 || rotation === 180 || !isNeedRotate;
 }
 exports.isNeedKeepWidthAndHeight = isNeedKeepWidthAndHeight;
-exports.config = new Config();
+function calcScaleRate(vertical = false, contentMode = 0, contentWidth, contentHeight, containerWidth, containerHeight) {
+    const containerRatio = containerWidth / containerHeight;
+    const contentRatio = contentWidth / contentHeight;
+    if (isNaN(containerRatio) || isNaN(contentRatio)) {
+        return 1;
+    }
+    if (!contentMode) {
+        if (vertical) {
+            return containerRatio > contentRatio
+                ? containerHeight / contentHeight : containerWidth / contentWidth;
+        }
+        else {
+            return containerRatio < contentRatio
+                ? containerHeight / contentHeight : containerWidth / contentWidth;
+        }
+    }
+    else {
+        if (vertical) {
+            return containerRatio < contentRatio
+                ? containerHeight / contentHeight : containerWidth / contentWidth;
+        }
+        else {
+            return containerRatio > contentRatio
+                ? containerHeight / contentHeight : containerWidth / contentWidth;
+        }
+    }
+}
+exports.calcScaleRate = calcScaleRate;
+function calcCanvasStyle(options = {
+    contentWidth: 0,
+    contentHeight: 0,
+    rotation: 0,
+    mirrorView: false,
+    contentMode: 0,
+    containerWidth: 0,
+    containerHeight: 0,
+    isNeedRotate: true
+}) {
+    if ([0, 90, 180, 270].indexOf(options.rotation) === -1) {
+        throw new Error('Invalid value for rotation. Only support 0, 90, 180, 270');
+    }
+    const style = {
+        width: 0,
+        height: 0,
+        transform: ''
+    };
+    const isKeepWidthHeight = isNeedKeepWidthAndHeight(options.rotation, options.isNeedRotate);
+    if (isNeedKeepWidthAndHeight(options.rotation, options.isNeedRotate)) {
+        style.width = options.contentWidth;
+        style.height = options.contentHeight;
+    }
+    else {
+        style.height = options.contentWidth;
+        style.width = options.contentHeight;
+    }
+    const scale = calcScaleRate(!isKeepWidthHeight, options.contentMode, style.width, style.height, options.containerWidth, options.containerHeight);
+    style.transform = `scale(${scale})`;
+    if (options.mirrorView) {
+        style.transform = `${style.transform} rotateY(180deg)`;
+    }
+    return style;
+}
+exports.calcCanvasStyle = calcCanvasStyle;

package/liteav/trtc.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { EventEmitter } from 'events';
-import { AudioMusicParam, Rect, TRTCAppScene, TRTCAudioEffectParam, TRTCAudioQuality, TRTCBeautyStyle, TRTCDeviceState, TRTCDeviceType, TRTCLogLevel, TRTCRenderParams, TRTCRoleType, TRTCSwitchRoomParam, TRTCVideoBufferType, TRTCVideoFillMode, TRTCVideoFrame, TRTCVideoPixelFormat, TRTCVideoRotation, TRTCVideoStreamType, TRTCWaterMarkSrcType, PluginInfo, TRTCAudioRecordingParams, TRTCScreenCaptureSourceInfo, TRTCScreenCaptureProperty, TRTCSpeedTestParams } from './trtc_define';
+import { AudioMusicParam, Rect, TRTCAppScene, TRTCAudioEffectParam, TRTCAudioQuality, TRTCBeautyStyle, TRTCDeviceState, TRTCDeviceType, TRTCLogLevel, TRTCRenderParams, TRTCRoleType, TRTCSwitchRoomParam, TRTCVideoBufferType, TRTCVideoFillMode, TRTCVideoFrame, TRTCVideoPixelFormat, TRTCVideoRotation, TRTCVideoStreamType, TRTCWaterMarkSrcType, PluginInfo, TRTCAudioRecordingParams, TRTCScreenCaptureSourceInfo, TRTCScreenCaptureProperty } from './trtc_define';
 export * from './trtc_define';
 export * from './trtc_code';
 /**
@@ -335,15 +335,6 @@ declare class TRTCCloud extends EventEmitter {
      * @param {Number} totalCount    - 需要测速的服务器总数量
      */
     bindOnSpeedTest(): void;
-    /**
-     * 5.5 网速测试的结果回调
-     *
-     * 该统计回调由 startSpeedTest 触发。
-     *
-     * @event TRTCCallback#onSpeedTestResult
-     * @param {TRTCSpeedTestResult} result 网速测试数据数据，包括丢包、往返延迟、上下行的带宽速率。
-     */
-    bindOnSpeedTestResult(): void;
     /**
      * 6.1 摄像头准备就绪
      *
@@ -1161,10 +1152,9 @@ declare class TRTCCloud extends EventEmitter {
      * 我们在 Demo 中有一个音量大小的提示条，就是基于这个接口实现的。
      * 如希望打开此功能，请在 startLocalAudio() 之前调用。
      *
-     * @param {Number} interval   - 设置 onUserVoiceVolume 回调的触发间隔，单位为ms，最小间隔为100ms，如果小于等于0则会关闭回调，建议设置为300ms
-     * @param {Boolean} enableVad - true: 打开人声检测；false: 关闭人声检测。目前仅 windows 支持。
+     * @param {Number} interval - 设置 onUserVoiceVolume 回调的触发间隔，单位为ms，最小间隔为100ms，如果小于等于0则会关闭回调，建议设置为300ms
      */
-    enableAudioVolumeEvaluation(interval: number, enableVad?: boolean): void;
+    enableAudioVolumeEvaluation(interval: number): void;
     /**
      * 4.12 开始录音
      *
@@ -1794,6 +1784,13 @@ declare class TRTCCloud extends EventEmitter {
      * @param {Number} volume - 音量大小，100为正常音量，取值范围为0 - 100；默认值：100
      */
     setMusicPublishVolume(id: number, volume: number): void;
+    /**
+     * 11.22 调整背景音乐的变速效果
+     *
+     * @param {Number} id - 音乐 ID
+     * @param {Number} speedRate - 速度，默认值是1.0f，范围是：[0.5 ~ 2] 之间的浮点数；
+     */
+    setMusicSpeedRate(id: number, speedRate: number): void;
     /**
      * 12.1 废弃接口： 播放音效
      *
@@ -1864,21 +1861,13 @@ declare class TRTCCloud extends EventEmitter {
      * 测速结果将会用于优化 SDK 接下来的服务器选择策略，因此推荐您在用户首次通话前先进行一次测速，这将有助于我们选择最佳的服务器。
      * 同时，如果测试结果非常不理想，您可以通过醒目的 UI 提示用户选择更好的网络。
      *
-     * 注意：
-     * 1. 测速过程将产生少量的基础服务费用，详见 [计费概述 > 基础服务](https://cloud.tencent.com/document/product/647/17157#.E5.9F.BA.E7.A1.80.E6.9C.8D.E5.8A.A1) 文档说明。
-     * 2. 请在进入房间前进行网速测试，在房间中网速测试会影响正常的音视频传输效果，而且由于干扰过多，网速测试结果也不准确。
-     * 3. 同一时间只允许一项网速测试任务运行。
-     *
-     * @param {TRTCSpeedTestParams} params - 测速参数
-     * @param {Number} params.sdkAppId     - 应用标识
-     * @param {String} params.userId       - 用户标识
-     * @param {String} params.userSig      - 用户签名
-     * @param {Number} params.expectedUpBandwidth - 预期的上行带宽（kbps，取值范围： 10 ～ 5000，为 0 时不测试）。
-     * @param {Number} params.expectedDownBandwidth - 预期的下行带宽（kbps，取值范围： 10 ～ 5000，为 0 时不测试）。
+     * 注意：测速本身会消耗一定的流量，所以也会产生少量额外的流量费用。
      *
-     * @return 接口调用结果，< 0：失败
+     * @param {Number} sdkAppId - 应用标识
+     * @param {String} userId   - 用户标识
+     * @param {String} userSig  - 用户签名
      */
-    startSpeedTest(params: TRTCSpeedTestParams | number, userId?: string, userSig?: string): any;
+    startSpeedTest(sdkAppId: number, userId: string, userSig: string): void;
     /**
      * 13.2 停止网络测速
      */
@@ -1994,8 +1983,10 @@ declare class TRTCCloud extends EventEmitter {
     /**
      * 选择绘制的模式 (webgl/yuvcanvs/)
      * @param {Number} mode -
-     * - 1  webgl
-     * - 2  yuvcanvs
+     * - 1  YUV WebGL
+     * - 2  YUV Canvas 2D
+     * - 3  RGBA Canvas 2D
+     * - 4  RGBA WebGL
      */
     setRenderMode(mode?: number): void;
     initPluginManager(): void;

package/liteav/trtc.js

@@ -106,7 +106,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.renderMode = this._isSupportWebGL() ? 1 : 2;
+        this.renderMode = this._isSupportWebGL() ? 4 : 3;
         this.isExternalRenderEnabled = false;
         this.localFillMode = trtc_define_1.TRTCVideoFillMode.TRTCVideoFillMode_Fit;
         this.localRotation = trtc_define_1.TRTCVideoRotation.TRTCVideoRotation0;
@@ -346,7 +346,6 @@ class TRTCCloud extends events_1.EventEmitter {
         this.bindOnNetworkQuality();
         this.bindOnStatistics();
         this.bindOnSpeedTest();
-        this.bindOnSpeedTestResult();
         this.bindOnUserVoiceVolume();
         this.bindOnRecvCustomCmdMsg();
         this.bindOnMissCustomCmdMsg();
@@ -509,15 +508,15 @@ class TRTCCloud extends events_1.EventEmitter {
      * @param {Number} reason - 离开原因，0表示用户主动退出房间，1表示用户超时退出，2表示被踢出房间。
      */
     handleOnRemoteUserLeaveRoom(userId, reason) {
-        const streamTypeList = [
-            trtc_define_1.TRTCVideoStreamType.TRTCVideoStreamTypeBig,
-            trtc_define_1.TRTCVideoStreamType.TRTCVideoStreamTypeSub,
-            trtc_define_1.TRTCVideoStreamType.TRTCVideoStreamTypeSmall
-        ];
-        streamTypeList.forEach(streamType => {
-            const key = this.getKey(userId, streamType);
-            this._destroyRender(key, null);
-        });
+        // const streamTypeList = [
+        //     TRTCVideoStreamType.TRTCVideoStreamTypeBig,
+        //     TRTCVideoStreamType.TRTCVideoStreamTypeSub,
+        //     TRTCVideoStreamType.TRTCVideoStreamTypeSmall
+        // ];
+        // streamTypeList.forEach(streamType => {
+        //     const key = this.getKey(userId, streamType);
+        //     this._destroyRender(key, null);
+        // });
         this.fire('onRemoteUserLeaveRoom', userId, reason);
     }
     /**
@@ -726,19 +725,6 @@ class TRTCCloud extends events_1.EventEmitter {
             this.fire('onSpeedTest', currentResult, finishedCount, totalCount);
         });
     }
-    /**
-     * 5.5 网速测试的结果回调
-     *
-     * 该统计回调由 startSpeedTest 触发。
-     *
-     * @event TRTCCallback#onSpeedTestResult
-     * @param {TRTCSpeedTestResult} result 网速测试数据数据，包括丢包、往返延迟、上下行的带宽速率。
-     */
-    bindOnSpeedTestResult() {
-        this.rtcCloud.onEvent('onSpeedTestResult', (result) => {
-            this.fire('onSpeedTestResult', result);
-        });
-    }
     /////////////////////////////////////////////////////////////////////////////////
     //
     //                      （六）硬件设备事件回调
@@ -1945,11 +1931,10 @@ class TRTCCloud extends events_1.EventEmitter {
      * 我们在 Demo 中有一个音量大小的提示条，就是基于这个接口实现的。
      * 如希望打开此功能，请在 startLocalAudio() 之前调用。
      *
-     * @param {Number} interval   - 设置 onUserVoiceVolume 回调的触发间隔，单位为ms，最小间隔为100ms，如果小于等于0则会关闭回调，建议设置为300ms
-     * @param {Boolean} enableVad - true: 打开人声检测；false: 关闭人声检测。目前仅 windows 支持。
+     * @param {Number} interval - 设置 onUserVoiceVolume 回调的触发间隔，单位为ms，最小间隔为100ms，如果小于等于0则会关闭回调，建议设置为300ms
      */
-    enableAudioVolumeEvaluation(interval, enableVad = false) {
-        this.rtcCloud.enableAudioVolumeEvaluation(interval, enableVad);
+    enableAudioVolumeEvaluation(interval) {
+        this.rtcCloud.enableAudioVolumeEvaluation(interval);
     }
     /**
      * 4.12 开始录音
@@ -2876,6 +2861,15 @@ class TRTCCloud extends events_1.EventEmitter {
     setMusicPublishVolume(id, volume) {
         this.rtcCloud.setMusicPublishVolume(id, volume);
     }
+    /**
+     * 11.22 调整背景音乐的变速效果
+     *
+     * @param {Number} id - 音乐 ID
+     * @param {Number} speedRate - 速度，默认值是1.0f，范围是：[0.5 ~ 2] 之间的浮点数；
+     */
+    setMusicSpeedRate(id, speedRate) {
+        this.rtcCloud.setMusicSpeedRate(id, speedRate);
+    }
     /////////////////////////////////////////////////////////////////////////////////
     //
     //                      （十二）音效相关接口函数
@@ -2983,31 +2977,14 @@ class TRTCCloud extends events_1.EventEmitter {
      * 测速结果将会用于优化 SDK 接下来的服务器选择策略，因此推荐您在用户首次通话前先进行一次测速，这将有助于我们选择最佳的服务器。
      * 同时，如果测试结果非常不理想，您可以通过醒目的 UI 提示用户选择更好的网络。
      *
-     * 注意：
-     * 1. 测速过程将产生少量的基础服务费用，详见 [计费概述 > 基础服务](https://cloud.tencent.com/document/product/647/17157#.E5.9F.BA.E7.A1.80.E6.9C.8D.E5.8A.A1) 文档说明。
-     * 2. 请在进入房间前进行网速测试，在房间中网速测试会影响正常的音视频传输效果，而且由于干扰过多，网速测试结果也不准确。
-     * 3. 同一时间只允许一项网速测试任务运行。
-     *
-     * @param {TRTCSpeedTestParams} params - 测速参数
-     * @param {Number} params.sdkAppId     - 应用标识
-     * @param {String} params.userId       - 用户标识
-     * @param {String} params.userSig      - 用户签名
-     * @param {Number} params.expectedUpBandwidth - 预期的上行带宽（kbps，取值范围： 10 ～ 5000，为 0 时不测试）。
-     * @param {Number} params.expectedDownBandwidth - 预期的下行带宽（kbps，取值范围： 10 ～ 5000，为 0 时不测试）。
+     * 注意：测速本身会消耗一定的流量，所以也会产生少量额外的流量费用。
      *
-     * @return 接口调用结果，< 0：失败
+     * @param {Number} sdkAppId - 应用标识
+     * @param {String} userId   - 用户标识
+     * @param {String} userSig  - 用户签名
      */
-    startSpeedTest(params, userId, userSig) {
-        if (params instanceof trtc_define_1.TRTCSpeedTestParams) {
-            return this.rtcCloud.startSpeedTest(params.sdkAppId, params.userId, params.userSig, params.expectedUpBandwidth, params.expectedDownBandwidth);
-        }
-        if (userId !== undefined && userSig !== undefined) {
-            const sdkAppId = params;
-            const speedTestParams = new trtc_define_1.TRTCSpeedTestParams(sdkAppId, userId, userSig);
-            return this.rtcCloud.startSpeedTest(speedTestParams.sdkAppId, speedTestParams.userId, speedTestParams.userSig, speedTestParams.expectedUpBandwidth, speedTestParams.expectedDownBandwidth);
-        }
-        console.error('startSpeedTest, param is error');
-        return -1;
+    startSpeedTest(sdkAppId, userId, userSig) {
+        this.rtcCloud.startSpeedTest(sdkAppId, userId, userSig);
     }
     /**
      * 13.2 停止网络测速
@@ -3185,8 +3162,8 @@ class TRTCCloud extends events_1.EventEmitter {
     }
     ///------------------------内部方法-----------------------------
     addLocalVideoRenderCallback() {
-        if (this.isExternalRenderEnabled || this.renderMode === 3) {
-            this.pixelformate = trtc_define_1.TRTCVideoPixelFormat.TRTCVideoPixelFormat_BGRA32;
+        if (this.isExternalRenderEnabled || this.renderMode === 3 || this.renderMode === 4) {
+            this.pixelformate = trtc_define_1.TRTCVideoPixelFormat.TRTCVideoPixelFormat_RGBA32;
         }
         else {
             this.pixelformate = trtc_define_1.TRTCVideoPixelFormat.TRTCVideoPixelFormat_I420;
@@ -3198,8 +3175,8 @@ class TRTCCloud extends events_1.EventEmitter {
         }, this.pixelformate);
     }
     addRemoteVideoRenderCallback(userid) {
-        if (this.isExternalRenderEnabled || this.renderMode === 3) {
-            this.pixelformate = trtc_define_1.TRTCVideoPixelFormat.TRTCVideoPixelFormat_BGRA32;
+        if (this.isExternalRenderEnabled || this.renderMode === 3 || this.renderMode === 4) {
+            this.pixelformate = trtc_define_1.TRTCVideoPixelFormat.TRTCVideoPixelFormat_RGBA32;
         }
         else {
             this.pixelformate = trtc_define_1.TRTCVideoPixelFormat.TRTCVideoPixelFormat_I420;
@@ -3216,10 +3193,15 @@ class TRTCCloud extends events_1.EventEmitter {
     /**
      * 选择绘制的模式 (webgl/yuvcanvs/)
      * @param {Number} mode -
-     * - 1  webgl
-     * - 2  yuvcanvs
+     * - 1  YUV WebGL
+     * - 2  YUV Canvas 2D
+     * - 3  RGBA Canvas 2D
+     * - 4  RGBA WebGL
      */
     setRenderMode(mode = 1) {
+        if ([1, 2, 3, 4].indexOf(mode) === -1) {
+            throw new Error(`render mode '${mode}' not supported, please check API doc: https://web.sdk.qcloud.com/trtc/electron/doc/en-us/trtc_electron_sdk/TRTCCloud.html#setRenderMode`);
+        }
         if (this.renderMode !== mode) {
             this.renderMode = mode;
             // 遍历原有的renderer，改为新的渲染模式
@@ -3231,6 +3213,7 @@ class TRTCCloud extends events_1.EventEmitter {
                 let view = value.getView();
                 this._initRender(key, view);
             });
+            console.debug('Render mode change to:', this.renderMode);
         }
     }
     //----------------------------------//
@@ -3330,7 +3313,6 @@ class TRTCCloud extends events_1.EventEmitter {
             });
         }
         if (uid.length == 0 || uid === CAMERA_DEVICE_TEST_ID) {
-            // 本地预览或者摄像头测试
             if (this.isExternalRenderEnabled) {
                 this.fire(CUSTOM_VIDEO_DATA, {
                     uid: '', type, rotation, timestamp,
@@ -3345,6 +3327,7 @@ class TRTCCloud extends events_1.EventEmitter {
                     data: {}
                 });
             }
+            // 本地预览
             if (uid.length == 0) {
                 this._onRealRender('local_video', type, width, height, timestamp, rotation, data); //本地社视频返回的是空
                 //回调local view 给用户数据，本地数据
@@ -3354,6 +3337,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); //摄像头测试
             }
@@ -3401,13 +3385,13 @@ class TRTCCloud extends events_1.EventEmitter {
             return;
         }
         const realRotation = rotation * 90; //ratation是0, 1, 2, 3. 绘制内部使用0, 90, 180, 270
-        if (this.renderMode === 3) {
+        if (this.renderMode === 3 || this.renderMode === 4) {
             renderer.drawFrame({
                 width: width,
                 height: height,
                 rotation: realRotation,
                 timestamp: timestamp,
-                data: this._BGRA2RGBA(data, width, height),
+                data: data,
                 isNeedRotate
             });
         }
@@ -3446,6 +3430,9 @@ class TRTCCloud extends events_1.EventEmitter {
         else if (this.renderMode === 3) {
             renderer = new Render_1.default.RGBRenderer();
         }
+        else if (this.renderMode === 4) {
+            renderer = new Render_1.default.Canvas3DRGBARenderer();
+        }
         else {
             console.warn('Unknown render mode, fallback to 1');
             renderer = new Render_1.default.GlRenderer();
@@ -3562,15 +3549,15 @@ class TRTCCloud extends events_1.EventEmitter {
     }
     _BGRA2RGBA(data, width, height) {
         const bgraData = new Uint8ClampedArray(data.slice(0));
-        const rbgData = new Uint8ClampedArray(data.slice(0));
+        const rgbaData = new Uint8ClampedArray(data.slice(0));
         // 将 BGRA8888 转成 RGBA8888
         for (let i = 0; i < width * height; i++) {
-            rbgData[4 * i] = bgraData[4 * i + 2];
-            rbgData[4 * i + 1] = bgraData[4 * i + 1];
-            rbgData[4 * i + 2] = bgraData[4 * i];
-            rbgData[4 * i + 3] = bgraData[4 * i + 3];
+            rgbaData[4 * i] = bgraData[4 * i + 2];
+            rgbaData[4 * i + 1] = bgraData[4 * i + 1];
+            rgbaData[4 * i + 2] = bgraData[4 * i];
+            rgbaData[4 * i + 3] = bgraData[4 * i + 3];
         }
-        return rbgData;
+        return rgbaData;
     }
     _isMacPlatform() {
         return process.platform == 'darwin';

package/liteav/trtc_define.d.ts

@@ -61,7 +61,8 @@ export declare enum TRTCBeautyStyle {
 export declare enum TRTCVideoPixelFormat {
     TRTCVideoPixelFormat_Unknown = 0,
     TRTCVideoPixelFormat_I420 = 1,
-    TRTCVideoPixelFormat_BGRA32 = 3
+    TRTCVideoPixelFormat_BGRA32 = 3,
+    TRTCVideoPixelFormat_RGBA32 = 5
 }
 export declare enum TRTCVideoBufferType {
     TRTCVideoBufferType_Unknown = 0,
@@ -372,33 +373,12 @@ export declare class TRTCQualityInfo {
  *
  * @param {String} userId - 说话者的 userId，字符编码格式是 UTF-8
  * @param {Number} volume - 说话者的音量， 取值范围0 - 100
- * @param {Number} vad - 是否检测到人声。0：非人声 1：人声 -1: 不支持检测 (mac 平台暂不支持)
  *
  */
 export declare class TRTCVolumeInfo {
     userId: string;
     volume: number;
-    vad: number;
-    constructor(userId?: string, volume?: number, vad?: number);
-}
-/**
- * 5.7 测速参数
- *
- * 您可以在用户进入房间前通过 [startSpeedTest]{@link TRTCCloud#startSpeedTest} 接口测试网速（注意：请不要在通话中调用）。
- *
- * @param {Number}      sdkAppId              - 应用标识
- * @param {String}      userId                - 用户标识
- * @param {String}      userSig               - 用户签名
- * @param {Number}      expectedUpBandwidth   - 预期的上行带宽（kbps，取值范围： 10 ～ 5000，为 0 时不测试）。
- * @param {Number}      expectedDownBandwidth - 预期的下行带宽（kbps，取值范围： 10 ～ 5000，为 0 时不测试）。
- */
-export declare class TRTCSpeedTestParams {
-    sdkAppId: number;
-    userId: string;
-    userSig: string;
-    expectedUpBandwidth: number;
-    expectedDownBandwidth: number;
-    constructor(sdkAppId?: number, userId?: string, userSig?: string, expectedUpBandwidth?: number, expectedDownBandwidth?: number);
+    constructor(userId?: string, volume?: number);
 }
 /**
  * 5.8 网络测速结果
@@ -412,28 +392,20 @@ export declare class TRTCSpeedTestParams {
  * - downLostRate 是指下行丢包率，例如0.2代表从服务器每收取10个数据包，可能有2个会在中途丢失。
  * - rtt 是指当前设备到腾讯云服务器的一次网络往返时间，正常数值在10ms - 100ms之间。
  *
- * @param {Boolean}     success      - 测试是否成功, 9.3 版本新增字段
- * @param {String}      errMsg       - 带宽测试错误信息, 9.3 版本新增字段
  * @param {String}      ip           - 服务器 IP 地址
  * @param {TRTCQuality} quality      - 网络质量，内部通过评估算法测算出的网络质量，loss 越低，rtt 越小，得分也就越高
  * @param {Number}      upLostRate   - 上行丢包率，范围是[0 - 1.0]，例如0.3代表每向服务器发送10个数据包，可能有3个会在中途丢失。
  * @param {Number}      downLostRate - 下行丢包率，范围是[0 - 1.0]，例如0.2代表从服务器每收取10个数据包，可能有2个会在中途丢失。
  * @param {Number}      rtt          - 延迟（毫秒），代表 SDK 跟服务器一来一回之间所消耗的时间，这个值越小越好，正常数值在10ms - 100ms之间。
- * @param {Number}      availableUpBandwidth          - 上行带宽（kbps，-1：无效值）。
- * @param {Number}      availableDownBandwidth        - 下行带宽（kbps，-1：无效值）。
  *
  */
 export declare class TRTCSpeedTestResult {
-    success: boolean;
-    errMsg: string;
-    ip: string;
-    quality: TRTCQuality;
+    ip: null | string;
+    quality: number;
     upLostRate: number;
     downLostRate: number;
     rtt: number;
-    availableUpBandwidth: number;
-    availableDownBandwidth: number;
-    constructor(success?: boolean, errMsg?: string, ip?: string, quality?: TRTCQuality, upLostRate?: number, downLostRate?: number, rtt?: number, availableUpBandwidth?: number, availableDownBandwidth?: number);
+    constructor();
 }
 /**
  * 记录矩形的四个点坐标
@@ -680,6 +652,9 @@ export declare class TRTCRemoteStatistics {
  * @param {Number} rtt       - 延迟（毫秒），代表 SDK 跟服务器一来一回之间所消耗的时间，这个值越小越好。
  *                             一般低于50ms的 rtt 是比较理想的情况，而高于100ms的 rtt 会引入较大的通话延时。
  *                             由于数据上下行共享一条网络连接，所以 local 和 remote 的 rtt 相同。
+ * @param {Number} gatewayRtt  - 延迟（毫秒），指 SDK 到本地路由器网关一次网络往返时间，该值越小越好。
+ *                               一般低于 50ms 的 gatewayRtt 相对理想，而高于 200ms 的 gatewayRtt 会引入较大的通话延时。
+ *                               当网络为蜂窝网非 WiFi 类型时，该值无效。
  * @param {Number} receivedBytes - 总接收字节数（包含信令和音视频）
  * @param {Number} sentBytes     - 总发送字节总数（包含信令和音视频）
  * @param {TRTCLocalStatistics[]} localStatisticsArray - 自己本地的音视频统计信息，由于可能有大画面、小画面以及辅路画面等多路的情况，所以是一个数组
@@ -694,13 +669,14 @@ export declare class TRTCStatistics {
     appCpu: number;
     systemCpu: number;
     rtt: number;
+    gatewayRtt: number;
     receivedBytes: number;
     sentBytes: number;
     localStatisticsArray: TRTCLocalStatistics[];
     localStatisticsArraySize: number;
     remoteStatisticsArray: TRTCRemoteStatistics[];
     remoteStatisticsArraySize: number;
-    constructor(upLoss?: number, downLoss?: number, appCpu?: number, systemCpu?: number, rtt?: number, receivedBytes?: number, sentBytes?: number, localStatisticsArray?: TRTCLocalStatistics[], localStatisticsArraySize?: number, remoteStatisticsArray?: TRTCRemoteStatistics[], remoteStatisticsArraySize?: number);
+    constructor(upLoss?: number, downLoss?: number, appCpu?: number, systemCpu?: number, rtt?: number, gatewayRtt?: number, receivedBytes?: number, sentBytes?: number, localStatisticsArray?: TRTCLocalStatistics[], localStatisticsArraySize?: number, remoteStatisticsArray?: TRTCRemoteStatistics[], remoteStatisticsArraySize?: number);
 }
 /**
  * 音乐参数

package/liteav/trtc_define.js

@@ -6,7 +6,7 @@
  *
  */
 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.TRTCVideoMirrorType = exports.TRTCVideoBufferType = exports.TRTCVideoPixelFormat = exports.TRTCBeautyStyle = exports.TRTCVideoRotation = exports.TRTCVideoFillMode = exports.TRTCQuality = exports.TRTCVideoStreamType = exports.TRTCVideoResolutionMode = exports.TRTCVideoResolution = void 0;
+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.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.TRTCVideoMirrorType = exports.TRTCVideoBufferType = exports.TRTCVideoPixelFormat = exports.TRTCBeautyStyle = exports.TRTCVideoRotation = exports.TRTCVideoFillMode = exports.TRTCQuality = exports.TRTCVideoStreamType = exports.TRTCVideoResolutionMode = exports.TRTCVideoResolution = void 0;
 /////////////////////////////////////////////////////////////////////////////////
 //
 //                    【（一）视频相关枚举值定义】
@@ -257,6 +257,8 @@ const TRTCVideoPixelFormat_HACK_JSDOC = {
     // TRTCVideoPixelFormat_Texture_2D: 2,
     /** BGRA32 */
     TRTCVideoPixelFormat_BGRA32: 3,
+    /** RGBA32 */
+    TRTCVideoPixelFormat_RGBA32: 5,
 };
 var TRTCVideoPixelFormat;
 (function (TRTCVideoPixelFormat) {
@@ -264,6 +266,7 @@ var TRTCVideoPixelFormat;
     TRTCVideoPixelFormat[TRTCVideoPixelFormat["TRTCVideoPixelFormat_I420"] = 1] = "TRTCVideoPixelFormat_I420";
     // TRTCVideoPixelFormat_Texture_2D= 2,
     TRTCVideoPixelFormat[TRTCVideoPixelFormat["TRTCVideoPixelFormat_BGRA32"] = 3] = "TRTCVideoPixelFormat_BGRA32";
+    TRTCVideoPixelFormat[TRTCVideoPixelFormat["TRTCVideoPixelFormat_RGBA32"] = 5] = "TRTCVideoPixelFormat_RGBA32";
 })(TRTCVideoPixelFormat = exports.TRTCVideoPixelFormat || (exports.TRTCVideoPixelFormat = {}));
 ;
 /**
@@ -875,39 +878,16 @@ exports.TRTCQualityInfo = TRTCQualityInfo;
  *
  * @param {String} userId - 说话者的 userId，字符编码格式是 UTF-8
  * @param {Number} volume - 说话者的音量， 取值范围0 - 100
- * @param {Number} vad - 是否检测到人声。0：非人声 1：人声 -1: 不支持检测 (mac 平台暂不支持)
  *
  */
 class TRTCVolumeInfo {
-    constructor(userId = '', volume = 0, vad = -1) {
+    constructor(userId = '', volume = 0) {
         this.userId = userId;
         this.volume = volume;
-        this.vad = vad;
     }
 }
 exports.TRTCVolumeInfo = TRTCVolumeInfo;
 ;
-/**
- * 5.7 测速参数
- *
- * 您可以在用户进入房间前通过 [startSpeedTest]{@link TRTCCloud#startSpeedTest} 接口测试网速（注意：请不要在通话中调用）。
- *
- * @param {Number}      sdkAppId              - 应用标识
- * @param {String}      userId                - 用户标识
- * @param {String}      userSig               - 用户签名
- * @param {Number}      expectedUpBandwidth   - 预期的上行带宽（kbps，取值范围： 10 ～ 5000，为 0 时不测试）。
- * @param {Number}      expectedDownBandwidth - 预期的下行带宽（kbps，取值范围： 10 ～ 5000，为 0 时不测试）。
- */
-class TRTCSpeedTestParams {
-    constructor(sdkAppId = 0, userId = '', userSig = '', expectedUpBandwidth = 0, expectedDownBandwidth = 0) {
-        this.sdkAppId = sdkAppId;
-        this.userId = userId;
-        this.userSig = userSig;
-        this.expectedUpBandwidth = expectedUpBandwidth;
-        this.expectedDownBandwidth = expectedDownBandwidth;
-    }
-}
-exports.TRTCSpeedTestParams = TRTCSpeedTestParams;
 /**
  * 5.8 网络测速结果
  *
@@ -920,28 +900,20 @@ exports.TRTCSpeedTestParams = TRTCSpeedTestParams;
  * - downLostRate 是指下行丢包率，例如0.2代表从服务器每收取10个数据包，可能有2个会在中途丢失。
  * - rtt 是指当前设备到腾讯云服务器的一次网络往返时间，正常数值在10ms - 100ms之间。
  *
- * @param {Boolean}     success      - 测试是否成功, 9.3 版本新增字段
- * @param {String}      errMsg       - 带宽测试错误信息, 9.3 版本新增字段
  * @param {String}      ip           - 服务器 IP 地址
  * @param {TRTCQuality} quality      - 网络质量，内部通过评估算法测算出的网络质量，loss 越低，rtt 越小，得分也就越高
  * @param {Number}      upLostRate   - 上行丢包率，范围是[0 - 1.0]，例如0.3代表每向服务器发送10个数据包，可能有3个会在中途丢失。
  * @param {Number}      downLostRate - 下行丢包率，范围是[0 - 1.0]，例如0.2代表从服务器每收取10个数据包，可能有2个会在中途丢失。
  * @param {Number}      rtt          - 延迟（毫秒），代表 SDK 跟服务器一来一回之间所消耗的时间，这个值越小越好，正常数值在10ms - 100ms之间。
- * @param {Number}      availableUpBandwidth          - 上行带宽（kbps，-1：无效值）。
- * @param {Number}      availableDownBandwidth        - 下行带宽（kbps，-1：无效值）。
  *
  */
 class TRTCSpeedTestResult {
-    constructor(success = false, errMsg = '', ip = '', quality = TRTCQuality.TRTCQuality_Unknown, upLostRate = 0.0, downLostRate = 0.0, rtt = 0, availableUpBandwidth = -1, availableDownBandwidth = -1) {
-        this.success = false;
-        this.errMsg = errMsg;
-        this.ip = ip;
-        this.quality = quality;
-        this.upLostRate = upLostRate;
-        this.downLostRate = downLostRate;
-        this.rtt = rtt;
-        this.availableUpBandwidth = availableUpBandwidth;
-        this.availableDownBandwidth = availableDownBandwidth;
+    constructor() {
+        this.ip = null;
+        this.quality = TRTCQuality.TRTCQuality_Unknown;
+        this.upLostRate = 0.0;
+        this.downLostRate = 0.0;
+        this.rtt = 0;
     }
 }
 exports.TRTCSpeedTestResult = TRTCSpeedTestResult;
@@ -1296,6 +1268,9 @@ exports.TRTCRemoteStatistics = TRTCRemoteStatistics;
  * @param {Number} rtt       - 延迟（毫秒），代表 SDK 跟服务器一来一回之间所消耗的时间，这个值越小越好。
  *                             一般低于50ms的 rtt 是比较理想的情况，而高于100ms的 rtt 会引入较大的通话延时。
  *                             由于数据上下行共享一条网络连接，所以 local 和 remote 的 rtt 相同。
+ * @param {Number} gatewayRtt  - 延迟（毫秒），指 SDK 到本地路由器网关一次网络往返时间，该值越小越好。
+ *                               一般低于 50ms 的 gatewayRtt 相对理想，而高于 200ms 的 gatewayRtt 会引入较大的通话延时。
+ *                               当网络为蜂窝网非 WiFi 类型时，该值无效。
  * @param {Number} receivedBytes - 总接收字节数（包含信令和音视频）
  * @param {Number} sentBytes     - 总发送字节总数（包含信令和音视频）
  * @param {TRTCLocalStatistics[]} localStatisticsArray - 自己本地的音视频统计信息，由于可能有大画面、小画面以及辅路画面等多路的情况，所以是一个数组
@@ -1305,12 +1280,13 @@ exports.TRTCRemoteStatistics = TRTCRemoteStatistics;
  *
  */
 class TRTCStatistics {
-    constructor(upLoss = 0, downLoss = 0, appCpu = 0, systemCpu = 0, rtt = 0, receivedBytes = 0, sentBytes = 0, localStatisticsArray = [], localStatisticsArraySize = 0, remoteStatisticsArray = [], remoteStatisticsArraySize = 0) {
+    constructor(upLoss = 0, downLoss = 0, appCpu = 0, systemCpu = 0, rtt = 0, gatewayRtt = 0, receivedBytes = 0, sentBytes = 0, localStatisticsArray = [], localStatisticsArraySize = 0, remoteStatisticsArray = [], remoteStatisticsArraySize = 0) {
         this.upLoss = upLoss;
         this.downLoss = downLoss;
         this.appCpu = appCpu;
         this.systemCpu = systemCpu;
         this.rtt = rtt;
+        this.gatewayRtt = gatewayRtt;
         this.receivedBytes = receivedBytes;
         this.sentBytes = sentBytes;
         this.localStatisticsArray = localStatisticsArray;

package/package.json

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

package/scripts/publish-doc.js

@@ -34,7 +34,7 @@ const cos = new COS({
 
 const bucket = 'sdk-web-1252463788';
 const region = 'ap-hongkong';
-const keyPrefix = 'trtc/electron/doc/zh-cn/trtc_electron_sdk/';
+const keyPrefix = 'trtc/electron/doc/zh-cn/trtc_electron_sdk';
 const docPath = path.join(__dirname, '../_doc');
 
 function walkSync(dir, filelist) {