trtc-electron-sdk 10.3.8-beta.2 → 10.3.100-alpha.0

package/liteav/Render/Canvas3DRGBARenderer/index.js

@@ -24,7 +24,7 @@ class Canvas3DRGBARenderer {
             1, 1, 0.0,
             -1, 1, 0.0
         ];
-        this.vertexIndice = [
+        this.vertexIndices = [
             0, 1, 2,
             0, 2, 3
         ];
@@ -37,7 +37,7 @@ class Canvas3DRGBARenderer {
     }
     _initGL() {
         try {
-            this.gl = this.canvas.getContext('webgl', { alpha: true, premultipliedAlpha: false }); //|| canvas.getContext("experimental-webgl", { antialias: false });
+            this.gl = this.canvas.getContext('webgl', { alpha: true, premultipliedAlpha: false });
         }
         catch (e) {
             return false;
@@ -103,22 +103,21 @@ class Canvas3DRGBARenderer {
     _initTexture() {
         this.texture = this.gl.createTexture();
         this.gl.bindTexture(this.gl.TEXTURE_2D, this.texture);
-        // c++ addon 层拷贝数据时翻转,这里不做翻转
-        this.gl.pixelStorei(this.gl.UNPACK_FLIP_Y_WEBGL, true);
+        // 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);
     }
-    _initTextureAttr() {
+    _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);
-        // indice data
-        const vertexIndiceBuffer = this.gl.createBuffer();
-        this.gl.bindBuffer(this.gl.ELEMENT_ARRAY_BUFFER, vertexIndiceBuffer);
-        this.gl.bufferData(this.gl.ELEMENT_ARRAY_BUFFER, new Uint16Array(this.vertexIndice), 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);
@@ -143,7 +142,8 @@ class Canvas3DRGBARenderer {
             height: '100%',
             display: 'flex',
             justifyContent: 'center',
-            alignItems: 'center'
+            alignItems: 'center',
+            willChange: 'transform',
         });
         this.container = container;
         element.appendChild(this.container);
@@ -169,7 +169,7 @@ class Canvas3DRGBARenderer {
             }
         } while (false);
         if (ret) {
-            this._initTextureAttr();
+            this._initTextureAttribute();
             this._initTexture();
         }
     }
@@ -202,7 +202,7 @@ class Canvas3DRGBARenderer {
         const { width, height, transform } = calcCanvasStyle(options);
         this.canvas.width = width;
         this.canvas.height = height;
-        this.canvas.style.transform = transform;
+        this.canvas.style.transform = `${transform} rotateX(180deg)`;
     }
     drawFrame(imageData) {
         if (!this.ready) {
@@ -226,7 +226,7 @@ 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, imageData.data // 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 // .slice(0) new Uint8Array(imageData.data)
             );
             this.gl.drawElements(this.gl.TRIANGLES, 6, this.gl.UNSIGNED_SHORT, 0);
         }

package/liteav/Render/RGBRenderer/index.js

@@ -92,7 +92,7 @@ class RGBRenderer {
                 containerHeight: this.container.clientHeight,
                 isNeedRotate
             });
-            let newImage = new ImageData(new Uint8ClampedArray(imageData.data.buffer || imageData.data), width, height);
+            let newImage = new ImageData(new Uint8ClampedArray(imageData.data.slice(0)), width, height);
             const tempCanvas = document.createElement('canvas');
             tempCanvas.width = imageData.width;
             tempCanvas.height = imageData.height;

package/liteav/Render/index.d.ts

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

package/liteav/Render/index.js

@@ -9,9 +9,6 @@ const GlRenderer_1 = __importDefault(require("./GlRenderer"));
 const SoftwareRenderer_1 = __importDefault(require("./SoftwareRenderer"));
 // @ts-ignore
 const RGBRenderer_1 = __importDefault(require("./RGBRenderer"));
