trtc-electron-sdk 12.2.115-beta.11 → 12.2.115-beta.12

package/liteav/extensions/MediaMixingManager/MediaMixingManager.d.ts

@@ -224,7 +224,7 @@ export declare class TRTCMediaMixingManager implements ITRTCMediaMixingManager {
     /**
      * 添加本地混流媒体源
      * @param mediaSource {TRTCMediaSource} - 媒体源信息
-     * @returns {Promise<Rect>}
+     * @returns {Promise<void>}
      */
     addMediaSource(mediaSource: TRTCMediaSource): Promise<void>;
     /**
@@ -248,7 +248,7 @@ export declare class TRTCMediaMixingManager implements ITRTCMediaMixingManager {
     /**
      * 设置手机投屏参数
      * @param phoneMirrorSourceId {string} - 手机投屏媒体源 ID
-     * @param param {TRTCPhoneMirrorParam} - 手机投屏参数，目前只支持优先投屏
+     * @param param {TRTCPhoneMirrorParam} - 手机投屏参数
      */
     setPhoneMirrorParam(phoneMirrorSourceId: string, param: TRTCPhoneMirrorParam): void;
     /**
@@ -411,6 +411,7 @@ export declare class TRTCMediaMixingManager implements ITRTCMediaMixingManager {
     private onPhoneMirrorSourceChanged;
     private onMediaServerState;
     private onMediaMixingServerLost;
+    private onCallExperimentalAPIFinish;
     private recoverMediaMixingServer;
     startCameraDeviceTest(windowID: number | Uint8Array, rect?: Rect): Promise<number>;
     stopCameraDeviceTest(): Promise<number>;

package/liteav/extensions/MediaMixingManager/MediaMixingManager.js

@@ -462,7 +462,7 @@ class TRTCMediaMixingManager {
     /**
      * 添加本地混流媒体源
      * @param mediaSource {TRTCMediaSource} - 媒体源信息
-     * @returns {Promise<Rect>}
+     * @returns {Promise<void>}
      */
     addMediaSource(mediaSource) {
         logger_1.default.log(`${this.logPrefix}addMediaSource:`, mediaSource);
@@ -553,11 +553,21 @@ class TRTCMediaMixingManager {
      */
     setCameraCaptureParam(cameraID, params) {
         this.nodeMediaMixingPlugin.setCameraCaptureParam(cameraID, params);
+        if (params.colorRange !== undefined || params.colorSpace !== undefined) {
+            this.nodeMediaMixingPlugin.callExperimentalAPI(JSON.stringify({
+                "api": "setCameraCaptureParamEx",
+                "params": {
+                    "cameraId": cameraID,
+                    "colorRange": params.colorRange || trtc_define_1.TRTCVideoColorRange.TRTCVideoColorRange_Auto,
+                    "colorSpace": params.colorSpace || trtc_define_1.TRTCVideoColorSpace.TRTCVideoColorSpace_Auto,
+                }
+            }));
+        }
     }
     /**
      * 设置手机投屏参数
      * @param phoneMirrorSourceId {string} - 手机投屏媒体源 ID
-     * @param param {TRTCPhoneMirrorParam} - 手机投屏参数，目前只支持优先投屏
+     * @param param {TRTCPhoneMirrorParam} - 手机投屏参数
      */
     setPhoneMirrorParam(phoneMirrorSourceId, param) {
         this.nodeMediaMixingPlugin.setPhoneMirrorParam(phoneMirrorSourceId, param);
@@ -605,7 +615,20 @@ class TRTCMediaMixingManager {
                 width: this.mixingVideoWidth,
                 height: this.mixingVideoHeight
             });
-            return yield this.nodeMediaMixingPlugin.updatePublishParams(params);
+            const result = yield this.nodeMediaMixingPlugin.updatePublishParams(params);
+            if (params.videoEncoderParams.colorRange !== undefined
+                || params.videoEncoderParams.colorSpace !== undefined
+                || params.videoEncoderParams.complexity !== undefined) {
+                this.nodeMediaMixingPlugin.callExperimentalAPI(JSON.stringify({
+                    "api": "setVideoEncodeParamEx",
+                    "params": {
+                        "colorRange": params.videoEncoderParams.colorRange || trtc_define_1.TRTCVideoColorRange.TRTCVideoColorRange_Auto,
+                        "colorSpace": params.videoEncoderParams.colorSpace || trtc_define_1.TRTCVideoColorSpace.TRTCVideoColorSpace_Auto,
+                        "complexity": params.videoEncoderParams.complexity || trtc_define_1.TRTCVideoEncodeComplexity.TRTCVideoEncodeComplexity_Fastest,
+                    }
+                }));
+            }
+            return result;
         });
     }
     /**
@@ -997,6 +1020,9 @@ class TRTCMediaMixingManager {
             case "onMediaServerState":
                 this.onMediaServerState(data);
                 break;
+            case "onCallExperimentalAPIFinish":
+                this.onCallExperimentalAPIFinish(data);
+                break;
             default:
                 logger_1.default.warn(`${this.logPrefix} event not supported:`, key, data);
                 break;
@@ -1102,6 +1128,9 @@ class TRTCMediaMixingManager {
             }
         });
     }
+    onCallExperimentalAPIFinish(data) {
+        logger_1.default.log(`${this.logPrefix}onCallExperimentalAPIFinish:`, data);
+    }
     recoverMediaMixingServer() {
         var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {

package/liteav/trtc_define.d.ts

@@ -291,7 +291,6 @@ export declare enum TRTCVideoColorSpace {
     TRTCVideoColorSpace_BT709 = 2
 }
 export declare enum TRTCVideoEncodeComplexity {
-    TRTCVideoEncodeComplexity_Auto = -1,
     TRTCVideoEncodeComplexity_Fastest = 0,
     TRTCVideoEncodeComplexity_Fast = 1,
     TRTCVideoEncodeComplexity_Medium = 2,
@@ -305,8 +304,8 @@ export declare type TRTCCameraCaptureParams = {
     width: number;
     /** 采集图像高度 */
     height: number;
