@vkontakte/videoplayer-core 2.0.108-dev.7ca5c32c.0 → 2.0.108-dev.9969cb23.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vkontakte/videoplayer-core",
-  "version": "2.0.108-dev.7ca5c32c.0",
+  "version": "2.0.108-dev.9969cb23.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.40-dev.85b25f2f.0",
+    "@vkontakte/videoplayer-shared": "1.0.40-beta.0",
     "hls.js": "~1.4.7"
   }
 }

package/types/player/Player.d.ts

@@ -1,6 +1,6 @@
 import { IOptionalTuningConfig } from '../utils/tuningConfig';
 import { IError, ILogEntry, Seconds, Subject, ValueSubject, QualityLimits, VideoQuality, ITracer } 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 { 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;
@@ -33,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>>;
@@ -100,7 +100,7 @@ export default class Player implements IPlayer {
         enableDebugTelemetry$: ValueSubject<boolean>;
         dumpTelemetry: (receiver: (value: Record<string, any>) => void) => void;
     };
-    constructor(tuning: IOptionalTuningConfig | undefined, tracer: ITracer);
+    constructor(tuning?: IOptionalTuningConfig, tracer?: ITracer);
     initVideo(config: IConfig): IPlayer;
     destroy(): void;
     prepare(): IPlayer;

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,7 +2,7 @@ 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, ITracer } from '@vkontakte/videoplayer-shared';
 import { Player } from './lib/player';
@@ -37,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/LiveTextManager.d.ts

@@ -0,0 +1,22 @@
+import { IValueSubject, Milliseconds } from '@vkontakte/videoplayer-shared';
+import { Dependencies } from './buffer';
+import { Manifest, Stream, TextRepresentation } from './types';
+export declare class LiveTextManager {
+    currentRepresentation$: IValueSubject<TextRepresentation | null>;
+    private representations;
+    private readonly getCurrentPosition;
+    private currentSegment;
+    private currentSegmentId;
+    constructor(streams: Stream[], deps: Pick<Dependencies, 'getCurrentPosition'>);
+    updateLive(manifest: Manifest | null): void;
+    seekLive(streams?: Stream[]): void;
+    maintain(currentPosition?: Milliseconds | undefined): void;
+    destroy(): void;
+    /**
+     * @todo support multi-streams
+     * @see https://jira.mvk.com/browse/VP-2420
+     */
+    private processStreams;
+    static isSupported(streams?: Stream[]): boolean;
+    private static filterRepresentations;
+}

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

@@ -48,6 +48,7 @@ export declare class BufferManager {
     private failedDownloads;
     private compatibilityMode;
     private preloadOnly;
+    private bufferAccumulation;
     private isLive;
     private liveUpdateSegmentIndex;
     private liveInitialAdditionalOffset;
@@ -65,6 +66,8 @@ export declare class BufferManager {
     seekLive: (param_0: Stream[] | undefined) => Promise<void | undefined>;
     updateLive(manifest: Manifest | null): void;
     proceedLowLatencyLive(): void;
+    startAccumulateBuffer(): void;
+    private resetAccumulateBufferAfterStall;
     private updateLowLatencyLiveIfNeeded;
     findSegmentStartTime(position: Milliseconds): Milliseconds | undefined;
     setTarget(time: Milliseconds): void;

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

@@ -1,5 +1,5 @@
 import { HttpConnectionType } from '../../../player/types';
-import { CommonInit, Manifest, Representation, StreamKind } from './types';
+import { CommonInit, Manifest, Representation, StreamKind, TextRepresentation } from './types';
 import StateMachine from '../../../utils/StateMachine/StateMachine';
 import type ThroughputEstimator from '../../../utils/ThroughputEstimator';
 import { ITuningConfig } from '../../../utils/tuningConfig';
@@ -27,6 +27,7 @@ export declare class Player {
     private videoBufferManager;
     private audioBufferManager;
     private bufferManagers;
+    private liveTextManager;
     private throughputEstimator;
     private subscription;
     private representationSubscription;
@@ -41,6 +42,7 @@ export declare class Player {
     lastConnectionType$: IValueSubject<HttpConnectionType | undefined>;
     lastConnectionReused$: IValueSubject<boolean | undefined>;
     lastRequestFirstBytes$: IValueSubject<Milliseconds | undefined>;
+    currentLiveTextRepresentation$: IValueSubject<TextRepresentation | null>;
     isLive$: IValueSubject<boolean>;
     liveDuration$: IValueSubject<Milliseconds>;
     liveAvailabilityStartTime$: IValueSubject<Seconds | undefined>;

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

@@ -31,6 +31,12 @@ export interface Representation {
     fps?: number;
     quality?: string;
 }
+export interface TextRepresentation extends Representation {
+    language: string;
+    label: string;
+    url: string;
+    isAuto: boolean;
+}
 export declare enum SegmentReferencingType {
     BYTE_RANGE = "byteRange",
     TEMPLATE = "template"

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

@@ -1,14 +1,12 @@
-import { Representation, Segment, SegmentReference, Stream, TemplateSegment, TemplateSegmentReference } from '../../../providers/DashProvider/lib/types';
+import { Representation, Segment, SegmentReference, Stream, TemplateSegment, TemplateSegmentReference, TextRepresentation } from '../../../providers/DashProvider/lib/types';
 import { IAudioStream, IAudioTrack, IInternalTextTrack, IVideoStream, IVideoTrack } from '../../../player/types';
 export declare const representationToVideoTrack: ({ id, width, height, bitrate, fps, quality: qualityString }: Representation) => IVideoTrack | undefined;
 export declare const representationToAudioTrack: ({ id, bitrate }: Representation) => IAudioTrack;
 export declare const selectAudioForVideo: (videoTrack: IVideoTrack, videoTracks: IVideoTrack[], audioTracks: IAudioTrack[]) => IAudioTrack | undefined;
-export declare const representationToTextTrack: ({ language, label }: Stream, { id, url, isAuto }: Representation & {
-    url: string;
-    isAuto: boolean;
-}) => IInternalTextTrack;
+export declare const representationToTextTrack: ({ language, label }: Pick<Stream, "label" | "language">, { id, url, isAuto }: TextRepresentation) => IInternalTextTrack;
 export declare const streamToIAudioStream: ({ id, language, label, codecs, isDefault }: Stream) => IAudioStream;
 export declare const streamToIVideoStream: ({ id, language, label, hdr, codecs }: Stream) => IVideoStream;
 export declare const isTemplateSegment: (segment: Segment) => segment is TemplateSegment;
 export declare const isTemplateSegmentReference: (segmentReference: SegmentReference) => segmentReference is TemplateSegmentReference;
 export declare const isAbortError: (e: Error | unknown) => boolean;
+export declare const isTextRepresentation: (representation: Representation | TextRepresentation) => representation is TextRepresentation;

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;
@@ -126,6 +130,7 @@ export type ITuningConfig = {
     endGapTolerance: Milliseconds;
     stallIgnoreThreshold: Milliseconds;
     gapWatchdogInterval: Milliseconds;
+    accumulationBufferStallSizeMs: Milliseconds;
     requestQuick: boolean;
     useHlsJs: boolean;
     useDashAbortPartiallyFedSegment: boolean;
@@ -133,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;