-const I420VideoRenderer_1 = __importDefault(require("./I420VideoRenderer"));
-const BGRAVideoRenderer_1 = __importDefault(require("./BGRAVideoRenderer"));
-const RGBAVideoRenderer_1 = __importDefault(require("./RGBAVideoRenderer"));
 const Canvas3DRGBARenderer_1 = __importDefault(require("./Canvas3DRGBARenderer"));
 class GlRenderer {
     constructor() {
@@ -56,8 +53,5 @@ exports.default = {
     GlRenderer,
     SoftwareRenderer: SoftwareRenderer_1.default,
     RGBRenderer: RGBRenderer_1.default,
-    I420VideoRenderer: I420VideoRenderer_1.default,
-    BGRAVideoRenderer: BGRAVideoRenderer_1.default,
-    RGBAVideoRenderer: RGBAVideoRenderer_1.default,
     Canvas3DRGBARenderer: Canvas3DRGBARenderer_1.default,
 };

package/liteav/Render/util.d.ts

@@ -16,6 +16,7 @@ export declare class Config {
     setDebugMode(enable: boolean): void;
     getDebugMode(): 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?: {
@@ -30,17 +31,4 @@ export declare function calcCanvasStyle(options?: {
 }): {
     [x: string]: any;
 };
-export declare function calcVideoStyle(options?: {
-    contentWidth: number;
-    contentHeight: number;
-    rotation: number;
-    mirrorView: boolean;
-    contentMode: number;
-    containerWidth: number;
-    containerHeight: number;
-    isNeedRotate: boolean;
-}): {
-    [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.allocBuffer = exports.config = exports.calcVideoStyle = exports.calcCanvasStyle = exports.calcScaleRate = exports.isNeedKeepWidthAndHeight = exports.Config = void 0;
+exports.allocBuffer = exports.calcCanvasStyle = exports.calcScaleRate = exports.isNeedKeepWidthAndHeight = exports.config = exports.Config = void 0;
 /**
  * 配置对象, 可用来打开 debug 模式
  *
@@ -23,6 +23,7 @@ class Config {
     }
 }
 exports.Config = Config;
+exports.config = new Config();
 function isNeedKeepWidthAndHeight(rotation, isNeedRotate) {
     // 需保持宽高不做变化
     return rotation === 0 || rotation === 180 || !isNeedRotate;
@@ -91,42 +92,6 @@ function calcCanvasStyle(options = {
     return style;
 }
 exports.calcCanvasStyle = calcCanvasStyle;
-function calcVideoStyle(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');
-    }
-    let width = 0;
-    let height = 0;
-    const isKeepWidthHeight = isNeedKeepWidthAndHeight(options.rotation, options.isNeedRotate);
-    if (isNeedKeepWidthAndHeight(options.rotation, options.isNeedRotate)) {
-        width = options.contentWidth;
-        height = options.contentHeight;
-    }
-    else {
-        height = options.contentWidth;
-        width = options.contentHeight;
-    }
-    const scale = calcScaleRate(!isKeepWidthHeight, options.contentMode, width, height, options.containerWidth, options.containerHeight);
-    const style = {
-        width: `${width * scale}px`,
-        height: `${height * scale}px`,
-    };
-    if (options.mirrorView) {
-        style.transform = 'rotateY(180deg)';
-    }
-    return style;
-}
-exports.calcVideoStyle = calcVideoStyle;
-exports.config = new Config();
 function allocBuffer(length, userId, streamType) {
     console.debug('trtc:alloc buffer:', length, userId, streamType);
     if (length >= 1) {

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';
 /**
@@ -337,15 +337,6 @@ declare class TRTCCloud extends EventEmitter {
      * @param {Number} totalCount    - 需要测速的服务器总数量
      */
     bindOnSpeedTest(): void;
-    /**
-     * 5.5 网速测试的结果回调
-     *
-     * 该统计回调由 startSpeedTest 触发。
-     *
-     * @event TRTCCallback#onSpeedTestResult
-     * @param {TRTCSpeedTestResult} result 网速测试数据数据，包括丢包、往返延迟、上下行的带宽速率。
-     */
-    bindOnSpeedTestResult(): void;
     /**
      * 6.1 摄像头准备就绪
      *
@@ -1796,6 +1787,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 废弃接口： 播放音效
      *
@@ -1866,35 +1864,19 @@ 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 停止网络测速
      */
     stopSpeedTest(): void;
     /**
-     * 13.3 设置 SDK 使用的音频设备根据跟随系统默认设备
-     *
-     * @param {TRTCDeviceType} deviceType - 设备类型
-     * @param {Boolean} enable - 是否跟随系统默认的音频设备。 true：跟随, 当系统默认音频设备发生改变时，SDK 立即切换音频设备; false：不跟随, 只有当 SDK 使用的音频设备被移除后或插入新的音频设备为系统默认设备时，SDK 才切换至系统默认的音频设备。
-     *
-     */
-    enableFollowingDefaultAudioDevice(deviceType: TRTCDeviceType, enable: boolean): void;
-    /**
-     * 13.4 开始进行摄像头测试
+     * 13.3 开始进行摄像头测试
      *
      * 会触发 onFirstVideoFrame 回调接口
      *
@@ -1904,11 +1886,11 @@ declare class TRTCCloud extends EventEmitter {
      */
     startCameraDeviceTest(view: HTMLElement): void;
     /**
-     * 13.5 停止摄像头测试
+     * 13.4 停止摄像头测试
      */
     stopCameraDeviceTest(): void;
     /**
-     * 13.6 开始进行麦克风测试
+     * 13.5 开始进行麦克风测试
      *
      * 回调接口 onTestMicVolume 获取测试数据
      *
@@ -1918,11 +1900,11 @@ declare class TRTCCloud extends EventEmitter {
      */
     startMicDeviceTest(interval: number): void;
     /**
-     * 13.7 停止麦克风测试
+     * 13.6 停止麦克风测试
      */
     stopMicDeviceTest(): void;
     /**
-     * 13.8 开始进行扬声器测试
+     * 13.7 开始进行扬声器测试
      *
      * 回调接口 onTestSpeakerVolume 获取测试数据
      *
@@ -1932,7 +1914,7 @@ declare class TRTCCloud extends EventEmitter {
      */
     startSpeakerDeviceTest(testAudioFilePath: string): void;
     /**
-     * 13.9 停止扬声器测试
+     * 13.8 停止扬声器测试
      */
     stopSpeakerDeviceTest(): void;
     /**
@@ -2004,8 +1986,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;