@vkontakte/calls-sdk 2.6.3-dev.df409e1.0 → 2.6.3-dev.e77d93a.0

package/classes/Conversation.d.ts

@@ -24,6 +24,7 @@ import { ParticipantLayout } from '../types/ParticipantLayout';
 import { ParticipantListChunkParameters } from '../types/ParticipantListChunk';
 import ParticipantPriority from '../types/ParticipantPriority';
 import { ParticipantStreamDescription } from '../types/ParticipantStreamDescription';
+import { ScreenCaptureSettings } from '../types/ScreenCaptureSettings';
 import SignalingMessage, { RecordInfo } from '../types/SignalingMessage';
 import { WaitingHallResponse } from '../types/WaitingHall';
 import EventEmitter from './EventEmitter';
@@ -216,7 +217,16 @@ export default class Conversation extends EventEmitter {
     private _onAddParticipant;
     private _onRemoveParticipant;
     changeDevice(kind: MediaDeviceKind): Promise<void>;
-    toggleScreenCapturing(screenEnabled: boolean, audioShareEnabled: boolean): Promise<void>;
+    toggleScreenCapturing(settings: ScreenCaptureSettings): Promise<void>;
+    disableScreenCapturing(): Promise<void>;
+    toggleAnimojiCapturing(state: boolean): void;
+    setAnimojiSvg(
+    /** svg в незашифрованном (string) или зашифрованном (ArrayBuffer) виде */
+    svg: string | ArrayBuffer, 
+    /** participantId внешнего участника звонка, не требуется для текущего участника (текущего пользователя клиента) */
+    participantId?: ParticipantId | null, 
+    /** ключ расшифровки svg внешнего пользователя или кастомный ключ, не требуется для незашифрованных svg */
+    decryptionKey?: string | null): void;
     setVideoStream(stream: MediaStream, isScreen?: boolean): Promise<void>;
     setAudioStream(stream: MediaStream): Promise<void>;
     toggleLocalVideo(enabled: boolean): Promise<void>;
@@ -334,6 +344,12 @@ export default class Conversation extends EventEmitter {
     private _onOptionsChanged;
     private _onNetworkStatus;
     private _onRemoteStreamSecond;
+    /**
+     * Коллбек, вызывающийся при получении/остановке стрима от AnimojiReceiver
+     * @param participantId - участник, к которому относится стрим
+     * @param stream - стрим анимированного аватара, null в случае остановки стрима
+     */
+    private _onAnimojiStream;
     private _onPeerConnectionClosed;
     private _changeFeatureSet;
     private _changeNeedRate;

package/classes/MediaSource.d.ts

@@ -2,10 +2,12 @@ import type { IEffect } from '@vkontakte/calls-video-effects';
 import EventEmitter from '../classes/EventEmitter';
 import MediaOption from '../enums/MediaOption';
 import MediaSettings from '../types/MediaSettings';
+import { ScreenCaptureSettings } from '../types/ScreenCaptureSettings';
 export declare const enum MediaSourceEvent {
     SOURCE_CHANGED = "SOURCE_CHANGED",
     TRACK_REPLACED = "TRACK_REPLACED",
-    SCREEN_STATUS = "SCREEN_STATUS"
+    SCREEN_STATUS = "SCREEN_STATUS",
+    ANIMOJI_STATUS = "ANIMOJI_STATUS"
 }
 /**
  * Тип трека
@@ -31,12 +33,15 @@ export declare class MediaSource extends EventEmitter {
     private _onDeviceChange;
     /** MediaSource занят при переключении камеры или микрофона */
     private _sourceBusy;
+    /** Состояние выключателя Animoji в UI */
+    private _animojiEnabled;
     constructor();
     request(mediaOptions?: MediaOption[], needEmptyTracks?: boolean): Promise<void>;
     getStream(): MediaStream | null;
     getScreenTrack(): MediaStreamTrack | null;
     getSendVideoTrack(noDataChannel?: boolean): MediaStreamTrack | null;
     private _getSendAudioTrack;
+    getAnimojiEnabled(): boolean;
     addTrackToPeerConnection(pc: RTCPeerConnection, observer: boolean, noDataChannel: boolean, audioRed: boolean): void;
     getMediaSettings(): MediaSettings;
     changeDevice(kind: MediaDeviceKind): Promise<void>;
@@ -73,9 +78,13 @@ export declare class MediaSource extends EventEmitter {
     /** останавливает и удаляет сохраненный трек с камеры пользователя */
     private _stopAndRemoveTrackVideoStreamBackup;
     destroy(): void;
-    toggleScreenCapturing(captureScreen: boolean, captureAudio: boolean): Promise<void>;
+    toggleScreenCapturing(settings: ScreenCaptureSettings): Promise<void>;
+    disableScreenCapturing(): Promise<void>;
     toggleVideo(enabled: boolean): Promise<void>;
     toggleAudio(enabled: boolean): Promise<void>;
+    toggleAnimojiCapturing(enabled: boolean): void;
+    onAnimojiSender(created: boolean): void;
+    onAnimojiStream(stream?: MediaStream | null): Promise<void>;
     setResolution(width: number, height: number): Promise<void>;
     updateNoiseSuppression(): Promise<void>;
     videoEffect(effect: IEffect | null): Promise<void>;

package/classes/codec/WebCodecsEncoder.d.ts

@@ -7,7 +7,9 @@ export default class WebCodecsEncoder extends WorkerBase implements IEncoder {
     private readonly _onFrame;
     private readonly _useCongestionControl;
     private readonly _maxBitrate;
-    constructor(sourceTrack: MediaStreamTrack, onFrame: OnFrameCallback, useCongestionControl: boolean, maxBitrate: number);
+    private readonly _useCbr;
+    private readonly _frameRate;
+    constructor(sourceTrack: MediaStreamTrack, onFrame: OnFrameCallback, useCongestionControl: boolean, maxBitrate: number, useCbr: boolean, frameRate: number);
     init(): Promise<void>;
     requestFrame(keyFrame?: boolean): void;
     setBitrate(bitrate: number, useCbr: boolean): void;

package/classes/screenshare/ScreenCaptureSender.d.ts

@@ -3,6 +3,7 @@ export default class ScreenCaptureSender {
     private readonly _encoder;
     private readonly _datachannel;
     private readonly _signaling;
+    private readonly _fastSharing;
     private _destroyed;
     private _needKeyframe;
     private readonly DATA_SIZE;
@@ -13,7 +14,7 @@ export default class ScreenCaptureSender {
     private _feedback;
     private _lastSharingStat;
     private _congestionControlEnabled;
-    constructor(track: MediaStreamTrack, datachannel: RTCDataChannel, signaling: BaseSignaling);
+    constructor(track: MediaStreamTrack, datachannel: RTCDataChannel, signaling: BaseSignaling, fastSharing: boolean);
     private _requestFrame;
     private _wrapHeader;
     private _stopPacket;

package/classes/screenshare/ScreenCongestionControl.d.ts

@@ -3,6 +3,7 @@ import { SharingStatReport } from './SharingStatReport';
 export default class ScreenCongestionControl {
     private readonly _onCongestion;
     private readonly _ccEnabled;
+    private readonly _fastSharing;
     private _minBitrate;
     private _maxBitrate;
     private _targetBitrate;
@@ -17,8 +18,9 @@ export default class ScreenCongestionControl {
     private _minDelay;
     private _maxDelay;
     private _largeDelayDuration;
-    constructor(onCongestion: OnCongestionCallback, minBitrate: number, maxBitrate: number, ccEnabled: boolean);
+    constructor(onCongestion: OnCongestionCallback, minBitrate: number, maxBitrate: number, ccEnabled: boolean, fastSharing: boolean);
     checkDelay(frameNum: number, delay: number, bitrateK: number): void;
+    private _setBitrate;
     private _calcDelay;
     reconfigure(minBitrate: number, maxBitrate: number): void;
     getStat(): SharingStatReport;

package/classes/transport/DirectTransport.d.ts

@@ -1,3 +1,4 @@
+import type { AnimojiSvgData } from '@vkontakte/calls-vmoji';
 import BaseSignaling from '../../abstract/BaseSignaling';
 import { ParticipantId } from '../../types/Participant';
 import ServerSettings from '../../types/ServerSettings';
@@ -13,6 +14,10 @@ export default class DirectTransport extends EventEmitter {
     private _remoteSDP;
     private _remoteCandidates;
     private _state;
+    private _animojiDataChannel;
+    private _animojiReceiver;
+    private _animojiSender;
+    private _animojiSvgDataByParticipantId;
     private _isOpen;
     private _remotePeerId;
     private _statInterval;
@@ -39,6 +44,7 @@ export default class DirectTransport extends EventEmitter {
     preventRestart(): void;
     allowRestart(): void;
     close(error?: Error): void;
+    setAnimojiSvg(participantId: ParticipantId, svgData: AnimojiSvgData): void;
     private _setState;
     private _onSignalingNotification;
     private _handleTransmittedData;
@@ -58,6 +64,7 @@ export default class DirectTransport extends EventEmitter {
     private _createAnswer;
     private static _patchDescription;
     private _onReplacedTrack;
+    private _onAnimojiStatus;
     private _startStatInterval;
     private _stopStatInterval;
     private _checkBadNetwork;
@@ -65,4 +72,9 @@ export default class DirectTransport extends EventEmitter {
     private _stopSettingsInterval;
     private _calcFingerprint;
     private _applySettings;
+    private _createDataChannel;
+    private _createAnimojiReceiver;
+    private _removeAnimojiReceiver;
+    private _createAnimojiSender;
+    private _removeAnimojiSender;
 }

package/classes/transport/ServerTransport.d.ts

@@ -1,3 +1,4 @@
+import type { AnimojiSvgData } from '@vkontakte/calls-vmoji';
 import BaseSignaling from '../../abstract/BaseSignaling';
 import { ParticipantId } from '../../types/Participant';
 import ServerSettings from '../../types/ServerSettings';
@@ -14,6 +15,10 @@ export default class ServerTransport extends EventEmitter {
     private _producerScreen;
     private _consumerScreen;
     private _asr;
+    private _animojiDataChannel;
+    private _animojiReceiver;
+    private _animojiSender;
+    private _animojiSvgDataByParticipantId;
     private _isOpen;
     private _observer;
     private _reconnectionPrevented;
@@ -36,7 +41,7 @@ export default class ServerTransport extends EventEmitter {
     private _rtpReceiversByStreamId;
     private _producerSessionId;
     private _newAudioShareTrack;
-    constructor(signaling: BaseSignaling, mediaSource: MediaSource, serverSettings: ServerSettings);
+    constructor(signaling: BaseSignaling, mediaSource: MediaSource, serverSettings: ServerSettings, animojiSvgDataByParticipantId?: Record<ParticipantId, AnimojiSvgData>);
     getState(): TransportState;
     updateStatisticsInterval(): void;
     open(observer?: boolean): void;
@@ -45,6 +50,7 @@ export default class ServerTransport extends EventEmitter {
     preventRestart(): void;
     allowRestart(): void;
     updateSettings(settings: ServerSettings): void;
+    setAnimojiSvg(participantId: ParticipantId, svgData: AnimojiSvgData): void;
     private _closeConnection;
     private static _closeDataChannel;
     private _createDataChannel;
@@ -60,8 +66,13 @@ export default class ServerTransport extends EventEmitter {
     private _removeCaptureSender;
     private _createCaptureReceiver;
     private _removeCaptureReceiver;
+    private _createAnimojiSender;
+    private _removeAnimojiSender;
+    private _createAnimojiReceiver;
+    private _removeAnimojiReceiver;
     private _applyConsumerSettings;
     private _onScreenSharingStatus;
+    private _onAnimojiStatus;
     private _setState;
     private _startStatInterval;
     private _stopStatInterval;

package/classes/transport/Transport.d.ts

@@ -1,3 +1,4 @@
+import type { AnimojiSvgData } from '@vkontakte/calls-vmoji/types';
 import BaseSignaling from '../../abstract/BaseSignaling';
 import { ParticipantId } from '../../types/Participant';
 import ServerSettings from '../../types/ServerSettings';
@@ -17,7 +18,8 @@ export declare const enum TransportEvent {
     TOPOLOGY_CHANGED = "TOPOLOGY_CHANGED",
     NETWORK_STATUS = "NETWORK_STATUS",
     PEER_CONNECTION_CLOSED = "PEER_CONNECTION_CLOSED",
-    ASR_TRANSCRIPTION = "ASR_TRANSCRIPTION"
+    ASR_TRANSCRIPTION = "ASR_TRANSCRIPTION",
+    ANIMOJI_STREAM = "ANIMOJI_STREAM"
 }
 export declare const enum TransportState {
     IDLE = "IDLE",
@@ -45,6 +47,7 @@ export declare class Transport extends EventEmitter {
     private _stListeners;
     private _states;
     private _localState;
+    private _animojiSvgDataByParticipantId;
     constructor(topology: TransportTopology, signaling: BaseSignaling, mediaSource: MediaSource, serverSettings: ServerSettings);
     updateSettings(settings: ServerSettings): void;
     updateStatisticsInterval(): void;
@@ -57,6 +60,7 @@ export declare class Transport extends EventEmitter {
     allocated(): string[];
     opened(): string[];
     getState(): TransportState;
+    setAnimojiSvg(participantId: ParticipantId, svgData: AnimojiSvgData): void;
     private _setStates;
     private _setState;
     private _setLocalState;
@@ -83,5 +87,6 @@ export declare class Transport extends EventEmitter {
     private _onServerRemoteTrackAdded;
     private _onServerRemoteTrackRemoved;
     private _onAsrTranscription;
+    private _onAnimojiStream;
     getStreamWaitingTimeMs(streamId: string, targetRtpTimestamp: number): number;
 }

package/enums/DataChannelLabel.d.ts

@@ -3,6 +3,7 @@ declare const enum DataChannelLabel {
     producerCommand = "producerCommand",
     consumerScreenShare = "consumerScreenShare",
     producerScreenShare = "producerScreenShare",
-    asr = "asr"
+    asr = "asr",
+    animoji = "animoji"
 }
 export default DataChannelLabel;

package/enums/MediaOption.d.ts

@@ -6,6 +6,7 @@ declare enum MediaOption {
     VIDEO = "VIDEO",
     SCREEN_SHARING = "SCREEN_SHARING",
     MOVIE_SHARING = "MOVIE_SHARING",
-    AUDIO_SHARING = "AUDIO_SHARING"
+    AUDIO_SHARING = "AUDIO_SHARING",
+    ANIMOJI = "ANIMOJI"
 }
 export default MediaOption;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vkontakte/calls-sdk",
-  "version": "2.6.3-dev.df409e1.0",
+  "version": "2.6.3-dev.e77d93a.0",
   "author": "vk.com",
   "description": "Library for video calls based on the vk.com platform",
   "homepage": "https://vk.com",
@@ -15,6 +15,7 @@
   ],
   "dependencies": {
     "@vkontakte/calls-video-effects": "1.0.6-beta.18",
+    "@vkontakte/calls-vmoji": "1.0.5-beta.2",
     "@vkontakte/libvpx": "2.0.9",
     "bit-buffer": "0.2.5",
     "messagepack": "1.1.12",

package/static/Params.d.ts

@@ -1,4 +1,5 @@
 import type { VideoEffects } from '@vkontakte/calls-video-effects';
+import type * as Vmoji from '@vkontakte/calls-vmoji';
 import { ConversationData } from '../classes/Conversation';
 import HangupReason from '../classes/HangupReason';
 import { MediaTrackKind } from '../classes/MediaSource';
@@ -143,6 +144,12 @@ export declare type ParamsObject = {
      * _По умолчанию: `480`_
      */
     videoEffectMaxHeight: number;
+    /**
+     * Экземпляр класса `Vmoji` из `@vkontakte/calls-vmoji`
+     *
+     * Можно установить позднее методом `setVmoji`
+     */
+    vmoji: typeof Vmoji | null;
     iceRestartWaitTime: number;
     transportConnectionWaitTime: number;
     /**
@@ -324,6 +331,9 @@ export declare type ParamsObject = {
         /** таймаут для батчинга на получение externalId */
         userIdsByOkBatchedTimeout: number;
     };
+    fastScreenShareFrameRate: number;
+    fastScreenShareWidth: number;
+    fastScreenShareHeight: number;
     /**
      * Получен локальный стрим с камеры/микрофона
      */
@@ -657,7 +667,6 @@ export default abstract class Params {
     static get videoAspectRatio(): number;
     static get videoFrameRate(): number;
     static get videoFacingMode(): FacingMode;
-    static get screenFrameRate(): number;
     static get displaySurface(): DisplayCaptureSurfaceType;
     static get videoEffects(): VideoEffects | null;
     static set videoEffects(value: VideoEffects | null);
@@ -665,6 +674,9 @@ export default abstract class Params {
     static set videoEffectMaxWidth(value: number);
     static get videoEffectMaxHeight(): number;
     static set videoEffectMaxHeight(value: number);
+    static get useVmoji(): boolean;
+    static get vmoji(): typeof Vmoji | null;
+    static set vmoji(value: typeof Vmoji | null);
     static get voiceParams(): {
         [key: string]: number;
     };
@@ -713,4 +725,7 @@ export default abstract class Params {
         /** таймаут для батчинга на получение externalId */
         userIdsByOkBatchedTimeout: number;
     };
+    static get fastScreenShareWidth(): number;
+    static get fastScreenShareHeight(): number;
+    static getScreenFrameRate(fastScreenShare: boolean): number;
 }

package/static/WebRTCUtils.d.ts

@@ -50,7 +50,7 @@ declare class MediaConstraints {
  */
 export declare class ScreenConstraints extends MediaConstraints {
     readonly captureController: CaptureController | null;
-    constructor(width: number, height: number, withAudioShare: boolean);
+    constructor(width: number, height: number, frameRate: number, withAudioShare: boolean);
     getNative(): object;
 }
 declare namespace WebRTCUtils {
@@ -109,7 +109,7 @@ declare namespace WebRTCUtils {
     /**
      * Запрашивает трансляцию экрана пользователя с опциональным захватом звука
      */
-    function getScreenMedia(withAudioShare: boolean): Promise<MediaStream>;
+    function getScreenMedia(fastScreenShare: boolean, withAudioShare: boolean): Promise<MediaStream>;
     /**
      * Запрашивает камеру пользователя
      *

package/types/MediaSettings.d.ts

@@ -14,10 +14,18 @@ export declare type MediaSettings = {
      * Включена ли трансляция экрана
      */
     isScreenSharingEnabled: boolean;
+    /**
+     * Режим динамического контента при трансляция экрана (быстрая шара)
+     */
+    isFastScreenSharingEnabled: boolean;
     /**
      * Включена ли трансляция звука
      */
     isAudioSharingEnabled: boolean;
+    /**
+     * Включена ли трансляция вимоджи
+     */
+    isAnimojiEnabled: boolean;
     videoStreams: VideoStreamInfo[];
 };
 export declare type VideoStreamInfo = {

package/types/ParticipantStreamDescription.d.ts

@@ -7,7 +7,8 @@ export declare enum MediaType {
     SCREEN = "SCREEN",
     STREAM = "STREAM",
     MOVIE = "MOVIE",
-    AUDIOSHARE = "AUDIOSHARE"
+    AUDIOSHARE = "AUDIOSHARE",
+    ANIMOJI = "ANIMOJI"
 }
 export declare function serializeParticipantStreamDescription(description: ParticipantStreamDescription): string;
 export declare function parseParticipantStreamDescription(descriptionString: string): ParticipantStreamDescription;

package/types/ScreenCaptureSettings.d.ts

@@ -0,0 +1,14 @@
+export interface ScreenCaptureSettings {
+    /**
+     * Включить или выключить захват экрана.
+     */
+    captureScreen: boolean;
+    /**
+     * Режим динамического контента при трансляция экрана (быстрая шара).
+     */
+    fastScreenSharing: boolean;
+    /**
+     * Включить или выключить захват звука. Может быть использован только вместе с захватом экрана.
+     */
+    captureAudio: boolean;
+}