@vkontakte/videoplayer-core 2.0.117-dev.d9cc3d97.0 → 2.0.118-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vkontakte/videoplayer-core",
-  "version": "2.0.117-dev.d9cc3d97.0",
+  "version": "2.0.118-beta.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.ed1df4eb.0",
+    "@vkontakte/videoplayer-shared": "1.0.50-beta.0",
     "hls.js": "~1.4.7"
   }
 }

package/types/player/Player.d.ts

@@ -49,6 +49,7 @@ export default class Player implements IPlayer {
         atLiveDurationEdge$: ValueSubject<boolean | undefined>;
         liveTime$: ValueSubject<number | undefined>;
         liveBufferTime$: ValueSubject<number | undefined>;
+        liveLatency$: ValueSubject<number | undefined>;
         currentFormat$: ValueSubject<VideoFormat | undefined>;
         availableTextTracks$: ValueSubject<ITextTrack[]>;
         currentTextTrack$: ValueSubject<string | undefined>;
@@ -102,7 +103,6 @@ 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;

package/types/player/types.d.ts

@@ -71,8 +71,6 @@ export interface IPlayer {
         tuningConfigName$: IValueSubject<string[]>;
         enableDebugTelemetry$: IValueSubject<boolean>;
         dumpTelemetry: (receiver: (value: Record<string, any>) => void) => void;
-        /** функция вычисления текущей позиции проигрывания из под провадера (если расчет нестандартный) */
-        getCurrentTime$: IValueSubject<(() => number) | null>;
     };
 }
 /**
@@ -314,6 +312,10 @@ export interface IPlayerInfo {
      * Буферное время текущего кадра
      */
     liveBufferTime$: IValueObservable<Milliseconds | undefined>;
+    /**
+     * Задержка лайв стрима
+     */
+    liveLatency$: IValueObservable<Milliseconds | undefined>;
     /**
      * Формат, в котором сейчас воспроизводится видео
      */
