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

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

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: {
@@ -455,13 +472,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);
     }
     /**
      * 停止摄像头采集

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/package.json

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