trtc-sdk-v5 5.11.2-beta.4 → 5.11.2-beta.5

package/index.d.ts

@@ -340,8 +340,6 @@ export declare interface LocalVideoConfig {
     videoTrack?: MediaStreamTrack;
     avoidCropping?: boolean;
     rotation?: 0 | 90 | 180 | 270;
-
-    enableAutoSwitchWhenRecapturing?: boolean;
   };
 }
 export interface TurnServerOptions {
@@ -443,8 +441,6 @@ export declare interface LocalAudioConfig {
     echoCancellation?: boolean;
     autoGainControl?: boolean;
     noiseSuppression?: boolean;
-
-    enableAutoSwitchWhenRecapturing?: boolean;
   };
 }
 export declare interface UpdateLocalAudioConfig extends LocalAudioConfig {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trtc-sdk-v5",
-  "version": "5.11.2-beta.4",
+  "version": "5.11.2-beta.5",
   "description": "Tencent Cloud RTC SDK for Web",
   "main": "trtc.js",
   "types": "index.d.ts",

package/plugins/cdn-streaming/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rtc-plugin/cdn-streaming",
-  "version": "5.11.2-beta.4",
+  "version": "5.11.2-beta.5",
   "description": "TRTC Web SDK 5.x CDN streaming plugin",
   "main": "./cdn-streaming.esm.js",
   "module": "./cdn-streaming.esm.js",

package/plugins/cross-room/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rtc-plugin/cross-room",
-  "version": "5.11.2-beta.4",
+  "version": "5.11.2-beta.5",
   "description": "TRTC Web SDK 5.x Cross Room plugin",
   "main": "./cross-room.esm.js",
   "module": "./cross-room.esm.js",

package/plugins/custom-encryption/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rtc-plugin/custom-encryption",
-  "version": "5.11.2-beta.4",
+  "version": "5.11.2-beta.5",
   "main": "./custom-encryption.esm.js",
   "module": "./custom-encryption.esm.js",
   "types": "./custom-encryption.esm.d.ts"

package/plugins/device-detector/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rtc-plugin/device-detector",
-  "version": "5.11.2-beta.4",
+  "version": "5.11.2-beta.5",
   "description": "TRTC Web SDK 5.x device detector plugin",
   "main": "./device-detector.esm.js",
   "module": "./device-detector.esm.js",

package/plugins/small-stream-auto-switcher/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rtc-plugin/small-stream-auto-switcher",
-  "version": "5.11.2-beta.4",
+  "version": "5.11.2-beta.5",
   "description": "",
   "main": "./small-stream-auto-switcher.esm.js",
   "keywords": [],

package/plugins/video-decoder/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rtc-plugin/video-decoder",
-  "version": "5.11.2-beta.4",
+  "version": "5.11.2-beta.5",
   "description": "Video decoder plugin for TRTC",
   "main": "./video-decoder.esm.js",
   "module": "./video-decoder.esm.js",

package/plugins/video-effect/basic-beauty/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rtc-plugin/basic-beauty",
-  "version": "5.11.2-beta.4",
+  "version": "5.11.2-beta.5",
   "description": "TRTC Web SDK 5.x basic-beauty plugin",
   "main": "./basic-beauty.esm.js",
   "module": "./basic-beauty.esm.js",

package/plugins/video-effect/beauty/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rtc-plugin/beauty",
-  "version": "5.11.2-beta.4",
+  "version": "5.11.2-beta.5",
   "description": "TRTC Web SDK 5.x beauty plugin",
   "main": "./beauty.esm.js",
   "module": "./beauty.esm.js",

package/plugins/video-effect/video-mixer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rtc-plugin/video-mixer",
-  "version": "5.11.2-beta.4",
+  "version": "5.11.2-beta.5",
   "description": "TRTC Web SDK 5.x videoMixer plugin",
   "main": "./video-mixer.esm.js",
   "module": "./video-mixer.esm.js",

package/plugins/video-effect/video-mixer/video-mixer.esm.d.ts

@@ -1,23 +1,83 @@
+import {
+  screenProfileMap,
+  VideoProfile,
+  videoProfileMap,
+} from 'trtc-sdk-v5';
+
 export interface VideoMixerOptions {
-  camera?: LayerOption;
-  screen?: LayerOption;
-  container?: {
-    width: number,
-    height: number
-  }
+  view?: string | HTMLElement | null;
+  canvasInfo: {
+    canvasColor?: string; // 合流背景色
+    // 合流画布分辨率
+    width: number;
+    height: number;
+    frameRate?: number; // 合流帧率
+  };
+  camera?: CameraSource[];
+  screen?: ScreenSource[];
+  text?: TextSource[];
+  image?: ImageSource[];
+  video?: VideoSource[];
+}
+// 更新时画布配置变为可选
+export type UpdateVideoMixerOptions = {
+  view?: VideoMixerOptions['view'];
+  canvasInfo?: VideoMixerOptions['canvasInfo']
+  camera?: VideoMixerOptions['camera'];
+  screen?: VideoMixerOptions['screen'];
+  text?: VideoMixerOptions['text'];
+  image?: VideoMixerOptions['image'];
+  video?: VideoMixerOptions['video'];
+}
+
+export interface CameraSource {
+  // 参数与 startLocalVideo 对齐
+  id: string;
+  cameraId?: string;
+  videoTrack?: MediaStreamTrack;
+  profile?: keyof typeof videoProfileMap | VideoProfile;
+  layout: LayerOption;
+}
+export interface ScreenSource {
+  // 参数与 startScreenShare 对齐
+  id: string;
+  profile?: keyof typeof screenProfileMap | VideoProfile;
+  captureElement?: HTMLElement;
+  preferDisplaySurface?: 'current-tab' | 'tab' | 'window' | 'monitor';
+  layout: LayerOption;
+}
+export interface TextSource {
+  id: string;
+  content: string;
+  font?: string;
+  color?: string | CanvasGradient | CanvasPattern;
+  layout: LayerOption;
+}
+export interface ImageSource {
+  id: string;
+  url: string;
+  layout: LayerOption;
+}
+export interface VideoSource {
+  id: string;
+  url: string;
+  layout: LayerOption;
 }
 
 export interface LayerOption {
-  x?: number;
-  y?: number;
-  width?: number;
-  height?: number;
-  // hidden?: boolean
+  x: number;
+  y: number;
+  width: number;
+  height: number;
+  zIndex: number;
+  fillMode?: 'contain' | 'cover' | 'fill';
+  mirror?: boolean;
+  rotation?: 0 | 90 | 180 | 270;
 }
 
 export declare class VideoMixer {
-  start(options: VideoMixerOptions): void;
-  update(options: VideoMixerOptions): void;
+  start(options: VideoMixerOptions): Promise<MediaStreamVideoTrack>;
+  update(options: UpdateVideoMixerOptions): Promise<MediaStreamVideoTrack>;
   stop(): void;
 }