@@ -490,6 +492,7 @@ export interface IVideoTrack extends IBaseTrack {
     quality: VideoQuality;
     size?: IRectangle;
     fps?: number;
+    streamId?: IVideoStream['id'];
 }
 export interface IAudioStream {
     id: string;

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

@@ -14,6 +14,7 @@ export interface Gap extends IRange<Milliseconds> {
     representation: Representation['id'];
 }
 export declare class BufferManager {
+    currentLiveSegmentServerLatency$: IValueSubject<number>;
     currentSegmentLength$: IValueSubject<number>;
     onLastSegment$: IValueSubject<boolean>;
     fullyBuffered$: IValueSubject<boolean>;
@@ -51,7 +52,6 @@ export declare class BufferManager {
     private baseUrlsIndex;
     private compatibilityMode;
     private preloadOnly;
-    private bufferAccumulation;
     private isLive;
     private liveUpdateSegmentIndex;
     private liveInitialAdditionalOffset;
@@ -73,8 +73,6 @@ 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/parsers/mpeg/boxes/uuid.d.ts

@@ -1,6 +1,11 @@
 import { Box } from '../../../../../../providers/DashProvider/lib/parsers/mpeg/box';
-/**
- * TODO: in future this box will be needed to calculate real LL live delay
- */
+import { BoxParser } from '../../../../../../providers/DashProvider/lib/parsers/mpeg/BoxParser';
+import { Milliseconds } from '@vkontakte/videoplayer-shared';
 export declare class UuidBox extends Box {
+    serverDataReceivedTimestamp: Milliseconds;
+    serverDataPreparedTime: Milliseconds;
+    private readonly ondemandPrefix;
+    private readonly ondemandDataReceivedKey;
+    private readonly ondemandDataPreparedKey;
+    constructor(source: DataView, boxParser: BoxParser);
 }

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

@@ -46,13 +46,14 @@ export declare class Player {
     liveDuration$: IValueSubject<Milliseconds>;
     liveAvailabilityStartTime$: IValueSubject<Seconds | undefined>;
     bufferLength$: IValueSubject<Milliseconds>;
+    liveLatency$: IValueSubject<Milliseconds | undefined>;
     liveLoadBufferLength$: IValueSubject<Milliseconds>;
     livePositionFromPlayer$: IValueSubject<number>;
     isLowLatency$: IValueSubject<boolean>;
     isActiveLowLatency$: IValueSubject<boolean>;
     currentStallDuration$: IValueSubject<Milliseconds>;
     videoLastDataObtainedTimestamp$: IValueSubject<Milliseconds>;
-    private liveEstimatedDelay;
+    private liveBuffer;
     private isUpdatingLive;
     private isJumpGapAfterSeekLive;
     private liveLastSeekOffset;

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

@@ -1,7 +1,7 @@
 import { Byte, Kbps, Milliseconds, IRange, IObservable, ISubject, IValueSubject } from '@vkontakte/videoplayer-shared';
 import { IDesiredState, IProviderOutput, IProviderParams } from '../../../providers/types';
 import { IObservableVideo } from '../../../providers/utils/HTMLVideoElement/observable';
-import { IDashURLSource } from '../../../player/types';
+import { IDashURLSource, IVideoStream } from '../../../player/types';
 export declare enum StreamKind {
     VIDEO = "video",
     AUDIO = "audio",
@@ -30,6 +30,7 @@ export interface Representation {
     height: number;
     fps?: number;
     quality?: string;
+    streamId?: IVideoStream['id'];
 }
 export interface TextRepresentation extends Representation {
     language: string;
@@ -37,6 +38,10 @@ export interface TextRepresentation extends Representation {
     url: string;
     isAuto: boolean;
 }
+export interface ServerLatencyTimestamps {
+    serverDataReceivedTimestamp?: Milliseconds;
+    serverDataPreparedTime?: Milliseconds;
+}
 export declare enum SegmentReferencingType {
     BYTE_RANGE = "byteRange",
     TEMPLATE = "template"
@@ -164,6 +169,7 @@ export type MpegInit = CommonInit;
 export type WebmParser = GenericContainerParser<WebmInit>;
 export type MpegParser = GenericContainerParser<MpegInit> & {
     getChunkEndTime(data: DataView, timescale: number): Milliseconds;
+    getServerLatencyTimestamps(view: DataView): ServerLatencyTimestamps;
     getTimescaleFromIndex(view: DataView): number | undefined;
 };
 export type ContainerParser = WebmParser | MpegParser;

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

@@ -1,6 +1,6 @@
 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 representationToVideoTrack: ({ id, width, height, bitrate, fps, quality: qualityString, streamId }: Representation) => IVideoTrack | undefined;
 export declare const representationToAudioTrack: ({ id, bitrate }: Representation) => IAudioTrack;
 export declare const representationToTextTrack: ({ language, label }: Stream, { id, url, isAuto }: Representation & {
     url: string;

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

@@ -13,7 +13,6 @@ export default class HlsLiveProvider implements IProvider {
     private video;
     private params;
     private textTracksManager;
-    private liveTextManager;
     private masterManifest;
     private manifests$;
     private maxSeekBackTime$;
@@ -27,6 +26,5 @@ 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, init?: RequestInit) => Promise<HLSManifestData>;
+declare const extractHLSManifestData: (masterManifestUrl: string, baseUrl: string | undefined, config: ExtractHLSManifestDataConfig) => Promise<HLSManifestData>;
 export default extractHLSManifestData;

package/types/providers/types.d.ts

@@ -70,6 +70,7 @@ export interface IProviderOutput {
     isLowLatency$: IValueSubject<boolean | undefined>;
     liveTime$: IValueSubject<Milliseconds | undefined>;
     liveBufferTime$: IValueSubject<Milliseconds | undefined>;
+    liveLatency$: IValueSubject<Milliseconds | undefined>;
     hostname$: IValueSubject<string | undefined>;
     httpConnectionType$: IValueSubject<HttpConnectionType | undefined>;
     httpConnectionReused$: IValueSubject<boolean | undefined>;
@@ -91,5 +92,4 @@ export interface IProviderOutput {
     inPiP$: IValueSubject<boolean>;
     inFullscreen$: IValueSubject<boolean>;
     playbackState$: IValueSubject<PlaybackState | string>;
-    getCurrentTime$: IValueSubject<(() => number) | null>;
 }

package/types/utils/smoothedValue/smoothedValueFactory.d.ts

@@ -2,5 +2,5 @@ import { ITuningConfig } from '../../utils/tuningConfig';
 import { ISmoothedValue } from '../../utils/smoothedValue/types';
 export declare class SmoothedValueFactory {
     static getSmoothedValue(initialThroughput: number, fastDirection: 1 | -1, tuning: ITuningConfig['throughputEstimator']): ISmoothedValue;
-    static getLiveEstimatedDelaySmoothedValue(initialBufferLength: number, tuning: ITuningConfig['dashCmafLive']['lowLatency']['delayEstimator']): ISmoothedValue;
+    static getLiveBufferSmoothedValue(initialBufferLength: number, tuning: ITuningConfig['dashCmafLive']['lowLatency']['bufferEstimator']): ISmoothedValue;
 }

package/types/utils/tuningConfig.d.ts

@@ -69,11 +69,6 @@ export type ITuningConfig = {
         enableSubSegmentBufferFeeding: boolean;
         bufferEmptinessTolerance: Milliseconds;
         useFetchPriorityHints: boolean;
-        accumulationBufferStallSize: {
-            shortVideoDuration: Milliseconds;
-            shortVideoBufferStallSize: Milliseconds;
-            longVideoBufferStallSize: Milliseconds;
-        };
         qualityLimitsOnStall: {
             stallDurationBeforeQualityDecrease: Milliseconds;
             stallDurationNoDataBeforeQualityDecrease: Milliseconds;
@@ -94,7 +89,7 @@ export type ITuningConfig = {
             maxTargetOffsetDeviation: Milliseconds;
             playbackCatchupSpeedup: number;
             isActiveOnDefault: boolean;
-            delayEstimator: {
+            bufferEstimator: {
                 emaAlpha: number;
                 changeThreshold: number;
                 deviationDepth: number;
@@ -153,7 +148,6 @@ export type ITuningConfig = {
     useHlsJs: boolean;
     useNativeHLSTextTracks: boolean;
     useManagedMediaSource: boolean;
-    useNewPruneBufferStrategy: boolean;
     useNewSwitchTo: boolean;
     useSafariEndlessRequestBugfix: boolean;
     isAudioDisabled: boolean;
@@ -190,7 +184,6 @@ export type ITuningConfig = {
     ignoreAudioRendererError: boolean;
     useEnableSubtitlesParam: boolean;
     useOldMSEDetection: boolean;
-    useHlsLiveNewTextManager: boolean;
 };
 export type IOptionalTuningConfig = RecursivePartial<ITuningConfig> & {
     configName: ITuningConfig['configName'];

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

@@ -1,42 +0,0 @@
-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 {};