-    colorRange?: TRTCVideoColorRange;
     colorSpace?: TRTCVideoColorSpace;
+    colorRange?: TRTCVideoColorRange;
 };
 export declare enum TRTCWaterMarkSrcType {
     TRTCWaterMarkSrcTypeFile = 0,
@@ -388,6 +387,9 @@ export declare class TRTCParams {
  * @param {Boolean}                 enableAdjustRes - 【字段含义】是否允许动态调整分辨率（开启后会对云端录制产生影响）<br>
  *                                                    【推荐取值】该功能适用于不需要云端录制的场景，开启后 SDK 会根据当前网络情况，智能选择出一个合适的分辨率，避免出现“大分辨率+小码率”的低效编码模式。<br>
  *                                                    【特别说明】默认值：关闭。如有云端录制的需求，请不要开启此功能，因为如果视频分辨率发生变化后，云端录制出的 MP4 在普通的播放器上无法正常播放。<br>
+ * @param {TRTCVideoColorSpace}     [colorSpace]    - 编码色彩空间
+ * @param {TRTCVideoColorRange}     [colorRange]    - 编码色彩范围
+ * @param {TRTCVideoEncodeComplexity} [complexity]  - 编码复杂度
  */
 export declare class TRTCVideoEncParam {
     videoResolution: TRTCVideoResolution;

package/liteav/trtc_define.js

@@ -779,21 +779,63 @@ var TRTCCameraCaptureMode;
     TRTCCameraCaptureMode[TRTCCameraCaptureMode["TRTCCameraResolutionStrategyHighQuality"] = 2] = "TRTCCameraResolutionStrategyHighQuality";
     TRTCCameraCaptureMode[TRTCCameraCaptureMode["TRTCCameraCaptureManual"] = 3] = "TRTCCameraCaptureManual";
 })(TRTCCameraCaptureMode = exports.TRTCCameraCaptureMode || (exports.TRTCCameraCaptureMode = {}));
+/**
+ * 视频颜色范围
+ *
+ * @enum {Number}
+ */
+const TRTCVideoColorRange_HACK_JSDOC = {
+    /** SDK 内部自动渲染合适范围 */
+    TRTCVideoColorRange_Auto: 0,
+    /** 限制范围 16-235 */
+    TRTCVideoColorRange_Limited: 1,
+    /** 完整范围 0-255 */
+    TRTCVideoColorRange_Full: 2
+};
 var TRTCVideoColorRange;
 (function (TRTCVideoColorRange) {
     TRTCVideoColorRange[TRTCVideoColorRange["TRTCVideoColorRange_Auto"] = 0] = "TRTCVideoColorRange_Auto";
     TRTCVideoColorRange[TRTCVideoColorRange["TRTCVideoColorRange_Limited"] = 1] = "TRTCVideoColorRange_Limited";
     TRTCVideoColorRange[TRTCVideoColorRange["TRTCVideoColorRange_Full"] = 2] = "TRTCVideoColorRange_Full";
 })(TRTCVideoColorRange = exports.TRTCVideoColorRange || (exports.TRTCVideoColorRange = {}));
+/**
+ * 视频颜色空间
+ *
+ * @enum {Number}
+ */
+const TRTCVideoColorSpace_HACK_JSDOC = {
+    /** SDK 内部自动渲染合适颜色空间 */
+    TRTCVideoColorSpace_Auto: 0,
+    /** BT.601 */
+    TRTCVideoColorSpace_BT601: 1,
+    /** BT.709 */
+    TRTCVideoColorSpace_BT709: 2,
+};
 var TRTCVideoColorSpace;
 (function (TRTCVideoColorSpace) {
     TRTCVideoColorSpace[TRTCVideoColorSpace["TRTCVideoColorSpace_Auto"] = 0] = "TRTCVideoColorSpace_Auto";
     TRTCVideoColorSpace[TRTCVideoColorSpace["TRTCVideoColorSpace_BT601"] = 1] = "TRTCVideoColorSpace_BT601";
     TRTCVideoColorSpace[TRTCVideoColorSpace["TRTCVideoColorSpace_BT709"] = 2] = "TRTCVideoColorSpace_BT709";
 })(TRTCVideoColorSpace = exports.TRTCVideoColorSpace || (exports.TRTCVideoColorSpace = {}));
+/**
+ * 视频编码复杂度
+ *
+ * @enum {Number}
+ */
+const TRTCVideoEncodeComplexity_Hack_JSDOC = {
+    /** 最快 */
+    TRTCVideoEncodeComplexity_Fastest: 0,
+    /** 快 */
+    TRTCVideoEncodeComplexity_Fast: 1,
+    /** 中 */
+    TRTCVideoEncodeComplexity_Medium: 2,
+    /** 慢 */
+    TRTCVideoEncodeComplexity_Slow: 3,
+    /** 最慢 */
+    TRTCVideoEncodeComplexity_Slowest: 4,
+};
 var TRTCVideoEncodeComplexity;
 (function (TRTCVideoEncodeComplexity) {
-    TRTCVideoEncodeComplexity[TRTCVideoEncodeComplexity["TRTCVideoEncodeComplexity_Auto"] = -1] = "TRTCVideoEncodeComplexity_Auto";
     TRTCVideoEncodeComplexity[TRTCVideoEncodeComplexity["TRTCVideoEncodeComplexity_Fastest"] = 0] = "TRTCVideoEncodeComplexity_Fastest";
     TRTCVideoEncodeComplexity[TRTCVideoEncodeComplexity["TRTCVideoEncodeComplexity_Fast"] = 1] = "TRTCVideoEncodeComplexity_Fast";
     TRTCVideoEncodeComplexity[TRTCVideoEncodeComplexity["TRTCVideoEncodeComplexity_Medium"] = 2] = "TRTCVideoEncodeComplexity_Medium";
@@ -809,6 +851,8 @@ var TRTCVideoEncodeComplexity;
  * @property {TRTCCameraCaptureMode} mode - 摄像头采集偏好
  * @property {Number} width - 采集图像宽度
  * @property {Number} height - 采集图像高度
+ * @property {TRTCVideoColorSpace} [colorSpace] - 可选，颜色空间
+ * @property {TRTCVideoColorRange} [colorRange] - 可选，颜色范围
  */
 const TRTCCameraCaptureParams_HACK_JSDOC = null;
 /**
@@ -913,6 +957,9 @@ exports.TRTCParams = TRTCParams;
  * @param {Boolean}                 enableAdjustRes - 【字段含义】是否允许动态调整分辨率（开启后会对云端录制产生影响）<br>
  *                                                    【推荐取值】该功能适用于不需要云端录制的场景，开启后 SDK 会根据当前网络情况，智能选择出一个合适的分辨率，避免出现“大分辨率+小码率”的低效编码模式。<br>
  *                                                    【特别说明】默认值：关闭。如有云端录制的需求，请不要开启此功能，因为如果视频分辨率发生变化后，云端录制出的 MP4 在普通的播放器上无法正常播放。<br>
+ * @param {TRTCVideoColorSpace}     [colorSpace]    - 编码色彩空间
+ * @param {TRTCVideoColorRange}     [colorRange]    - 编码色彩范围
+ * @param {TRTCVideoEncodeComplexity} [complexity]  - 编码复杂度
  */
 class TRTCVideoEncParam {
     constructor(videoResolution = TRTCVideoResolution.TRTCVideoResolution_640_360, resMode = TRTCVideoResolutionMode.TRTCVideoResolutionModeLandscape, videoFps = 15, videoBitrate = 550, minVideoBitrate = 0, enableAdjustRes = false) {
@@ -924,7 +971,7 @@ class TRTCVideoEncParam {
         this.enableAdjustRes = enableAdjustRes;
         this.colorRange = TRTCVideoColorRange.TRTCVideoColorRange_Auto;
         this.colorSpace = TRTCVideoColorSpace.TRTCVideoColorSpace_Auto;
-        this.complexity = TRTCVideoEncodeComplexity.TRTCVideoEncodeComplexity_Auto;
+        this.complexity = TRTCVideoEncodeComplexity.TRTCVideoEncodeComplexity_Fastest;
     }
 }
 exports.TRTCVideoEncParam = TRTCVideoEncParam;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trtc-electron-sdk",
-  "version": "12.2.115-beta.11",
+  "version": "12.2.115-beta.12",
   "description": "trtc electron sdk",
   "main": "./liteav/index.js",
   "types": "./liteav/index.d.ts",