@vkontakte/videoplayer-core 2.0.117-dev.85ef0d1b.0 → 2.0.117-dev.d9cc3d97.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vkontakte/videoplayer-core",
-  "version": "2.0.117-dev.85ef0d1b.0",
+  "version": "2.0.117-dev.d9cc3d97.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.49-dev.6764e3ce.0",
+    "@vkontakte/videoplayer-shared": "1.0.49-dev.ed1df4eb.0",
     "hls.js": "~1.4.7"
   }
 }

package/types/player/Player.d.ts

@@ -16,6 +16,8 @@ export default class Player implements IPlayer {
     private initedAt;
     private hasLiveOffsetByPaused;
     private hasLiveOffsetByPausedTimer;
+    private explicitInitialQuality;
+    private wasSetStartedQuality;
     private desiredState;
     info: {
         playbackState$: ValueSubject<PlaybackState>;
@@ -100,6 +102,7 @@ export default class Player implements IPlayer {
         tuningConfigName$: ValueSubject<string[]>;
         enableDebugTelemetry$: ValueSubject<boolean>;
         dumpTelemetry: (receiver: (value: Record<string, any>) => void) => void;
+        getCurrentTime$: ValueSubject<null>;
     };
     constructor(tuning?: IOptionalTuningConfig, tracer?: ITracer);
     initVideo(config: IConfig): IPlayer;
@@ -125,6 +128,7 @@ export default class Player implements IPlayer {
     setExternalTextTracks(tracks: Omit<IExternalTextTrack, 'type'>[]): IPlayer;
     selectTextTrack(id: ITextTrack['id'] | undefined): IPlayer;
     setTextTrackCueSettings(settings: ICueSettings): IPlayer;
+    setLiveLowLatency(isLowLatency: boolean): IPlayer;
     setLooped(isLooped: boolean): IPlayer;
     toggleChromecast(): void;
     /**

package/types/player/types.d.ts

@@ -48,6 +48,7 @@ export interface IPlayer {
     setExternalTextTracks(tracks: Omit<IExternalTextTrack, 'type'>[]): IPlayer;
     selectTextTrack(id: ITextTrack['id'] | undefined): IPlayer;
     setTextTrackCueSettings(settings: ICueSettings): IPlayer;
+    setLiveLowLatency(isLowLatency: boolean): IPlayer;
     /**
      * Включает или отключает Chromecast
      */
@@ -70,6 +71,8 @@ export interface IPlayer {
         tuningConfigName$: IValueSubject<string[]>;
         enableDebugTelemetry$: IValueSubject<boolean>;
         dumpTelemetry: (receiver: (value: Record<string, any>) => void) => void;
+        /** функция вычисления текущей позиции проигрывания из под провадера (если расчет нестандартный) */
+        getCurrentTime$: IValueSubject<(() => number) | null>;
     };
 }
 /**

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

@@ -9,6 +9,7 @@ import { ILiveOffset } from '../utils/LiveOffset/types';
 import { Scene3D } from '../../utils/3d/Scene3D';
 import DroppedFramesManager from '../../providers/utils/HTMLVideoElement/DroppedFramesManager';
 import TextTrackManager from '../../providers/utils/HTMLVideoElement/TextTrackManager';
+import StallsManager from '../../providers/utils/StallsManager';
 type IParams = IProviderParams<IDashURLSource> & {
     sourceHls?: IHLSSource;
 };
@@ -23,6 +24,7 @@ export default abstract class BaseDashProvider implements IProvider {
     protected elementSize$: ValueSubject<IRectangle<number> | undefined>;
     protected textTracksManager: TextTrackManager | null;
     protected droppedFramesManager: DroppedFramesManager;
+    protected stallsManager: StallsManager;
     protected videoTracksMap: Map<IVideoTrack, {
         stream: Stream;
         representation: Representation;

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

@@ -1,3 +1,3 @@
 export declare const DASH_LIVE_UPDATE_INTERVAL_MS = 1000;
-export declare const DASH_STALL_UPDATE_INTERVAL_MS = 1000;
+export declare const DASH_STALL_UPDATE_INTERVAL_MS = 50;
 export declare const DASH_LIVE_STALL_REINIT_INTERVAL_MS = 5000;

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

@@ -48,9 +48,11 @@ export declare class Player {
     bufferLength$: IValueSubject<Milliseconds>;
     liveLoadBufferLength$: IValueSubject<Milliseconds>;
     livePositionFromPlayer$: IValueSubject<number>;
+    isLowLatency$: IValueSubject<boolean>;
     isActiveLowLatency$: IValueSubject<boolean>;
+    currentStallDuration$: IValueSubject<Milliseconds>;
+    videoLastDataObtainedTimestamp$: IValueSubject<Milliseconds>;
     private liveEstimatedDelay;
-    private timeInWaiting;
     private isUpdatingLive;
     private isJumpGapAfterSeekLive;
     private liveLastSeekOffset;

package/types/providers/HlsLiveProvider/LiveTextManager.d.ts

@@ -0,0 +1,42 @@
+import { IInternalTextTrack } from '../../player/types';
+import { IValueSubject, Milliseconds, IError, ISubject } from '@vkontakte/videoplayer-shared';
+import { HLSManifestData } from '../HlsProvider/manifestDataExtractor';
+type FetchManifestData = (url: string, init?: RequestInit) => Promise<HLSManifestData>;
+export declare class LiveTextManager {
+    private readonly logger;
+    private readonly log;
+    private readonly params;
+    private readonly subscription;
+    private readonly abortControllers;
+    private readonly numberFormat;
+    /** в случае перемотки будет сохранена актуальная ссылка "наконечника" стрима */
+    private prepareUrl;
+    private currentTextTrackData;
+    availableTextTracks$: IValueSubject<IInternalTextTrack[] | null>;
+    getCurrentTime$: IValueSubject<(() => number) | null>;
+    error$: ISubject<IError>;
+    constructor(liveTime$: IValueSubject<Milliseconds | undefined>, video: HTMLVideoElement, fetchManifestData: FetchManifestData, sourceUrl: string);
+    destroy(): void;
+    /**
+     * одноименный метод из провайдера, который дергаем на перемотке,
+     * чтобы синхронизировать субтитры с видео\аудио дорожками
+     */
+    prepare(url: string): Promise<void>;
+    /** тут, на самом деле, мы получаем ссылку на плейлисты для текстовых треков */
+    processTextTracks(textTracks: IInternalTextTrack[], baseUrl: string): Promise<void>;
+    /**
+     * @todo - пока только с 1 стримом работает
+     */
+    private parseTextTracks;
+    /** парсим плейлист и получаем список треков */
+    private parsePlaylist;
+    /** забирает значение (value) строки в плейлисте */
+    private extractPlaylistRowValue;
+    /** обновляет ссылку на текущий сегмент субтитров для UI */
+    private processLiveTime;
+    /** догружает актуальные сабы */
+    private fetchNextManifestData;
+    private fetchManifestData;
+    private error;
+}
+export {};

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

@@ -13,6 +13,7 @@ export default class HlsLiveProvider implements IProvider {
     private video;
     private params;
     private textTracksManager;
+    private liveTextManager;
     private masterManifest;
     private manifests$;
     private maxSeekBackTime$;
@@ -26,5 +27,6 @@ export default class HlsLiveProvider implements IProvider {
     private playIfAllowed;
     private seek;
     private syncPlayback;
+    private generateLiveUrl;
 }
 export {};

package/types/providers/HlsProvider/manifestDataExtractor.d.ts

@@ -17,5 +17,5 @@ type ExtractHLSManifestDataConfig = {
     manifestRetryInterval: number;
     manifestRetryMaxInterval: number;
 };
-declare const extractHLSManifestData: (masterManifestUrl: string, baseUrl: string | undefined, config: ExtractHLSManifestDataConfig) => Promise<HLSManifestData>;
+declare const extractHLSManifestData: (masterManifestUrl: string, baseUrl: string | undefined, config: ExtractHLSManifestDataConfig, init?: RequestInit) => Promise<HLSManifestData>;
 export default extractHLSManifestData;

package/types/providers/types.d.ts

@@ -33,6 +33,7 @@ export interface IDesiredState {
     volume: IStateMachine<IVolumeState>;
     playbackRate: IStateMachine<PlaybackRate>;
     isLooped: IStateMachine<boolean>;
+    isLowLatency: IStateMachine<boolean>;
     videoStream: IStateMachine<IVideoStream | undefined>;
     videoTrack: IStateMachine<IVideoTrack | undefined>;
     audioStream: IStateMachine<IAudioStream | undefined>;
@@ -90,4 +91,5 @@ export interface IProviderOutput {
     inPiP$: IValueSubject<boolean>;
     inFullscreen$: IValueSubject<boolean>;
     playbackState$: IValueSubject<PlaybackState | string>;
+    getCurrentTime$: IValueSubject<(() => number) | null>;
 }

package/types/providers/utils/StallsManager.d.ts

@@ -0,0 +1,34 @@
+import { ExactVideoQuality, IObservable, IValueSubject, Milliseconds, Kbps } from '@vkontakte/videoplayer-shared';
+import { IVideoTrack } from '../../player/types';
+import { ITuningConfig } from '../../utils/tuningConfig';
+interface IConnectData {
+    videoLastDataObtainedTimestamp$: IValueSubject<Milliseconds>;
+    throughput$: IValueSubject<number>;
+    rtt$: IValueSubject<Milliseconds>;
+    isBuffering$: IObservable<boolean>;
+    isSeeked$: IObservable<boolean>;
+    currentStallDuration$: IObservable<Milliseconds>;
+    qualityLimitsOnStall: ITuningConfig['dash']['qualityLimitsOnStall'];
+}
+declare class StallsManager {
+    private currentStallDuration$;
+    private videoLastDataObtainedTimestamp$;
+    private throughput$;
+    private rtt$;
+    private qualityLimitsOnStall;
+    private isSeeked$;
+    private isBuffering$;
+    private currentStallsCount;
+    private maxQualityLimit;
+    private lastUniqueVideoTrackSelected;
+    private lastUniqueVideoTrackSelectedTimestamp;
+    private predictedThroughputWithoutData;
+    private qualityRestrictionTimer;
+    private subscription;
+    connect(data: IConnectData): void;
+    get videoMaxQualityLimit(): ExactVideoQuality | undefined;
+    get predictedThroughput(): Kbps;
+    set lastVideoTrackSelected(lastUniqueVideoTrackSelected: IVideoTrack);
+    destroy(): void;
+}
+export default StallsManager;

package/types/utils/autoSelectTrack.d.ts

@@ -3,7 +3,7 @@ import { Kbps, Milliseconds, IRectangle, type ExactVideoQuality, QualityLimits,
 import { IAudioTrack, IBaseTrack, IVideoTrack } from '../player/types';
 interface IConstraints<T extends IBaseTrack> {
     container?: IRectangle;
-    throughput?: Kbps;
+    estimatedThroughput?: Kbps;
     tuning: ITuningConfig['autoTrackSelection'];
     limits?: QualityLimits;
     reserve?: Kbps;
@@ -13,6 +13,8 @@ interface IConstraints<T extends IBaseTrack> {
     visible?: boolean;
     history?: TrackHistory<T>;
     droppedVideoMaxQualityLimit?: ExactVideoQuality;
+    stallsVideoMaxQualityLimit?: ExactVideoQuality;
+    stallsPredictedThroughput?: Kbps;
     abrLogger: IComponentLogger;
 }
 export declare class TrackHistory<T extends IBaseTrack> {
@@ -24,6 +26,6 @@ export declare class TrackHistory<T extends IBaseTrack> {
 }
 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 declare const autoSelectVideoTrack: (videoTracks: IVideoTrack[], { container, estimatedThroughput, tuning, limits, reserve, forwardBufferHealth, playbackRate, current, history, visible, droppedVideoMaxQualityLimit, stallsVideoMaxQualityLimit, stallsPredictedThroughput, abrLogger, }: IConstraints<IVideoTrack>) => IVideoTrack;
+export declare const autoSelectAudioTrackForVideo: (selectedVideoTrack: IVideoTrack, videoTracks: IVideoTrack[], audioTracks: IAudioTrack[], { estimatedThroughput, tuning, playbackRate, forwardBufferHealth, history, abrLogger, stallsPredictedThroughput, }: IConstraints<IAudioTrack>) => IAudioTrack | undefined;
 export {};

package/types/utils/tuningConfig.d.ts

@@ -33,7 +33,8 @@ export type ITuningConfig = {
         usePixelRatio: boolean;
         /** @deprecated */
         pixelRatioMultiplier?: number;
-        pixelRatioPolynome: number[];
+        pixelRatioLogBase: number;
+        pixelRatioLogCoefficients: number[];
         containerSizeFactor: number;
         lazyQualitySwitch: boolean;
         minBufferToSwitchUp: number;
@@ -70,8 +71,14 @@ export type ITuningConfig = {
         useFetchPriorityHints: boolean;
         accumulationBufferStallSize: {
             shortVideoDuration: Milliseconds;
-            shortVideoBufferStallSizeMs: Milliseconds;
-            longVideoBufferStallSizeMs: Milliseconds;
+            shortVideoBufferStallSize: Milliseconds;
+            longVideoBufferStallSize: Milliseconds;
+        };
+        qualityLimitsOnStall: {
+            stallDurationBeforeQualityDecrease: Milliseconds;
+            stallDurationNoDataBeforeQualityDecrease: Milliseconds;
+            stallCountBeforeQualityDecrease: Milliseconds;
+            resetQualityRestrictionTimeout: Milliseconds;
         };
         enableBaseUrlSupport: boolean;
         maxSegmentRetryCount: number;
@@ -86,7 +93,7 @@ export type ITuningConfig = {
             maxTargetOffset: Milliseconds;
             maxTargetOffsetDeviation: Milliseconds;
             playbackCatchupSpeedup: number;
-            isActive: boolean;
+            isActiveOnDefault: boolean;
             delayEstimator: {
                 emaAlpha: number;
                 changeThreshold: number;
@@ -183,6 +190,7 @@ export type ITuningConfig = {
     ignoreAudioRendererError: boolean;
     useEnableSubtitlesParam: boolean;
     useOldMSEDetection: boolean;
+    useHlsLiveNewTextManager: boolean;
 };
 export type IOptionalTuningConfig = RecursivePartial<ITuningConfig> & {
     configName: ITuningConfig['configName'];