trtc-electron-sdk 10.6.115-beta.2 → 10.6.115-beta.4

package/liteav/LocalMediaTranscoder/index.d.ts

@@ -112,7 +112,7 @@ export declare enum TRTCLocalMediaTranscodingSourceType {
     MediaSourceImage = 2,
     MediaSourceRemoteVideo = 3
 }
-export declare type TRTCLocalMediaTranscodingSource = {
+export type TRTCLocalMediaTranscodingSource = {
     sourceType: TRTCLocalMediaTranscodingSourceType;
     cameraDeviceId?: string;
     screenSourceId?: string;
@@ -120,8 +120,9 @@ export declare type TRTCLocalMediaTranscodingSource = {
     userId?: string;
     rect: Rect;
     zOrder: number;
+    renderParams: TRTCRenderParams;
 };
-export declare type TRTCLocalMediaTranscodingParams = {
+export type TRTCLocalMediaTranscodingParams = {
     inputSourceList: TRTCLocalMediaTranscodingSource[];
     videoEncoderParams: TRTCVideoEncParam;
     canvasColor: number;
@@ -132,7 +133,7 @@ export declare enum TRTCCameraCaptureMode {
     CameraResolutionStrategyHighQuality = 2,
     CameraCaptureManual = 3
 }
-export declare type TRTCCameraCaptureParams = {
+export type TRTCCameraCaptureParams = {
     /** 摄像头采集偏好 */
     mode: TRTCCameraCaptureMode;
     /** 采集图像宽度 */
@@ -190,43 +191,36 @@ export declare type TRTCCameraCaptureParams = {
  *     console.log(`onScreenSourceStopped { sourceId:${sourceId}, reason:${reason} }`);
  *   });
  *   // 监听图片事件
- *   this.localMediaTranscoder.on('onImageSourceStarted', (imagePath: string, errCode: number, errMsg: string) => {
+ *   localMediaTranscoder.on('onImageSourceStarted', (imagePath: string, errCode: number, errMsg: string) => {
  *     console.log(`onImageSourceStarted { imagePath:${imagePath} errCode:${errCode} errMsg:${errMsg} }`);
  *   });
- *   this.localMediaTranscoder.on('onImageSourceStopped', (imagePath: string) => {
+ *   localMediaTranscoder.on('onImageSourceStopped', (imagePath: string) => {
  *     console.log(`onImageSourceStopped { imagePath:${imagePath} }`);
  *   });
  *
  *   // 开启摄像头一
- *   localMediaTranscoder.startCameraSource(
+ *   localMediaTranscoder.startCameraSource(cameraList[0].deviceId);
+ *   localMediaTranscoder.setCameraCaptureParams(
  *     cameraList[0].deviceId,
  *     {
  *       mode: TRTCCameraCaptureMode.CameraResolutionStrategyAuto,
- *       width: 640,
- *       height: 360,
- *     },
- *     {
- *       rotation: TRTCVideoRotation.TRTCVideoRotation0,
- *       fillMode: TRTCVideoFillMode.TRTCVideoFillMode_Fit,
- *       mirrorType: TRTCVideoMirrorType.TRTCVideoMirrorType_Disable,
+ *       width: 480,
+ *       height: 480,
  *     }
  *   );
  *
  *   // 开启摄像头二
- *   localMediaTranscoder.startCameraSource(
+ *   localMediaTranscoder.startCameraSource(cameraList[1].deviceId);
+ *   localMediaTranscoder.setCameraCaptureParams(
  *     cameraList[1].deviceId,
  *     {
- *         mode: TRTCCameraCaptureMode.CameraResolutionStrategyAuto,
- *         width: 640,
- *         height: 360
- *     },
- *     {
- *         rotation: TRTCVideoRotation.TRTCVideoRotation0,
- *         fillMode: TRTCVideoFillMode.TRTCVideoFillMode_Fit,
- *         mirrorType: TRTCVideoMirrorType.TRTCVideoMirrorType_Disable
+ *       mode: TRTCCameraCaptureMode.CameraResolutionStrategyAuto,
+ *       width: 960,
+ *       height: 540
  *     }
  *   );
  *
+ *
  *   // 开启屏幕一
  *   localMediaTranscoder.startScreenSource(screenSourceList[0], {top:10, left:10, right:1200, bottom:800});
  *
@@ -249,14 +243,22 @@ export declare type TRTCCameraCaptureParams = {
  *           cameraDeviceId: cameraList[0].deviceId,
  *           rect: { left: 0, top: 0, right: 320, bottom: 180 },
  *           zOrder: 1,
- *           mirror: false,
+ *           renderParams: {
+ *             rotation: TRTCVideoRotation.TRTCVideoRotation0,
+ *             fillMode: TRTCVideoFillMode.TRTCVideoFillMode_Fit,
+ *             mirrorType: TRTCVideoMirrorType.TRTCVideoMirrorType_Disable
+ *           },
  *         },
  *         { // camera 2
  *           sourceType: TRTCLocalMediaTranscodingSourceType.MediaSourceCamera,
  *           cameraDeviceId: cameraList[1].deviceId,
  *           rect: {left: 320 + 20, top: 180 + 20, right: 640 + 20, bottom: 360 + 20},
  *           zOrder: 2,
- *           mirror: false
+ *           renderParams: {
+ *             rotation: TRTCVideoRotation.TRTCVideoRotation90,
+ *             fillMode: TRTCVideoFillMode.TRTCVideoFillMode_Fill,
+ *             mirrorType: TRTCVideoMirrorType.TRTCVideoMirrorType_Enable
+ *           },
  *         },
  *         {
  *           // screen 1
@@ -264,7 +266,11 @@ export declare type TRTCCameraCaptureParams = {
  *           screenSourceId: screenSourceList[0].sourceId,
  *           rect: {left: 320 + 20, top: 0, right: 640 + 20, bottom: 180},
  *           zOrder: 3,
- *           mirror: false
+ *           renderParams: {
+ *             rotation: TRTCVideoRotation.TRTCVideoRotation180,
+ *             fillMode: TRTCVideoFillMode.TRTCVideoFillMode_Fit,
+ *             mirrorType: TRTCVideoMirrorType.TRTCVideoMirrorType_Enable
+ *           },
  *         },
  *         {
  *           // screen 2
@@ -272,21 +278,33 @@ export declare type TRTCCameraCaptureParams = {
  *           screenSourceId: screenSourceList[1].sourceId,
  *           rect: {left: 0, top: 180 + 20, right: 320, bottom: 360 + 20},
  *           zOrder: 4,
- *           mirror: false
+ *           renderParams: {
+ *             rotation: TRTCVideoRotation.TRTCVideoRotation270,
+ *             fillMode: TRTCVideoFillMode.TRTCVideoFillMode_Fill,
+ *             mirrorType: TRTCVideoMirrorType.TRTCVideoMirrorType_Auto
+ *           },
  *         },
  *         { // image 1
  *           sourceType: TRTCLocalMediaTranscodingSourceType.MediaSourceImage,
  *           imagePath: '<please set valid image path>',
  *           rect: {left: 0, top: 360 + 40, right: 320, bottom: 540 + 40},
  *           zOrder: 5,
- *           mirror: false
+ *           renderParams: {
+ *             rotation: TRTCVideoRotation.TRTCVideoRotation90, // 不会生效，参数设置将被忽略
+ *             fillMode: TRTCVideoFillMode.TRTCVideoFillMode_Fit,
+ *             mirrorType: TRTCVideoMirrorType.TRTCVideoMirrorType_Enable // 不会生效，参数设置将被忽略
+ *           },
  *         },
  *         { // image 2
  *           sourceType: TRTCLocalMediaTranscodingSourceType.MediaSourceImage,
  *           imagePath: '<please set valid image path>',
  *           rect: {left: 320 + 20, top: 360 + 40, right: 640, bottom: 540 + 40},
  *           zOrder: 5,
- *           mirror: false
+ *           renderParams: {
+ *             rotation: TRTCVideoRotation.TRTCVideoRotation0, // 不会生效，参数设置将被忽略
+ *             fillMode: TRTCVideoFillMode.TRTCVideoFillMode_Fill,
+ *             mirrorType: TRTCVideoMirrorType.TRTCVideoMirrorType_Disable // 不会生效，参数设置将被忽略
+ *           },
  *         }
  *       ],
  *       videoEncoderParams: {
@@ -343,12 +361,17 @@ declare class TRTCLocalMediaTranscoder extends EventEmitter {
      * 启动摄像头采集
      *
      * @param deviceId {String} - 摄像头设备 Id
-     * @param transcodeParams {TRTCCameraCaptureParams} - 指定摄像头采集分辨率和帧率
-     * @param renderParams {TRTCRenderParams} - 指定摄像头数据源是否旋转、镜像和填充模式
      *
      * @fires [onCameraSourceStarted]{@link TRTCLocalMediaTranscodingEvent#onCameraSourceStarted}
      */
-    startCameraSource(deviceId: string, transcodeParams: TRTCCameraCaptureParams, renderParams: TRTCRenderParams): void;
+    startCameraSource(deviceId: string): void;
+    /**
+     * 设置摄像头采集参数
+     *
+     * @param deviceId {String} - 摄像头设备 Id
+     * @param cameraCaptureParams  {TRTCCameraCaptureParams} - 指定摄像头采集分辨率和帧率
+     */
+    setCameraCaptureParams(deviceId: string, cameraCaptureParams: TRTCCameraCaptureParams): void;
     /**
      * 停止摄像头采集
      * @param deviceId {String} - 摄像头设备 Id
@@ -389,10 +412,11 @@ declare class TRTCLocalMediaTranscoder extends EventEmitter {
     removeImageSource(path: string): void;
     /**
      * 设置本地混流转码视频预览节点
-     * @param el {HTMLElement} - 必须是 HTML 块元素
+     * @param el {HTMLElement | null} - 如果传入的是 HTML 元素，必须是块元素；传入 null 时，会停止视频预览
      */
-    setMixedVideoRenderView(el: HTMLElement): void;
+    setMixedVideoRenderView(el: HTMLElement | null): void;
     private setMixedVideoFrameRenderCallback;
+    private unsetMixedVideoFrameRenderCallback;
     private setEventCallback;
     private renderMixedVideoFrame;
 }

package/liteav/LocalMediaTranscoder/index.js

@@ -165,7 +165,7 @@ var TRTCLocalMediaTranscodingSourceType;
  *  当 sourceType 为 TRTCMediaSourceCamera 时此字段有效，不过当前版本的 SDK 还不支持这个能力。
  * @property {Rect} rect - 【字段含义】指定该路画面的坐标区域（单位：像素）。
  * @property {Number} zOrder - 【字段含义】指定该路画面的层级（取值范围：0 - 15，不可重复）。
- * @property {Boolean} mirror - 【字段含义】指定该路画面是否要开启左右镜像。
+ * @property {TRTCRenderParams} renderParams - 【字段含义】指定该路数据源是否旋转、镜像和填充模式。
  */
 const TRTCLocalMediaTranscodingSource_HACK_JSDOC = null;
 /**
@@ -279,43 +279,36 @@ const TRTCCameraCaptureParams_HACK_JSDOC = null;
  *     console.log(`onScreenSourceStopped { sourceId:${sourceId}, reason:${reason} }`);
  *   });
  *   // 监听图片事件
- *   this.localMediaTranscoder.on('onImageSourceStarted', (imagePath: string, errCode: number, errMsg: string) => {
+ *   localMediaTranscoder.on('onImageSourceStarted', (imagePath: string, errCode: number, errMsg: string) => {
  *     console.log(`onImageSourceStarted { imagePath:${imagePath} errCode:${errCode} errMsg:${errMsg} }`);
  *   });
- *   this.localMediaTranscoder.on('onImageSourceStopped', (imagePath: string) => {
+ *   localMediaTranscoder.on('onImageSourceStopped', (imagePath: string) => {
  *     console.log(`onImageSourceStopped { imagePath:${imagePath} }`);
  *   });
  *
  *   // 开启摄像头一
- *   localMediaTranscoder.startCameraSource(
+ *   localMediaTranscoder.startCameraSource(cameraList[0].deviceId);
+ *   localMediaTranscoder.setCameraCaptureParams(
  *     cameraList[0].deviceId,
  *     {
  *       mode: TRTCCameraCaptureMode.CameraResolutionStrategyAuto,
- *       width: 640,
- *       height: 360,
- *     },
- *     {
- *       rotation: TRTCVideoRotation.TRTCVideoRotation0,
- *       fillMode: TRTCVideoFillMode.TRTCVideoFillMode_Fit,
- *       mirrorType: TRTCVideoMirrorType.TRTCVideoMirrorType_Disable,
+ *       width: 480,
+ *       height: 480,
  *     }
  *   );
  *
  *   // 开启摄像头二
- *   localMediaTranscoder.startCameraSource(
+ *   localMediaTranscoder.startCameraSource(cameraList[1].deviceId);
+ *   localMediaTranscoder.setCameraCaptureParams(
  *     cameraList[1].deviceId,
  *     {
- *         mode: TRTCCameraCaptureMode.CameraResolutionStrategyAuto,
- *         width: 640,
- *         height: 360
- *     },
- *     {
- *         rotation: TRTCVideoRotation.TRTCVideoRotation0,
- *         fillMode: TRTCVideoFillMode.TRTCVideoFillMode_Fit,
- *         mirrorType: TRTCVideoMirrorType.TRTCVideoMirrorType_Disable
+ *       mode: TRTCCameraCaptureMode.CameraResolutionStrategyAuto,
+ *       width: 960,
+ *       height: 540
  *     }
  *   );
  *
+ *
  *   // 开启屏幕一
  *   localMediaTranscoder.startScreenSource(screenSourceList[0], {top:10, left:10, right:1200, bottom:800});
  *
@@ -338,14 +331,22 @@ const TRTCCameraCaptureParams_HACK_JSDOC = null;
  *           cameraDeviceId: cameraList[0].deviceId,
  *           rect: { left: 0, top: 0, right: 320, bottom: 180 },
  *           zOrder: 1,
- *           mirror: false,
+ *           renderParams: {
+ *             rotation: TRTCVideoRotation.TRTCVideoRotation0,
+ *             fillMode: TRTCVideoFillMode.TRTCVideoFillMode_Fit,
+ *             mirrorType: TRTCVideoMirrorType.TRTCVideoMirrorType_Disable
+ *           },
  *         },
  *         { // camera 2
  *           sourceType: TRTCLocalMediaTranscodingSourceType.MediaSourceCamera,
  *           cameraDeviceId: cameraList[1].deviceId,
  *           rect: {left: 320 + 20, top: 180 + 20, right: 640 + 20, bottom: 360 + 20},
  *           zOrder: 2,
- *           mirror: false
+ *           renderParams: {
+ *             rotation: TRTCVideoRotation.TRTCVideoRotation90,
+ *             fillMode: TRTCVideoFillMode.TRTCVideoFillMode_Fill,
+ *             mirrorType: TRTCVideoMirrorType.TRTCVideoMirrorType_Enable
+ *           },
  *         },
  *         {
  *           // screen 1
@@ -353,7 +354,11 @@ const TRTCCameraCaptureParams_HACK_JSDOC = null;
  *           screenSourceId: screenSourceList[0].sourceId,
  *           rect: {left: 320 + 20, top: 0, right: 640 + 20, bottom: 180},
  *           zOrder: 3,
- *           mirror: false
+ *           renderParams: {
+ *             rotation: TRTCVideoRotation.TRTCVideoRotation180,
+ *             fillMode: TRTCVideoFillMode.TRTCVideoFillMode_Fit,
+ *             mirrorType: TRTCVideoMirrorType.TRTCVideoMirrorType_Enable
+ *           },
  *         },
  *         {
  *           // screen 2
@@ -361,21 +366,33 @@ const TRTCCameraCaptureParams_HACK_JSDOC = null;
  *           screenSourceId: screenSourceList[1].sourceId,
  *           rect: {left: 0, top: 180 + 20, right: 320, bottom: 360 + 20},
  *           zOrder: 4,
- *           mirror: false
+ *           renderParams: {
+ *             rotation: TRTCVideoRotation.TRTCVideoRotation270,
+ *             fillMode: TRTCVideoFillMode.TRTCVideoFillMode_Fill,
+ *             mirrorType: TRTCVideoMirrorType.TRTCVideoMirrorType_Auto
+ *           },
  *         },
  *         { // image 1
  *           sourceType: TRTCLocalMediaTranscodingSourceType.MediaSourceImage,
  *           imagePath: '<please set valid image path>',
  *           rect: {left: 0, top: 360 + 40, right: 320, bottom: 540 + 40},
  *           zOrder: 5,
- *           mirror: false
+ *           renderParams: {
+ *             rotation: TRTCVideoRotation.TRTCVideoRotation90, // 不会生效，参数设置将被忽略
+ *             fillMode: TRTCVideoFillMode.TRTCVideoFillMode_Fit,
+ *             mirrorType: TRTCVideoMirrorType.TRTCVideoMirrorType_Enable // 不会生效，参数设置将被忽略
+ *           },
  *         },
  *         { // image 2
  *           sourceType: TRTCLocalMediaTranscodingSourceType.MediaSourceImage,
  *           imagePath: '<please set valid image path>',
  *           rect: {left: 320 + 20, top: 360 + 40, right: 640, bottom: 540 + 40},
  *           zOrder: 5,
- *           mirror: false
+ *           renderParams: {
+ *             rotation: TRTCVideoRotation.TRTCVideoRotation0, // 不会生效，参数设置将被忽略
+ *             fillMode: TRTCVideoFillMode.TRTCVideoFillMode_Fill,
+ *             mirrorType: TRTCVideoMirrorType.TRTCVideoMirrorType_Disable // 不会生效，参数设置将被忽略
+ *           },
  *         }
  *       ],
  *       videoEncoderParams: {
@@ -407,9 +424,12 @@ class TRTCLocalMediaTranscoder extends events_1.EventEmitter {
     destroy() {
         var _a;
         try {
-            this.nativeLocalMediaTranscoder.setVideoFrameRenderCallback(null, this.pixelFormat);
-            this.nativeLocalMediaTranscoder.setVideoFrameProcessCallback(trtc_define_1.TRTCVideoPixelFormat.TRTCVideoPixelFormat_Unknown);
-            this.nativeLocalMediaTranscoder = null;
+            if (this.nativeLocalMediaTranscoder) {
+                // 避免重复销毁报错
+                this.nativeLocalMediaTranscoder.setVideoFrameRenderCallback(null, this.pixelFormat);
+                this.nativeLocalMediaTranscoder.setVideoFrameProcessCallback(trtc_define_1.TRTCVideoPixelFormat.TRTCVideoPixelFormat_Unknown);
+                this.nativeLocalMediaTranscoder = null;
+            }
             (_a = this.renderer) === null || _a === void 0 ? void 0 : _a.destroy();
             this.renderer = null;
             this.container = null;
@@ -455,13 +475,20 @@ class TRTCLocalMediaTranscoder extends events_1.EventEmitter {
      * 启动摄像头采集
      *
      * @param deviceId {String} - 摄像头设备 Id
-     * @param transcodeParams {TRTCCameraCaptureParams} - 指定摄像头采集分辨率和帧率
-     * @param renderParams {TRTCRenderParams} - 指定摄像头数据源是否旋转、镜像和填充模式
      *
      * @fires [onCameraSourceStarted]{@link TRTCLocalMediaTranscodingEvent#onCameraSourceStarted}
      */
-    startCameraSource(deviceId, transcodeParams, renderParams) {
-        this.nativeLocalMediaTranscoder.startCameraSource(deviceId, transcodeParams, renderParams);
+    startCameraSource(deviceId) {
+        this.nativeLocalMediaTranscoder.startCameraSource(deviceId);
+    }
+    /**
+     * 设置摄像头采集参数
+     *
+     * @param deviceId {String} - 摄像头设备 Id
+     * @param cameraCaptureParams  {TRTCCameraCaptureParams} - 指定摄像头采集分辨率和帧率
+     */
+    setCameraCaptureParams(deviceId, cameraCaptureParams) {
+        this.nativeLocalMediaTranscoder.setCameraCaptureParams(deviceId, cameraCaptureParams);
     }
     /**
      * 停止摄像头采集
@@ -513,16 +540,35 @@ class TRTCLocalMediaTranscoder extends events_1.EventEmitter {
     }
     /**
      * 设置本地混流转码视频预览节点
-     * @param el {HTMLElement} - 必须是 HTML 块元素
+     * @param el {HTMLElement | null} - 如果传入的是 HTML 元素，必须是块元素；传入 null 时，会停止视频预览
      */
     setMixedVideoRenderView(el) {
-        if (el) {
-            this.container = el;
-            this.renderer = (0, Renderer_1.createRenderer)(this.pixelFormat, this.container);
-            this.setMixedVideoFrameRenderCallback();
+        if (el && el instanceof HTMLElement) {
+            if (this.container === el) {
+                return; // 重复在同一个 HTML 节点内渲染，不用处理，直接退出
+            }
+            else if (this.renderer) {
+                // 渲染的 HTML 节点发生改变，之前已经存在渲染器，先销毁之前渲染器
+                this.renderer.destroy();
+                this.renderer = null;
+                // 重新记录渲染的 HTML 节点并创建渲染器 
+                this.container = el;
+                this.renderer = (0, Renderer_1.createRenderer)(this.pixelFormat, this.container);
+            }
+            else {
+                // 第一次设置渲染的 HTML 节点，并创建渲染器，设置渲染回调
+                this.container = el;
+                this.renderer = (0, Renderer_1.createRenderer)(this.pixelFormat, this.container);
+                this.setMixedVideoFrameRenderCallback();
+            }
         }
         else {
-            console.error('trtc:TRTCLocalMediaTranscoder.setMixedVideoRenderView() with wrong parameter');
+            if (this.renderer) {
+                this.renderer.destroy();
+                this.renderer = null;
+            }
+            this.container = null;
+            this.unsetMixedVideoFrameRenderCallback();
         }
     }
     setMixedVideoFrameRenderCallback() {
@@ -532,6 +578,9 @@ class TRTCLocalMediaTranscoder extends events_1.EventEmitter {
         };
         this.nativeLocalMediaTranscoder.setVideoFrameRenderCallback(renderCallback, this.pixelFormat);
     }
+    unsetMixedVideoFrameRenderCallback() {
+        this.nativeLocalMediaTranscoder.setVideoFrameRenderCallback(null, this.pixelFormat);
+    }
     setEventCallback() {
         const eventCallback = (eventName, ...params) => {
             // console.log('trtc:local-media-transcoder:event:', eventName, ...params);

package/liteav/Renderer/types.d.ts

@@ -1,5 +1,5 @@
 import { TRTCVideoFillMode } from "../trtc_define";
-export declare type TFrameData = {
+export type TFrameData = {
     data: Uint8Array | ArrayBuffer;
     width: number;
     height: number;
@@ -7,7 +7,7 @@ export declare type TFrameData = {
     rotation: number;
     isNeedRotate: boolean;
 };
-export declare type TCanvasImageSourceStyleOptions = {
+export type TCanvasImageSourceStyleOptions = {
     contentWidth: number;
     contentHeight: number;
     containerWidth: number;

package/liteav/trtc.d.ts

@@ -2,7 +2,7 @@
 import { EventEmitter } from 'events';
 import { VodPlayer } from './vod_player';
 import TRTCLocalMediaTranscoder from './LocalMediaTranscoder';
-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, TRTCRecordType } 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, TRTCSpeedTestParams, TRTCRecordType, TRTCDeviceInfo } from './trtc_define';
 export * from './trtc_define';
 export * from './trtc_code';
 export * from './vod_player';
@@ -1306,7 +1306,7 @@ declare class TRTCCloud extends EventEmitter {
      * }
      * @return {TRTCDeviceInfo[]} 摄像头管理器列表
      */
-    getCameraDevicesList(): any;
+    getCameraDevicesList(): TRTCDeviceInfo[];
     /**
      * 5.2 设置要使用的摄像头
      *
@@ -2210,7 +2210,7 @@ declare class TRTCCloud extends EventEmitter {
     /**
      * 创建本地多媒体合图实例
      *
-     * 注意：底层实现是单例，创建的多个 Javascript 共享同一个原型对象
+     * 注意：单例模式，多次调用返回的是同一个对象
      *
      * @param {Object} config - 配置参数
      * @param {TRTCVideoPixelFormat} config.pixelFormat - 视频数据的像素格式

package/liteav/trtc.js

@@ -251,9 +251,15 @@ class TRTCCloud extends events_1.EventEmitter {
      * 清理资源
      */
     destroy() {
-        this.firstVideoFrameList = [];
-        this.playAudioEffectIdList = [];
-        this.rtcCloud.destroy();
+        try {
+            this.firstVideoFrameList = [];
+            this.playAudioEffectIdList = [];
+            this.destroyLocalMediaTranscoder();
+            this.rtcCloud.destroy();
+        }
+        catch (e) {
+            console.warn(`trtc:destroy warning:`, e.message);
+        }
     }
     /////////////////////////////////////////////////////////////////////////////////
     //
@@ -2390,7 +2396,24 @@ class TRTCCloud extends events_1.EventEmitter {
      * @return {TRTCDeviceInfo[]} 摄像头管理器列表
      */
     getCameraDevicesList() {
-        return this.rtcCloud.getCameraDevicesList();
+        const deviceInfos = this.rtcCloud.getCameraDevicesList();
+        deviceInfos.forEach(item => {
+            try {
+                if (item.deviceProperties) {
+                    const properties = JSON.parse(item.deviceProperties);
+                    item.deviceProperties = properties;
+                }
+                else {
+                    // 虚拟摄像头没有 deviceProperties 字段
+                    item.deviceProperties = {};
+                }
+            }
+            catch (e) {
+                console.warn('trtc:camera device properties parse error.', JSON.stringify(item));
+                item.deviceProperties = {};
+            }
+        });
+        return deviceInfos;
     }
     /**
      * 5.2 设置要使用的摄像头
@@ -4039,7 +4062,7 @@ class TRTCCloud extends events_1.EventEmitter {
     /**
      * 创建本地多媒体合图实例
      *
-     * 注意：底层实现是单例，创建的多个 Javascript 共享同一个原型对象
+     * 注意：单例模式，多次调用返回的是同一个对象
      *
      * @param {Object} config - 配置参数
      * @param {TRTCVideoPixelFormat} config.pixelFormat - 视频数据的像素格式
@@ -4061,8 +4084,15 @@ class TRTCCloud extends events_1.EventEmitter {
      */
     destroyLocalMediaTranscoder() {
         if (this.localMediaTranscoder) {
-            this.localMediaTranscoder.destroy();
-            this.localMediaTranscoder = null;
+            try {
+                this.localMediaTranscoder.destroy();
+                this.localMediaTranscoder = null;
+                this.rtcCloud.destroyLocalMediaTranscoding();
+            }
+            catch (e) {
+                // 重复销毁会有报错提示
+                console.warn(`trtc:destroyLocalMediaTranscoder warning:`, e.message);
+            }
         }
     }
 }

package/liteav/trtc_define.d.ts

@@ -141,6 +141,8 @@ export declare class TRTCImageBuffer {
  * @param {TRTCImageBuffer}             thumbBGRA  - 缩略图内容
  * @param {TRTCImageBuffer}             iconBGRA   - 图标内容
  * @param {Boolean}                     isMinimizeWindow - 是否最小化窗口
+ * @param {Number}                      width - 屏幕/窗口宽，单位:像素
+ * @param {Number}                      height - 屏幕/窗口高，单位:像素
  *
  */
 export declare class TRTCScreenCaptureSourceInfo {
@@ -150,7 +152,9 @@ export declare class TRTCScreenCaptureSourceInfo {
     thumbBGRA: TRTCImageBuffer;
     iconBGRA: TRTCImageBuffer;
     isMinimizeWindow: boolean;
-    constructor(type?: TRTCScreenCaptureSourceType, sourceId?: string, sourceName?: string, thumbBGRA?: TRTCImageBuffer, iconBGRA?: TRTCImageBuffer, isMinimizeWindow?: boolean);
+    width: number;
+    height: number;
+    constructor(type?: TRTCScreenCaptureSourceType, sourceId?: string, sourceName?: string, thumbBGRA?: TRTCImageBuffer, iconBGRA?: TRTCImageBuffer, isMinimizeWindow?: boolean, width?: number, height?: number);
 }
 /**
  * 3.6 屏幕分享的进阶控制参数
@@ -179,12 +183,17 @@ export declare class TRTCScreenCaptureProperty {
  *
  * @param {String} deviceId   - 设备PID，字符编码格式是UTF-8
  * @param {String} deviceName - 设备名称，字符编码格式是UTF-8
+ * @param {Object} deviceProperties - 设备属性
+ *  - 只支持摄像头，包含摄像头支持的采集分辨率。
+ * @param {Array} deviceProperties.SupportedResolution - 支持的采集分辨率数组，每个数据是一个对象，包含 `width` 和 `height` 两个属性，属性值都是整形数值。
+ *  - 注意：虚拟摄像头该字段不存在。
  *
  */
 export declare class TRTCDeviceInfo {
     deviceId: string;
     deviceName: string;
-    constructor(deviceId?: string, deviceName?: string);
+    deviceProperties: Record<string, any>;
+    constructor(deviceId: string, deviceName: string, deviceProperties: {});
 }
 /**
  * 3.8 视频帧数据

package/liteav/trtc_define.js

@@ -552,16 +552,20 @@ exports.TRTCImageBuffer = TRTCImageBuffer;
  * @param {TRTCImageBuffer}             thumbBGRA  - 缩略图内容
  * @param {TRTCImageBuffer}             iconBGRA   - 图标内容
  * @param {Boolean}                     isMinimizeWindow - 是否最小化窗口
+ * @param {Number}                      width - 屏幕/窗口宽，单位:像素
+ * @param {Number}                      height - 屏幕/窗口高，单位:像素
  *
  */
 class TRTCScreenCaptureSourceInfo {
-    constructor(type = TRTCScreenCaptureSourceType.TRTCScreenCaptureSourceTypeUnknown, sourceId = '', sourceName = '', thumbBGRA = new TRTCImageBuffer(), iconBGRA = new TRTCImageBuffer(), isMinimizeWindow = false) {
+    constructor(type = TRTCScreenCaptureSourceType.TRTCScreenCaptureSourceTypeUnknown, sourceId = '', sourceName = '', thumbBGRA = new TRTCImageBuffer(), iconBGRA = new TRTCImageBuffer(), isMinimizeWindow = false, width = 0, height = 0) {
         this.type = type;
         this.sourceId = sourceId;
         this.sourceName = sourceName;
         this.thumbBGRA = thumbBGRA;
         this.iconBGRA = iconBGRA;
         this.isMinimizeWindow = isMinimizeWindow;
+        this.width = width;
+        this.height = height;
     }
 }
 exports.TRTCScreenCaptureSourceInfo = TRTCScreenCaptureSourceInfo;
@@ -595,12 +599,17 @@ exports.TRTCScreenCaptureProperty = TRTCScreenCaptureProperty;
  *
  * @param {String} deviceId   - 设备PID，字符编码格式是UTF-8
  * @param {String} deviceName - 设备名称，字符编码格式是UTF-8
+ * @param {Object} deviceProperties - 设备属性
+ *  - 只支持摄像头，包含摄像头支持的采集分辨率。
+ * @param {Array} deviceProperties.SupportedResolution - 支持的采集分辨率数组，每个数据是一个对象，包含 `width` 和 `height` 两个属性，属性值都是整形数值。
+ *  - 注意：虚拟摄像头该字段不存在。
  *
  */
 class TRTCDeviceInfo {
-    constructor(deviceId = '', deviceName = '') {
+    constructor(deviceId = '', deviceName = '', deviceProperties) {
         this.deviceId = deviceId;
         this.deviceName = deviceName;
+        this.deviceProperties = deviceProperties;
     }
 }
 exports.TRTCDeviceInfo = TRTCDeviceInfo;

package/package.json

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