trtc-electron-sdk 11.4.503-beta.3 → 11.4.503-beta.5

package/liteav/LocalMediaTranscoder/index.js

@@ -534,10 +534,10 @@ class TRTCLocalMediaTranscoder extends events_1.EventEmitter {
                 // 重新记录渲染的 HTML 节点并创建渲染器 
                 this.container = view;
                 this.renderer = (0, Renderer_1.createRenderer)(this.pixelFormat, this.container, {
-                    type: Renderer_1.RenderType.WebGL,
+                    type: Renderer_1.RenderType.Video,
                     onContextLost: () => {
                         this.container = view;
-                        this.renderer = (0, Renderer_1.createRenderer)(this.pixelFormat, this.container, { type: Renderer_1.RenderType.Video });
+                        this.renderer = (0, Renderer_1.createRenderer)(this.pixelFormat, this.container, { type: Renderer_1.RenderType.Canvas2D });
                     },
                 });
             }
@@ -545,10 +545,10 @@ class TRTCLocalMediaTranscoder extends events_1.EventEmitter {
                 // 第一次设置渲染的 HTML 节点，并创建渲染器，设置渲染回调
                 this.container = view;
                 this.renderer = (0, Renderer_1.createRenderer)(this.pixelFormat, this.container, {
-                    type: Renderer_1.RenderType.WebGL,
+                    type: Renderer_1.RenderType.Video,
                     onContextLost: () => {
                         this.container = view;
-                        this.renderer = (0, Renderer_1.createRenderer)(this.pixelFormat, this.container, { type: Renderer_1.RenderType.Video });
+                        this.renderer = (0, Renderer_1.createRenderer)(this.pixelFormat, this.container, { type: Renderer_1.RenderType.Canvas2D });
                     },
                 });
                 this.setMixedVideoFrameRenderCallback();

package/liteav/Renderer/Canvas3DRenderer/I420Canvas3DRenderer.js

@@ -238,7 +238,7 @@ class I420Canvas3DRenderer {
             if (util_1.config.getDebugMode()) {
                 e = this.gl.getError();
                 if (e != this.gl.NO_ERROR) {
-                    logger_1.default.log('upload y plane ', width, height, yplane.byteLength, ' error', e);
+                    logger_1.default.warn('upload y plane ', width, height, yplane.byteLength, ' error', e);
                 }
             }
             this.gl.activeTexture(this.gl.TEXTURE1);
@@ -247,7 +247,7 @@ class I420Canvas3DRenderer {
             if (util_1.config.getDebugMode()) {
                 e = this.gl.getError();
                 if (e != this.gl.NO_ERROR) {
-                    logger_1.default.log('upload u plane ', width, height, uplane.byteLength, '  error', e);
+                    logger_1.default.warn('upload u plane ', width, height, uplane.byteLength, '  error', e);
                 }
             }
             this.gl.activeTexture(this.gl.TEXTURE2);
@@ -256,7 +256,7 @@ class I420Canvas3DRenderer {
             if (util_1.config.getDebugMode()) {
                 e = this.gl.getError();
                 if (e != this.gl.NO_ERROR) {
-                    logger_1.default.log('upload v plane ', width, height, vplane.byteLength, '  error', e);
+                    logger_1.default.warn('upload v plane ', width, height, vplane.byteLength, '  error', e);
                 }
             }
         }

package/liteav/Renderer/Canvas3DRenderer/index.js

@@ -18,7 +18,7 @@ class Canvas3dRenderer {
         this.i420Rotation = 0;
         if (currentCreatedCount < UP_LIMIT_COUNT) {
             currentCreatedCount = currentCreatedCount + 1;
-            logger_1.default.log('currentCreatedCount=', currentCreatedCount);
+            logger_1.default.debug('currentCreatedCount=', currentCreatedCount);
         }
         else {
             throw new Error('WebGL context reach up limit');

package/liteav/Renderer/index.js

@@ -32,10 +32,15 @@ var RenderType;
 })(RenderType = exports.RenderType || (exports.RenderType = {}));
 function createRenderer(pixelFormat, view, options) {
     if (options && !options.type) {
-        options.type = RenderType.WebGL;
+        options.type = RenderType.Video;
     }
     let renderer = null;
-    if (isWebGLSupported && options.type === RenderType.WebGL) {
+    if (window.VideoFrame && window.VideoDecoder && options.type === RenderType.Video) {
+        // Electron 15+ 版本支持 WebCodec API
+        renderer = new VideoRenderer_1.default(pixelFormat, view);
+        logger_1.default.log('created Video render');
+    }
+    else if (isWebGLSupported && (options.type === RenderType.Video || options.type === RenderType.WebGL)) {
         try {
             renderer = new Canvas3DRenderer_1.default(pixelFormat, view, {
                 onContextLost: options.onContextLost || null,
@@ -43,23 +48,15 @@ function createRenderer(pixelFormat, view, options) {
             logger_1.default.log('created WebGL render');
         }
         catch (err) {
-            logger_1.default.log('create WebGL renderer error.', err.message);
-            renderer = null;
-        }
-    }
-    if (!renderer) {
-        // @ts-ignore
-        if (window.VideoFrame && window.VideoDecoder
-            && (options.type === RenderType.WebGL || options.type === RenderType.Video)) {
-            // Electron 15+ 版本支持 WebCodec API
-            renderer = new VideoRenderer_1.default(pixelFormat, view);
-            logger_1.default.log('created Video render');
-        }
-        else {
+            logger_1.default.warn('create WebGL renderer error.', err.message);
             renderer = new Canvas2DRenderer_1.default(pixelFormat, view);
             logger_1.default.log('created Canvas 2D render');
         }
     }
+    else {
+        renderer = new Canvas2DRenderer_1.default(pixelFormat, view);
+        logger_1.default.log('created Canvas 2D render');
+    }
     return renderer;
 }
 exports.createRenderer = createRenderer;

package/liteav/trtc.d.ts

@@ -1208,6 +1208,7 @@ declare class TRTCCloud extends EventEmitter {
      * 如果录制任务在退出房间前尚未通过本接口停止，则退出房间后录音任务会自动被停止。
      */
     stopLocalRecording(): void;
+    setVideoRenderingFPS(fps: number): void;
     /**
      * 开启本地音频的采集和上行
      *

package/liteav/trtc.js

@@ -735,7 +735,6 @@ class TRTCCloud extends events_1.EventEmitter {
      * @event TRTCCallback#onSendFirstLocalAudioFrame
      */
     handleOnSendFirstLocalAudioFrame() {
-        logger_1.default.log(`onSendFirstLocalAudioFrame`);
         this.fire('onSendFirstLocalAudioFrame');
     }
     /**
@@ -1781,7 +1780,7 @@ class TRTCCloud extends events_1.EventEmitter {
      *  - 如果传入 `null` 则不预览摄像头画面，但不影响摄像头采集
      */
     startLocalPreview(views) {
-        logger_1.default.log(`startLocalPreview`, views);
+        logger_1.default.debug(`startLocalPreview`, views);
         if (views !== undefined) {
             if (views !== null) {
                 if (Array.isArray(views)) {
@@ -1825,7 +1824,7 @@ class TRTCCloud extends events_1.EventEmitter {
      * @param {Array<HTMLElement>|HTMLElement|null} views - 承载预览画面单个的 HTML 块节点或者 HTML 块节点数组，传入 `null` 结束本地摄像头采集视频的预览。
      */
     updateLocalView(views) {
-        logger_1.default.log(`updateLocalView`, views);
+        logger_1.default.debug(`updateLocalView`, views);
         const key = this.getKey(LOCAL_USER_VIDEO_ID, trtc_define_1.TRTCVideoStreamType.TRTCVideoStreamTypeBig);
         if (views !== undefined) {
             if (views !== null) {
@@ -1934,7 +1933,7 @@ class TRTCCloud extends events_1.EventEmitter {
      * @param {TRTCVideoStreamType} streamType   - 视频流类型
      */
     startRemoteView(userId, views, streamType) {
-        logger_1.default.log(`startRemoteView userId:${userId} streamType:${streamType}`, views);
+        logger_1.default.debug(`startRemoteView userId:${userId} streamType:${streamType}`, views);
         if (views !== undefined) {
             if (views !== null) {
                 if (Array.isArray(views)) {
@@ -2005,7 +2004,7 @@ class TRTCCloud extends events_1.EventEmitter {
      *
      */
     updateRemoteView(userId, views, streamType) {
-        logger_1.default.log(`updateRemoteView userId:${userId} streamType:${streamType}`, views);
+        logger_1.default.debug(`updateRemoteView userId:${userId} streamType:${streamType}`, views);
         const rendererStreamType = this._calcRemoteVideoRendererStreamType(streamType);
         const key = this.getKey(userId, rendererStreamType);
         if (views !== undefined) {
@@ -2382,6 +2381,10 @@ class TRTCCloud extends events_1.EventEmitter {
     stopLocalRecording() {
         this.rtcCloud.stopLocalRecording();
     }
+    setVideoRenderingFPS(fps) {
+        const valid_fps = fps >= 5 ? fps : 5;
+        this.rtcCloud.setVideoRenderingFPS(valid_fps);
+    }
     /////////////////////////////////////////////////////////////////////////////////
     //
     //                      （四）音频相关接口函数
@@ -4364,7 +4367,7 @@ class TRTCCloud extends events_1.EventEmitter {
         const onContextLost = (key, view) => {
             const rendererMap = this.videoRendererMap.get(key);
             if (rendererMap) {
-                const render = this._createVideoRenderer(view, key, { type: Renderer_1.RenderType.Video });
+                const render = this._createVideoRenderer(view, key, { type: Renderer_1.RenderType.Canvas2D });
                 rendererMap === null || rendererMap === void 0 ? void 0 : rendererMap.set(view, render);
                 this.videoRendererMap.set(key, rendererMap);
             }
@@ -4392,7 +4395,7 @@ class TRTCCloud extends events_1.EventEmitter {
             validViews.forEach((view) => {
                 if (!(rendererMap === null || rendererMap === void 0 ? void 0 : rendererMap.has(view))) {
                     const renderer = this._createVideoRenderer(view, key, {
-                        type: Renderer_1.RenderType.WebGL,
+                        type: Renderer_1.RenderType.Video,
                         onContextLost: () => {
                             onContextLost(key, view);
                         },
@@ -4405,7 +4408,7 @@ class TRTCCloud extends events_1.EventEmitter {
             rendererMap = new Map();
             validViews.forEach((view) => {
                 const renderer = this._createVideoRenderer(view, key, {
-                    type: Renderer_1.RenderType.WebGL,
+                    type: Renderer_1.RenderType.Video,
                     onContextLost: () => {
                         onContextLost(key, view);
                     },

package/liteav/vod_player.js

@@ -1,9 +1,13 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VodPlayer = exports.PlayerEvents = void 0;
 const events_1 = require("events");
 const Renderer_1 = require("./Renderer");
 const trtc_define_1 = require("./trtc_define");
+const logger_1 = __importDefault(require("./logger"));
 var PlayerEvents;
 (function (PlayerEvents) {
     PlayerEvents["onVodPlayerStarted"] = "onVodPlayerStarted";
@@ -144,9 +148,9 @@ class VodPlayer extends events_1.EventEmitter {
         }
         view.innerHTML = ''; // 事先清空一下，避免画面叠加
         this.renderer = (0, Renderer_1.createRenderer)(trtc_define_1.TRTCVideoPixelFormat.TRTCVideoPixelFormat_I420, view, {
-            type: Renderer_1.RenderType.WebGL,
+            type: Renderer_1.RenderType.Video,
             onContextLost: () => {
-                this.renderer = (0, Renderer_1.createRenderer)(trtc_define_1.TRTCVideoPixelFormat.TRTCVideoPixelFormat_I420, view, { type: Renderer_1.RenderType.Video });
+                this.renderer = (0, Renderer_1.createRenderer)(trtc_define_1.TRTCVideoPixelFormat.TRTCVideoPixelFormat_I420, view, { type: Renderer_1.RenderType.Canvas2D });
             },
         });
     }
@@ -156,6 +160,7 @@ class VodPlayer extends events_1.EventEmitter {
             this.renderer = null;
         }
         catch (err) {
+            logger_1.default.error('[VodPlayer]destroyRender failed:', err);
         }
     }
 }

package/package.json

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