@vkontakte/videoplayer-core 2.0.108-dev.ce9f9a29.0 → 2.0.108-dev.f2d9491a.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vkontakte/videoplayer-core",
-  "version": "2.0.108-dev.ce9f9a29.0",
+  "version": "2.0.108-dev.f2d9491a.0",
   "author": "vk.com",
   "description": "Videoplayer core library based on the vk.com platform",
   "homepage": "https://vk.com",
@@ -49,7 +49,7 @@
     "**/*.d.ts"
   ],
   "dependencies": {
-    "@vkontakte/videoplayer-shared": "^1.0.39",
+    "@vkontakte/videoplayer-shared": "1.0.40-dev.2129b4c2.0",
     "hls.js": "~1.4.7"
   }
 }

package/types/player/Player.d.ts

@@ -1,12 +1,13 @@
 import { IOptionalTuningConfig } from '../utils/tuningConfig';
-import { IError, ILogEntry, Seconds, Subject, ValueSubject, QualityLimits, VideoQuality } from '@vkontakte/videoplayer-shared';
-import { ChromecastState, HttpConnectionType, IAudioStream, IAudioTrack, IConfig, ICueSettings, IExternalTextTrack, IPlayer, ISeekRequest, ISources, ITextTrack, IVideoStream, PlaybackRate, PlaybackState, StartEnd, Surface, VideoFormat } from './types';
+import { IError, ILogEntry, Seconds, Subject, ValueSubject, QualityLimits, VideoQuality, ITracer } from '@vkontakte/videoplayer-shared';
+import { ChromecastState, HttpConnectionType, IAudioStream, IConfig, ICueSettings, IExternalTextTrack, IPlayer, ISeekRequest, ISources, ITextTrack, IVideoStream, PlaybackRate, PlaybackState, StartEnd, Surface, VideoFormat } from './types';
 export default class Player implements IPlayer {
     private subscription;
     private domContainer;
     private providerContainer?;
     private chromecastInitializer;
     private logger;
+    private tracer;
     private abrLogger;
     private config;
     private tuning;
@@ -32,7 +33,7 @@ export default class Player implements IPlayer {
         autoQualityLimits$: ValueSubject<QualityLimits>;
         availableAudioStreams$: ValueSubject<IAudioStream[]>;
         currentAudioStream$: ValueSubject<IVideoStream | undefined>;
-        availableAudioTracks$: ValueSubject<IAudioTrack[]>;
+        availableAudioTracks$: ValueSubject<import("./types").IBaseTrack[]>;
         isAudioAvailable$: ValueSubject<boolean>;
         currentPlaybackRate$: ValueSubject<number>;
         currentBuffer$: ValueSubject<StartEnd<number>>;
@@ -99,7 +100,7 @@ export default class Player implements IPlayer {
         enableDebugTelemetry$: ValueSubject<boolean>;
         dumpTelemetry: (receiver: (value: Record<string, any>) => void) => void;
     };
-    constructor(tuning?: IOptionalTuningConfig);
+    constructor(tuning?: IOptionalTuningConfig, tracer?: ITracer);
     initVideo(config: IConfig): IPlayer;
     destroy(): void;
     prepare(): IPlayer;
@@ -174,6 +175,7 @@ export default class Player implements IPlayer {
     private setStartingVideoTrack;
     private initLogs;
     private initDebugTelemetry;
+    private initTracerSubscription;
     private initWakeLock;
     private setVideoTrackIdByQuality;
     private getActiveLiveDelay;

package/types/player/types.d.ts

@@ -475,10 +475,12 @@ export interface IVideoStream {
     codec?: string;
     label?: string;
 }
-export interface IVideoTrack {
+export interface IBaseTrack {
     id: string;
-    quality: VideoQuality;
     bitrate?: Kbps;
+}
+export interface IVideoTrack extends IBaseTrack {
+    quality: VideoQuality;
     size?: IRectangle;
     fps?: number;
 }
@@ -489,10 +491,7 @@ export interface IAudioStream {
     codec?: string;
     isDefault?: boolean;
 }
-export interface IAudioTrack {
-    id: string;
-    bitrate?: Kbps;
-}
+export type IAudioTrack = IBaseTrack;
 interface ITextTrackBase {
     type: 'external' | 'internal';
     id: string;

package/types/providers/DashProvider/baseDashProvider.d.ts

@@ -2,9 +2,9 @@ import { IAudioTrack, IDashURLSource, IHLSSource, IInternalTextTrack, IVideoTrac
 import { CommonInit, IProviderSubscriptionInfo, ProviderState, Representation, Stream } from './lib/types';
 import { IProvider, IProviderParams } from '../../providers/types';
 import TextTrackManager from '../../providers/utils/HTMLVideoElement/TextTrackManager';
-import { TrackHistory } from '../../utils/autoSelectVideoTrack';
+import { TrackHistory } from '../../utils/autoSelectTrack';
 import { IStateMachine } from '../../utils/StateMachine/types';
-import { IRectangle, ISubscription, Milliseconds, ValueSubject } from '@vkontakte/videoplayer-shared';
+import { IRectangle, ISubscription, Milliseconds, ValueSubject, ITracer } from '@vkontakte/videoplayer-shared';
 import { Player } from './lib/player';
 import { ILiveOffset } from '../utils/LiveOffset/types';
 import { Scene3D } from '../../utils/3d/Scene3D';
@@ -19,6 +19,7 @@ export default abstract class BaseDashProvider implements IProvider {
     protected video: HTMLVideoElement;
     protected player: Player;
     protected params: IParams;
+    protected tracer: ITracer;
     protected elementSize$: ValueSubject<IRectangle<number> | undefined>;
     protected textTracksManager: TextTrackManager;
     protected droppedFramesManager: DroppedFramesManager;
@@ -36,7 +37,8 @@ export default abstract class BaseDashProvider implements IProvider {
     }>;
     protected videoStreamsMap: Map<Stream, IVideoTrack[]>;
     protected audioStreamsMap: Map<Stream, IAudioTrack[]>;
-    protected videoTrackSwitchHistory: TrackHistory;
+    protected videoTrackSwitchHistory: TrackHistory<IVideoTrack>;
+    protected audioTrackSwitchHistory: TrackHistory<import("../../player/types").IBaseTrack>;
     protected textTracks: {
         track: IInternalTextTrack;
         representation: Representation;

package/types/providers/DashProvider/lib/buffer.d.ts

@@ -1,7 +1,7 @@
 import { ITuningConfig } from '../../../utils/tuningConfig';
 import { IError, IRange, ISubject, IValueSubject, Milliseconds } from '@vkontakte/videoplayer-shared';
 import type { Fetcher } from './fetcher';
-import { CommonInit, Manifest, Representation, Stream, StreamKind } from './types';
+import { CommonInit, Manifest, Representation, StreamKind, Stream } from './types';
 export interface Dependencies {
     fetcher: Fetcher;
     tuning: ITuningConfig;

package/types/providers/DashProvider/lib/fetcher.d.ts

@@ -1,6 +1,6 @@
 import { HttpConnectionType } from '../../../player/types';
 import type ThroughputEstimator from '../../../utils/ThroughputEstimator';
-import { Byte, IValueSubject, Milliseconds, IRange } from '@vkontakte/videoplayer-shared';
+import { Byte, IValueSubject, Milliseconds, IRange, ITracer } from '@vkontakte/videoplayer-shared';
 import { CommonInit, GenericContainerParser, Segment, SegmentReference } from './types';
 export declare enum RangeMethod {
     HEADER = 0,
@@ -10,6 +10,7 @@ export interface IParams {
     throughputEstimator?: ThroughputEstimator;
     requestQuic: boolean;
     compatibilityMode?: boolean;
+    tracer: ITracer;
 }
 export type Priority = 'high' | 'low' | 'auto';
 export interface FetchParamsWithUrl extends FetchParams {
@@ -33,13 +34,14 @@ export type RepresentationFetchResult = {
 export declare class Fetcher {
     private throughputEstimator;
     private requestQuic;
+    private tracer;
     lastConnectionType$: IValueSubject<HttpConnectionType | undefined>;
     lastConnectionReused$: IValueSubject<boolean | undefined>;
     lastRequestFirstBytes$: IValueSubject<Milliseconds | undefined>;
     private abortAllController;
     private subscription;
     private compatibilityMode;
-    constructor({ throughputEstimator, requestQuic, compatibilityMode }: IParams);
+    constructor({ throughputEstimator, requestQuic, tracer, compatibilityMode }: IParams);
     private onHeadersReceived;
     fetchManifest: (param_0: string) => Promise<string | null | undefined>;
     fetch: (param_0: string, param_1: FetchParams) => Promise<ArrayBuffer | null | undefined>;

package/types/providers/DashProvider/lib/player.d.ts

@@ -3,7 +3,7 @@ import { CommonInit, Manifest, Representation, StreamKind } from './types';
 import StateMachine from '../../../utils/StateMachine/StateMachine';
 import type ThroughputEstimator from '../../../utils/ThroughputEstimator';
 import { ITuningConfig } from '../../../utils/tuningConfig';
-import { IError, ISubject, IValueSubject, Milliseconds, Seconds } from '@vkontakte/videoplayer-shared';
+import { IError, ISubject, IValueSubject, Milliseconds, Seconds, ITracer } from '@vkontakte/videoplayer-shared';
 import { ISmoothedValue } from '../../../utils/smoothedValue/types';
 export declare enum State {
     NONE = "none",
@@ -15,6 +15,7 @@ export interface Params {
     throughputEstimator: ThroughputEstimator;
     tuning: ITuningConfig;
     compatibilityMode?: boolean;
+    tracer: ITracer;
 }
 export declare class Player {
     private element;
@@ -22,6 +23,7 @@ export declare class Player {
     private source;
     private manifest;
     private tuning;
+    private tracer;
     private videoBufferManager;
     private audioBufferManager;
     private bufferManagers;
@@ -69,6 +71,7 @@ export declare class Player {
     getStreams(): Manifest['streams'] | undefined;
     setPreloadOnly(preloadOnly: boolean): void;
     destroy(): void;
+    private initTracerSubscription;
     private normolizeLiveOffset;
     private tick;
     private updateLive;

package/types/providers/ProviderContainer/index.d.ts

@@ -22,6 +22,7 @@ export default class ProviderContainer implements IProviderContainer {
     private screenFormatsIterator;
     private chromecastFormatsIterator;
     private log;
+    private tracer;
     private params;
     private failoverIndex;
     private volumeMultiplierManager;

package/types/providers/types.d.ts

@@ -1,5 +1,5 @@
 import { ITuningConfig } from '../utils/tuningConfig';
-import { ILogger, ISubject, IValueSubject, Milliseconds, Seconds, IRange, IError, QualityLimits, IWarning, IComponentLogger } from '@vkontakte/videoplayer-shared';
+import { ILogger, ISubject, IValueSubject, Milliseconds, Seconds, IRange, IError, QualityLimits, IWarning, IComponentLogger, ITracer } from '@vkontakte/videoplayer-shared';
 import { IChromecastInitializer } from '../providers/ChromecastProvider/ChromecastInitializer/types';
 import { HttpConnectionType, IAudioStream, IAudioTrack, ICueSettings, ISources, IVideoStream, SeekState } from '../player/types';
 import { IExternalTextTrack, IInternalTextTrack, ITextTrack, IVideoTrack, IVolumeState, PlaybackState, PlaybackRate } from '../player/types';
@@ -16,6 +16,7 @@ export interface IProviderDependencies {
         throughputEstimator: ThroughputEstimator;
         chromecastInitializer: IChromecastInitializer;
         logger: ILogger;
+        tracer: ITracer;
         abrLogger: IComponentLogger;
     };
 }

package/types/utils/autoSelectTrack.d.ts

@@ -0,0 +1,29 @@
+import { ITuningConfig } from '../utils/tuningConfig';
+import { Kbps, Milliseconds, IRectangle, type ExactVideoQuality, QualityLimits, IComponentLogger } from '@vkontakte/videoplayer-shared';
+import { IAudioTrack, IBaseTrack, IVideoTrack } from '../player/types';
+interface IConstraints<T extends IBaseTrack> {
+    container?: IRectangle;
+    throughput?: Kbps;
+    tuning: ITuningConfig['autoTrackSelection'];
+    limits?: QualityLimits;
+    reserve?: Kbps;
+    playbackRate?: number;
+    forwardBufferHealth?: number;
+    current?: T;
+    visible?: boolean;
+    history?: TrackHistory<T>;
+    droppedVideoMaxQualityLimit?: ExactVideoQuality;
+    abrLogger: IComponentLogger;
+}
+export declare class TrackHistory<T extends IBaseTrack> {
+    last: T | undefined;
+    history: Record<IBaseTrack['id'], Milliseconds>;
+    recordSelection(track: T): void;
+    recordSwitch(track: T | undefined): void;
+    clear(): void;
+}
+export declare const defaultEmptyArrayErrorMessage = "Assertion \"ABR Tracks is empty array\" failed";
+export declare const getMinPossibleAudioForVideo: (videoTrack: IVideoTrack, videoTracks: IVideoTrack[], audioTracks: IAudioTrack[], minVideoAudioRatio: number) => IAudioTrack | undefined;
+export declare const autoSelectVideoTrack: (videoTracks: IVideoTrack[], { container, throughput, tuning, limits, reserve, forwardBufferHealth, playbackRate, current, history, visible, droppedVideoMaxQualityLimit, abrLogger, }: IConstraints<IVideoTrack>) => IVideoTrack;
+export declare const autoSelectAudioTrackForVideo: (selectedVideoTrack: IVideoTrack, videoTracks: IVideoTrack[], audioTracks: IAudioTrack[], { throughput, tuning, playbackRate, forwardBufferHealth, history, abrLogger, }: IConstraints<IAudioTrack>) => IAudioTrack | undefined;
+export {};

package/types/utils/tuningConfig.d.ts

@@ -24,7 +24,11 @@ export type ITuningConfig = {
     };
     autoTrackSelection: {
         bitrateFactorAtEmptyBuffer: number;
+        bitrateAudioFactorAtEmptyBuffer: number;
         bitrateFactorAtFullBuffer: number;
+        bitrateAudioFactorAtFullBuffer: number;
+        minVideoAudioRatio: number;
+        minAvailableThroughputAudioRatio: number;
         limitByContainer: boolean;
         usePixelRatio: boolean;
         containerSizeFactor: number;
@@ -134,6 +138,7 @@ export type ITuningConfig = {
     useManagedMediaSource: boolean;
     useNewPruneBufferStrategy: boolean;
     useNewPartialSegmentFeeding: boolean;
+    useSeparateAudioVideoABR: boolean;
     isAudioDisabled: boolean;
     autoplayOnlyInActiveTab: boolean;
     dynamicImportTimeout: Milliseconds;

package/types/utils/autoSelectVideoTrack.d.ts

@@ -1,26 +0,0 @@
-import { ITuningConfig } from '../utils/tuningConfig';
-import { Kbps, Milliseconds, IRectangle, type ExactVideoQuality, QualityLimits, IComponentLogger } from '@vkontakte/videoplayer-shared';
-import { IVideoTrack } from '../player/types';
-export interface Constraints {
-    container?: IRectangle;
-    throughput?: Kbps;
-    tuning: ITuningConfig['autoTrackSelection'];
-    limits?: QualityLimits;
-    reserve?: Kbps;
-    playbackRate?: number;
-    forwardBufferHealth?: number;
-    current?: IVideoTrack;
-    history?: TrackHistory;
-    droppedVideoMaxQualityLimit?: ExactVideoQuality;
-    abrLogger: IComponentLogger;
-}
-export declare class TrackHistory {
-    last: IVideoTrack | undefined;
-    history: Record<IVideoTrack['id'], Milliseconds>;
-    recordSelection(track: IVideoTrack): void;
-    recordSwitch(track: IVideoTrack): void;
-    clear(): void;
-}
-export declare const defaultEmptyArrayErrorMessage = "Assertion \"ABR Tracks is empty array\" failed";
-declare const autoSelectVideoTrack: (tracks: IVideoTrack[], { container, throughput, tuning, limits, reserve, forwardBufferHealth, playbackRate, current, history, droppedVideoMaxQualityLimit, abrLogger, }: Constraints) => IVideoTrack;
-export default autoSelectVideoTrack;