@vkontakte/calls-sdk 2.8.6-dev.77dd3c9d.0 → 2.8.6-dev.7a7707c0.0

package/classes/Conversation.d.ts

@@ -19,7 +19,7 @@ import MediaModifiers from '../types/MediaModifiers';
 import { IVideoDimentions } from '../types/MediaSettings';
 import { IAddMovieParams, IUpdateMovieData } from '../types/MovieShare';
 import MuteStates from '../types/MuteStates';
-import { CompositeUserId, IGetParticipantsParameters, OkUserId, ParticipantId } from '../types/Participant';
+import { CompositeUserId, IGetParticipantsParameters, OkUserId, ParticipantId, ParticipantStateData } from '../types/Participant';
 import { ParticipantLayout } from '../types/ParticipantLayout';
 import { ParticipantListChunkParameters } from '../types/ParticipantListChunk';
 import ParticipantPriority from '../types/ParticipantPriority';
@@ -189,7 +189,7 @@ export default class Conversation extends EventEmitter {
      * @deprecated Use updateDisplayLayout instead
      */
     changePriorities(priorities: ParticipantPriority[]): Promise<void>;
-    changeParticipantState(state: Record<string, string>, compositeUserId?: CompositeUserId): Promise<void>;
+    changeParticipantState(state: ParticipantStateData, compositeUserId?: CompositeUserId): Promise<void>;
     putHandsDown(): Promise<void>;
     requestKeyFrame(participantStreamDescription: ParticipantStreamDescription): Promise<void | SignalingMessage>;
     requestTestMode(consumerCommand: string, producerCommand: string): Promise<void>;
@@ -249,7 +249,7 @@ export default class Conversation extends EventEmitter {
     customData(data: JSONObject, participantId?: ParticipantId | null): Promise<void>;
     createJoinLink(): Promise<string>;
     removeJoinLink(): Promise<undefined>;
-    addMovie({ movieId, gain, metadata }: IAddMovieParams): Promise<{
+    addMovie({ movieId, gain, metadata, lang }: IAddMovieParams): Promise<{
         movieId: number;
         streamType: string;
     }>;
@@ -272,7 +272,7 @@ export default class Conversation extends EventEmitter {
     setLocalResolution({ video, effect }: {
         video: IVideoDimentions;
         effect?: IVideoDimentions;
-    }): Promise<void | undefined>;
+    }): Promise<void>;
     videoEffect(effect: IEffect | null): Promise<void | undefined>;
     audioEffect(effects: string[] | null, isPreset?: boolean): Promise<void | undefined>;
     _convertExternalIdsToServerExternalIds(externalIds: ExternalId[]): SignalingMessage.ExternalId[];

package/classes/MediaSource.d.ts

@@ -5,6 +5,7 @@ import MediaSettings, { IVideoDimentions } from '../types/MediaSettings';
 import { ScreenCaptureSettings } from '../types/ScreenCaptureSettings';
 export declare const enum MediaSourceEvent {
     SOURCE_CHANGED = "SOURCE_CHANGED",
+    SOURCE_READY = "SOURCE_READY",
     TRACK_REPLACED = "TRACK_REPLACED",
     SCREEN_STATUS = "SCREEN_STATUS",
     ANIMOJI_STATUS = "ANIMOJI_STATUS"
@@ -22,6 +23,13 @@ interface AudioEffectParams {
     effects: string[];
     isPreset?: boolean;
 }
+/**
+ * тип источника (для сервера)
+ */
+export declare enum MediaSourceType {
+    CAMERA = 1,
+    SCREEN = 2
+}
 export declare class MediaSource extends EventEmitter {
     /** Стрим с камеры и микрофона пользователя */
     protected _stream: MediaStream | null;
@@ -90,6 +98,7 @@ export declare class MediaSource extends EventEmitter {
         video: IVideoDimentions;
         effect?: IVideoDimentions;
     }): Promise<void>;
+    getCameraVideoTrack(): MediaStreamTrack | null;
     updateNoiseSuppression(): Promise<void>;
     videoEffect(effect: IEffect | null): Promise<void>;
     audioEffect(audioEffectParams: AudioEffectParams | null): Promise<void>;

package/classes/ProducerCommandSerializationService.d.ts

@@ -5,6 +5,7 @@ import { EnableVideoSuspend } from '../types/EnableVideoSuspend';
 import { EnableVideoSuspendSuggest } from '../types/EnableVideoSuspendSuggest';
 import SignalingMessage from '../types/SignalingMessage';
 import { PerfStatReport } from '../types/PerfStatReporter';
+import { ChangeSimulcast } from '../types/ChangeSimulcast';
 import { SharingStatReport } from './screenshare/SharingStatReport';
 import { ParticipantIdRegistry } from './ParticipantIdRegistry';
 export declare class ProducerCommandSerializationService {
@@ -21,6 +22,7 @@ export declare class ProducerCommandSerializationService {
     serializeNetworkStatReport(sequenceNumber: number, report: NetworkStatReport): ArrayBuffer;
     serializeEnableVideoSuspend(sequenceNumber: number, params: EnableVideoSuspend): ArrayBuffer;
     serializeEnableVideoSuspendSuggest(sequenceNumber: number, params: EnableVideoSuspendSuggest): ArrayBuffer;
+    serializeChangeSimulcast(sequenceNumber: number, params: ChangeSimulcast): ArrayBuffer;
     deserializeCommandResponse(data: BufferSource | Blob): Promise<SignalingMessage | undefined>;
     private deserializeUpdateDisplayLayoutResponse;
     private deserializeReportPerfStatResponse;

package/classes/transport/ServerTransport.d.ts

@@ -35,6 +35,7 @@ export default class ServerTransport extends BaseTransport {
     private _rtpReceiversByStreamId;
     private _producerSessionId;
     private _newAudioShareTrack;
+    private _simulcastInfo;
     constructor(signaling: BaseSignaling, mediaSource: MediaSource, serverSettings: ServerSettings);
     updateStatisticsInterval(): void;
     open(observer?: boolean): void;
@@ -44,6 +45,7 @@ export default class ServerTransport extends BaseTransport {
     allowRestart(): void;
     updateSettings(settings: ServerSettings): void;
     setAnimojiTransport(receiver: AnimojiReceiver, sender: AnimojiSender): void;
+    onCameraResolutionChanged(): Promise<void>;
     private _createPerfStatsReporter;
     private _closeConnection;
     private static _closeDataChannel;
@@ -72,6 +74,8 @@ export default class ServerTransport extends BaseTransport {
     private _detectStaleTracks;
     private _allocateConsumer;
     private _processOffer;
+    private _findFirstSimTransceiver;
+    private _setupSimulcastTransceiver;
     private _acceptProducer;
     private _handleTracks;
     private _onSignalingNotification;
@@ -82,4 +86,5 @@ export default class ServerTransport extends BaseTransport {
     private _onConnectionStateChange;
     private _onReplacedTrack;
     getStreamWaitingTimeMs(streamId: string, targetRtpTimestamp: number): number;
+    private _changeSimulcastInfo;
 }

package/classes/transport/Transport.d.ts

@@ -66,6 +66,7 @@ export declare class Transport extends EventEmitter {
     getStates(): Record<string, TransportState>;
     setAnimojiSvg(participantId: ParticipantId, svgData: AnimojiSvgData): void;
     setAnimojiFill(fill: RGBTuple | string): void;
+    onCameraResolutionChanged(): Promise<void>;
     private _setStates;
     private _setLocalState;
     private _onSignalingNotification;

package/default/Signaling.d.ts

@@ -15,11 +15,12 @@ import MediaModifiers from '../types/MediaModifiers';
 import MediaSettings from '../types/MediaSettings';
 import { IAddMovieParams, IUpdateMovieData } from '../types/MovieShare';
 import MuteStates from '../types/MuteStates';
-import { CompositeUserId, ParticipantId } from '../types/Participant';
+import { CompositeUserId, ParticipantId, ParticipantStateData } from '../types/Participant';
 import ParticipantLayout, { RequestKeyFrame, StopStream } from '../types/ParticipantLayout';
 import { ParticipantListChunkParameters } from '../types/ParticipantListChunk';
 import { StreamDescriptionString } from '../types/ParticipantStreamDescription';
 import { PerfStatReport } from '../types/PerfStatReporter';
+import { ChangeSimulcast } from '../types/ChangeSimulcast';
 import SignalingMessage, { GetParticipantsSignalingResponse, GetRoomsSignalingResponse, SignalingSuccessResponse } from '../types/SignalingMessage';
 import { IPublishStreamData, IRecordConfData, IStartStreamData, IStopStreamData } from '../types/Streams';
 export default class Signaling extends BaseSignaling {
@@ -85,7 +86,7 @@ export default class Signaling extends BaseSignaling {
     sendSdp(participantId: ParticipantId, sdp: RTCSessionDescriptionInit, extraPayload?: Record<string, any>): Promise<SignalingMessage>;
     acceptCall(mediaSettings: MediaSettings): Promise<SignalingMessage>;
     changeMediaSettings(mediaSettings: MediaSettings): Promise<SignalingMessage>;
-    changeParticipantState(state: Record<string, string>, compositeUserId?: CompositeUserId): Promise<SignalingMessage>;
+    changeParticipantState(state: ParticipantStateData, compositeUserId?: CompositeUserId): Promise<SignalingMessage>;
     putHandsDown(): Promise<SignalingMessage>;
     addParticipant(participantIds: CompositeUserId[], params?: AddParticipantParams): Promise<SignalingMessage>;
     removeParticipant(participantId: CompositeUserId, ban?: boolean): Promise<SignalingMessage>;
@@ -132,6 +133,7 @@ export default class Signaling extends BaseSignaling {
     updateMediaModifiers(mediaModifiers: MediaModifiers): Promise<SignalingMessage>;
     enableVideoSuspend(enabled: boolean): Promise<SignalingMessage>;
     enableVideoSuspendSuggest(enabled: boolean): Promise<SignalingMessage>;
+    changeSimulcast(changeSimulcast: ChangeSimulcast): Promise<SignalingMessage>;
     changeOptions(changes: {
         [key in ConversationOption]?: boolean;
     }): Promise<SignalingMessage>;

package/enums/SignalingCommandType.d.ts

@@ -55,6 +55,7 @@ declare enum SignalingCommandType {
     GET_HAND_QUEUE = "get-hand-queue",
     ENABLE_VIDEO_SUSPEND = "enable-video-suspend",
     ENABLE_VIDEO_SUSPEND_SUGGEST = "enable-video-suspend-suggest",
-    PUT_HANDS_DOWN = "put-hands-down"
+    PUT_HANDS_DOWN = "put-hands-down",
+    CHANGE_SIMULCAST = "change-simulcast"
 }
 export default SignalingCommandType;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vkontakte/calls-sdk",
-  "version": "2.8.6-dev.77dd3c9d.0",
+  "version": "2.8.6-dev.7a7707c0.0",
   "author": "vk.com",
   "description": "Library for video calls based on the vk.com platform",
   "homepage": "https://vk.com",
@@ -16,7 +16,7 @@
   "dependencies": {
     "@vkontakte/calls-audio-effects": "1.2.8",
     "@vkontakte/calls-video-effects": "2.2.3-beta.5",
-    "@vkontakte/calls-vmoji": "1.0.10-beta.16",
+    "@vkontakte/calls-vmoji": "1.0.10-beta.17",
     "@vkontakte/libvpx": "2.0.9",
     "bit-buffer": "0.2.5",
     "messagepack": "1.1.12",

package/static/Params.d.ts

@@ -843,6 +843,12 @@ export type ParamsObject = {
     switchVideoAtBadNetwork: boolean;
     /** включает деградацию фпс для видео с камеры при низком фпс с включенными вирт фонами */
     enableVideoEffectsFpsDegradation: boolean;
+    /**
+     * Включить поддержку simulcast на отправке
+     *
+     * _По умолчанию: `false`_
+     */
+    simulcast: boolean;
 };
 export default abstract class Params {
     private static _params;
@@ -970,6 +976,8 @@ export default abstract class Params {
     static getScreenFrameRate(fastScreenShare: boolean): number;
     static get switchVideoAtBadNetwork(): boolean;
     static get enableVideoEffectsFpsDegradation(): boolean;
+    static get simulcast(): boolean;
+    static set simulcast(value: boolean);
     static toJSON(): {
         apiKey: string;
         apiEnv: string;

package/static/SimulcastInfo.d.ts

@@ -0,0 +1,13 @@
+import { type SimulcastInfo as ISimulcastInfo } from '../types/SimulcastInfo';
+import type { VideoBitrateSettings } from '../types/VideoSettings';
+export declare const SIMULCAST_DEFAULT: {
+    HEIGHT: number;
+    WIDTH: number;
+    BITRATE: number;
+};
+export declare const SIMULCAST_SCALABILITY_MODE = "L1T2";
+export declare const MAP_RID_TO_SCALE_RESOLUTION_DOWN_BY: Record<string, number>;
+export declare function isEqualSimulcastInfo(si1: ISimulcastInfo | null, si2: ISimulcastInfo | null): boolean;
+export declare function findBitrateAsc(maxDimension: number, bitrates: VideoBitrateSettings[]): number;
+export declare function calculateSimulcastInfo(width?: number, height?: number, bitrates?: VideoBitrateSettings[]): ISimulcastInfo;
+export declare function findScaleResolutionDownBy(rid: string): number;

package/static/Utils.d.ts

@@ -61,7 +61,7 @@ declare namespace Utils {
         [key in T]?: K;
     }, obj2: {
         [key in T]?: K;
-    }): boolean;
+    }, deep?: boolean): boolean;
     function isArraysEquals<T>(arr1: T[], arr2: T[]): boolean;
     function isEmptyObject(obj: object): boolean;
     /**
@@ -74,5 +74,6 @@ declare namespace Utils {
     function objectReduce<R, T extends Object>(obj: T, callback: (acc: R, value: T[keyof T], key: keyof T) => R, initialValue: R): R;
     const setImmediate: (fn: VoidFunction) => VoidFunction;
     function isObject(obj: unknown): obj is object;
+    function patchSimulcastAnswerSdp(sdp: string, trans: RTCRtpTransceiver, width: number, height: number): string;
 }
 export default Utils;

package/static/WebRTCUtils.d.ts

@@ -127,6 +127,7 @@ declare namespace WebRTCUtils {
     function isBrokenH264Decoder(): boolean;
     /**
      * В некоторых браузерах VP9 encoder сломан
+     * В симулкасте вп9 енкодер ведет себя некорректно
      */
     function isBrokenVP9Encoder(): boolean;
     /**
@@ -142,6 +143,10 @@ declare namespace WebRTCUtils {
      * Может ли браузер делать H264 приоритетным
      */
     function canPreferH264(): boolean;
+    /**
+     * Некоторые браузеры (Firefox, Safari) некорректно поддерживают симулкаст
+     */
+    function isSimulcastSupportedByBrowser(): boolean;
     /**
      * Имя операционной системы
      */

package/types/ChangeSimulcast.d.ts

@@ -0,0 +1,6 @@
+import { MediaSourceType } from '../classes/MediaSource';
+import { SimulcastInfo } from './SimulcastInfo';
+export type ChangeSimulcast = {
+    mediaSource: MediaSourceType;
+    simulcastInfo: SimulcastInfo;
+};

package/types/Participant.d.ts

@@ -86,3 +86,12 @@ export interface Participant {
 export interface IGetParticipantsParameters {
     externalIds: ExternalId[];
 }
+export type ParticipantStateDataKey = 'hand' | 'drat';
+export declare enum ParticipantStateDataValue {
+    OFF = "0",
+    ON = "1"
+}
+/**
+ * Список состояний в виде ключ-значение. Максимальная длина ключей и значений - 5 символов. Пустые значения будут пропущены
+ */
+export type ParticipantStateData = Record<ParticipantStateDataKey, ParticipantStateDataValue>;

package/types/PerfStatReporter.d.ts

@@ -45,5 +45,6 @@ export interface ICallStatLog extends Pick<CallStatReport, 'call_topology' | 'na
     concealment_audio_avg_size?: number;
     video_loss?: number;
     audio_loss?: number;
+    hardware_concurrency?: number;
     [k: string]: string | number | undefined;
 }

package/types/SimulcastInfo.d.ts

@@ -0,0 +1,10 @@
+export type SimulcastStreamInfo = {
+    rid: string;
+    width: number;
+    height: number;
+    fps: number;
+    bitrate: number;
+};
+export type SimulcastInfo = {
+    streams: SimulcastStreamInfo[];
+};

package/types/Statistics.d.ts

@@ -24,7 +24,15 @@ export interface ILocalIceCandidateStat extends IRemoteIceCandidateStat {
     relayProtocol: string;
     networkType: RTCNetworkType;
 }
-export type StatRtp = {
+interface StatRtpOutboundVideo {
+    frameHeight?: number;
+    frameWidth?: number;
+    rid?: string;
+    framesSent?: number;
+    framesPerSecond?: number;
+    targetBitrate?: number;
+}
+export interface StatRtp extends StatRtpOutboundVideo {
     ssrc: number;
     type: string;
     kind: string;
@@ -45,8 +53,6 @@ export type StatRtp = {
     packetLoss?: number;
     clockRate?: number;
     mimeType?: string;
-    frameHeight?: number;
-    frameWidth?: number;
     framesDecoded?: number;
     framesReceived?: number;
     framesDropped?: number;
@@ -63,7 +69,7 @@ export type StatRtp = {
     totalFreezesDurationDelta?: number;
     freezeCount: number;
     freezeCountDelta?: number;
-};
+}
 export type StatItem = {
     timestamp: number;
     transport: StatTransport;
@@ -87,3 +93,4 @@ export type StatResult = {
         rtps: StatRtp[];
     };
 };
+export {};

package/types/VideoSettings.d.ts

@@ -25,6 +25,10 @@ export type VideoSettings = {
      * https://www.w3.org/TR/webrtc-svc/
      */
     scalabilityMode: string;
+    /**
+     * Таблица с битрейтами в зависимости от разрешения
+     */
+    bitrates?: Record<'generic' | string, VideoBitrateSettings[]>;
 };
 export default VideoSettings;
 export declare function compareVideoSettings(vs1: VideoSettings | null, vs2: VideoSettings | null): boolean;
@@ -38,3 +42,11 @@ export declare enum VideoScalability {
     L1T2 = "L1T2",
     L1T3 = "L1T3"
 }
+/**
+ * Настройка битрейта под конкретное разрешение
+ * @hidden
+ */
+export type VideoBitrateSettings = {
+    dimension: number;
+    bitrate: number;
+};