@vkontakte/videoplayer-core 2.0.163-dev.eb086bcd9.0 → 2.0.163

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vkontakte/videoplayer-core",
-  "version": "2.0.163-dev.eb086bcd9.0",
+  "version": "2.0.163",
   "author": "vk.com",
   "description": "Videoplayer core library based on the vk.com platform",
   "homepage": "https://vk.com",
@@ -42,6 +42,6 @@
     "**/*.d.ts"
   ],
   "dependencies": {
-    "@vkontakte/videoplayer-shared": "1.0.92-dev.eb086bcd9.0"
+    "@vkontakte/videoplayer-shared": "1.0.92"
   }
 }

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

@@ -57,6 +57,10 @@ export default abstract class BaseDashProvider implements IProvider {
 	protected abstract seek(position: Milliseconds, forcePrecise: boolean): void;
 	protected getProviderSubscriptionInfo(): IProviderSubscriptionInfo;
 	protected subscribe(): void;
+	private syncBufferTarget;
+	private resolveAudioBufferTargetMs;
+	private resolveBufferTargetMs;
+	private getCurrentVideoBitrateKbps;
 	protected selectVideoAudioRepresentations(): [Representation, Representation | undefined] | undefined;
 	protected prepare(manifestOffset?: number): void;
 	protected syncPlayback: () => void;

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

@@ -106,7 +106,8 @@ export declare class Player {
 	getForwardBufferRepresentations(kind: Exclude<StreamKind, StreamKind.TEXT>): Map<Representation["id"], Segment[]> | undefined;
 	getActiveVideoSegmentProgress(): VideoSegmentLoadProgress | undefined;
 	getMpdVideoSegmentDuration(): Milliseconds | undefined;
-	setBufferTarget(time: Milliseconds): void;
+	setBufferTarget(videoTarget: Milliseconds, audioTarget: Milliseconds): void;
+	getVideoForwardBufferDuration(): Milliseconds;
 	getStreams(): Manifest["streams"] | undefined;
 	getCodecs(): Manifest["codecs"] | undefined;
 	setPreloadOnly(preloadOnly: boolean): void;

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

@@ -57,6 +57,10 @@ export default abstract class BaseDashProvider implements IProvider {
 	protected abstract getPlayer(): BasePlayer;
 	protected getProviderSubscriptionInfo(): IProviderSubscriptionInfo;
 	protected subscribe(): void;
+	private syncBufferTarget;
+	private resolveAudioBufferTargetMs;
+	private resolveBufferTargetMs;
+	private getCurrentVideoBitrateKbps;
 	protected selectVideoAudioRepresentations(): [Representation, Representation | undefined] | undefined;
 	protected prepare(manifestOffset?: number): void;
 	protected syncPlayback: () => void;

package/types/providers/DashProviderVirtual/lib/buffer/virtualBuffer/baseVirtualBufferManager.d.ts

@@ -94,7 +94,8 @@ export declare abstract class BaseVirtualBufferManager<T extends Segment> implem
 	protected withinInterval(currentPosition: Milliseconds | undefined, { from, to }: IRange<Milliseconds>, leftTolerance?: Milliseconds, rightTolerance?: Milliseconds): boolean;
 	protected withinAppendInterval(currentPosition: Milliseconds | undefined, { from, to }: IRange<Milliseconds>): boolean;
 	protected withinRemoveInterval(currentPosition: Milliseconds | undefined, { to }: IRange<Milliseconds>): boolean;
-	protected waitExponentialDownloadDelay: ReturnType<typeof abortable>;
+	protected getExponentialDownloadDelay(): ReturnType<typeof abortable>;
+	protected waitExponentialDownloadDelay(): Promise<void>;
 	protected appendSegmentFully(nextPlayingItem: IBufferPlaybackQueueItem<T>, signal: AbortSignal): Promise<void>;
 	protected appendSegmentPartially(nextPlayingItem: IBufferPlaybackQueueItem<T>, signal: AbortSignal): Promise<void>;
 	protected parseFeedableSegmentChunk(chunk: DataView): DataView | null;

package/types/providers/DashProviderVirtual/lib/player/basePlayer.d.ts

@@ -20,7 +20,7 @@ export declare abstract class BasePlayer {
 	protected manifest: Manifest | null;
 	protected tuning: ITuningConfig;
 	protected tracer: ITracer;
-	protected stallTracer: ITracer;
+	protected stallTracer: ITracer | null;
 	protected forceVideoCodec?: VideoCodec;
 	protected stallTimeInWaitingExitAttemptMade: Milliseconds;
 	protected videoBufferManager: IVirtualBufferManager | null;
@@ -91,7 +91,8 @@ export declare abstract class BasePlayer {
 	get isStreamEnded(): boolean;
 	getStreams(): Manifest["streams"] | undefined;
 	getCodecs(): Manifest["codecs"] | undefined;
-	setBufferTarget(time: Milliseconds): void;
+	setBufferTarget(videoTarget: Milliseconds, audioTarget: Milliseconds): void;
+	getVideoForwardBufferDuration(): Milliseconds;
 	setPreloadOnly(preloadOnly: boolean): void;
 	stop(): void;
 	destroy(): void;

package/types/providers/utils/Abr/rules/video/downloadTimeRule.d.ts

@@ -0,0 +1,15 @@
+import type { IAbrRule, IAbrRuleResolution, IVideoAbrContext } from "../../types";
+import type { IVideoTrack } from "../../../../../player/types";
+import type { Kbps, Milliseconds } from "@vkontakte/videoplayer-shared";
+import { LimitAboveRule } from "../limitAboveRule";
+import type { RulePhaseConfig } from "../../controllers/abrPhaseController";
+type DownloadTimeLogsArgs = [estimatedThroughput: Kbps, forwardBufferDuration: Milliseconds, simulatedFinalBufferMs: Milliseconds | null];
+export declare class DownloadTimeRule extends LimitAboveRule<IVideoTrack, IVideoAbrContext, DownloadTimeLogsArgs> implements IAbrRule<IVideoTrack, IVideoAbrContext> {
+	constructor(phaseConfig: RulePhaseConfig);
+	execute(context: IVideoAbrContext): IAbrRuleResolution<IVideoTrack>;
+	private buildReferenceTimeline;
+	private resolveLookaheadCount;
+	private simulate;
+	protected createLogMessage(selectedTrack: IVideoTrack, estimatedThroughput: Kbps, forwardBufferDuration: Milliseconds, simulatedFinalBufferMs: Milliseconds | null): string;
+}
+export {};

package/types/providers/utils/Abr/rules/video/tvDisabledVideoTrackRule.d.ts

@@ -0,0 +1,9 @@
+import type { IAbrRule, IAbrRuleResolution, IVideoAbrContext } from "../../types";
+import type { IVideoTrack } from "../../../../../player/types";
+import { LimitAboveRule } from "../limitAboveRule";
+import type { RulePhaseConfig } from "../../controllers/abrPhaseController";
+export declare class TvDisabledVideoTrackRule extends LimitAboveRule<IVideoTrack, IVideoAbrContext> implements IAbrRule<IVideoTrack, IVideoAbrContext> {
+	constructor(phaseConfig: RulePhaseConfig);
+	execute(context: IVideoAbrContext): IAbrRuleResolution<IVideoTrack>;
+	protected createLogMessage(selectedTrack: IVideoTrack): string;
+}

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

@@ -16,12 +16,14 @@ export declare enum VideoRuleName {
 	Bola = "bola_rule",
 	FitsContainer = "fits_container_rule",
 	FailedVideoTrack = "failed_video_track_rule",
+	TvDisabledVideoTrack = "tv_disabled_video_track_rule",
 	Stalls = "stalls_rule",
 	LowerLimit = "lower_limit_rule",
 	UpperLimit = "upper_limit_rule",
 	Throughput = "throughput_rule",
 	AbandonRequest = "abandon_request_rule",
-	InsufficientBuffer = "insufficient_buffer_rule"
+	InsufficientBuffer = "insufficient_buffer_rule",
+	DownloadTime = "download_time_rule"
 }
 export declare enum AudioRuleName {
 	MinAudioForVideo = "min_audio_for_video_rule",
@@ -39,6 +41,7 @@ export interface IUpdatableAbrManagerContext {
 	desiredVideoTrack: Nullable<IVideoTrack>;
 	limits: QualityLimits;
 	forwardBufferHealth?: number;
+	forwardBufferTarget: Milliseconds;
 	forwardVideoBufferRepresentations: Nullable<Map<Representation["id"], Segment[]>>;
 	forwardAudioBufferRepresentations: Nullable<Map<Representation["id"], Segment[]>>;
 	forwardBufferDuration?: Milliseconds;
@@ -119,6 +122,7 @@ export interface IVideoAbrContext extends IBaseAbrControllerContext {
 	container: Nullable<IRectangle>;
 	panelSize: Nullable<IRectangle>;
 	forwardBufferRepresentations: Nullable<Map<Representation["id"], Segment[]>>;
+	forwardBufferTarget: Milliseconds;
 	limits: QualityLimits;
 	visible: boolean;
 	severeStallOccurred: boolean;

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

@@ -1,5 +1,7 @@
-import type { Milliseconds, Nullable } from "@vkontakte/videoplayer-shared";
+import type { Kbps, Milliseconds, Nullable } from "@vkontakte/videoplayer-shared";
 import type { IAudioTrack, IBaseTrack, IVideoTrack } from "../../../player/types";
+import type { Segment } from "../parsers/types";
+export declare const computeForwardBitrate: (segments: Nullable<Segment[]>) => Kbps;
 export declare const bufferToPlaybackMs: (contentMs: Milliseconds | undefined, playbackRate: number) => Milliseconds;
 export declare enum CompareTrack {
 	Descending = -1,

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

@@ -0,0 +1,3 @@
+import type { ITuningConfig } from "../../utils/tuningConfig";
+import type { Stream } from "./parsers/types";
+export declare const filterStreams: (streams: Stream[], videoElement: HTMLVideoElement, canPlayTypeRestriction: ITuningConfig["dash"]["checkRepresentationCanPlayType"]) => Stream[];

package/types/utils/buffer/dynamicBufferTarget.d.ts

@@ -0,0 +1,10 @@
+import type { Kbps, Milliseconds, Nullable } from "@vkontakte/videoplayer-shared";
+import type { ITuningConfig } from "../tuningConfig";
+type DynamicBufferTargetConfig = ITuningConfig["dash"]["dynamicBufferTarget"];
+export interface IDynamicBufferTargetState {
+	throughputKbps: Kbps;
+	currentBitrateKbps: Nullable<Kbps>;
+	baseTargetMs: Milliseconds;
+}
+export declare const computeDynamicBufferTarget: (state: IDynamicBufferTargetState, config: DynamicBufferTargetConfig) => Milliseconds;
+export {};

package/types/utils/buffer/intersectBufferIntervals.d.ts

@@ -0,0 +1,8 @@
+import type { IRange, Milliseconds } from "@vkontakte/videoplayer-shared";
+/**
+* Вычисляет пересечение двух наборов интервалов.
+* Если один из наборов пуст, возвращается другой набор (т.к. пустой набор означает
+* отсутствие ограничений — например, аудиодорожки может не быть).
+* Оба набора должны быть отсортированы по полю from и не содержать пересекающихся интервалов внутри себя.
+*/
+export declare const intersectBufferIntervals: (range1: IRange<Milliseconds>[], range2: IRange<Milliseconds>[]) => IRange<Milliseconds>[];

package/types/utils/tuningConfig.d.ts

@@ -132,6 +132,8 @@ export type ITuningConfig = {
 		forwardBufferTargetAuto: Milliseconds;
 		forwardBufferTargetManual: Milliseconds;
 		forwardBufferTargetPreload: Milliseconds;
+		audioBufferAheadOfVideoMs: Milliseconds;
+		useDynamicBufferTarget: boolean;
 		seekBiasInTheEnd: Milliseconds;
 		maxSegmentDurationLeftToSelectNextSegment: Milliseconds;
 		minSafeBufferThreshold: number;
@@ -209,9 +211,24 @@ export type ITuningConfig = {
 			budgetFactor: number;
 			fallbackSegmentDurationMs: Milliseconds;
 		};
+		dynamicBufferTarget: {
+			maxMs: Milliseconds;
+			optimisticHeadroomLow: number;
+			optimisticHeadroomHigh: number;
+			weakThroughputLowKbps: Kbps;
+			weakThroughputHighKbps: Kbps;
+			maxFactor: number;
+		};
 		videoStreamRepresentaionsFilter: [VideoQuality, number, VideoCodecName][];
 		filterOnDemandQualityList: boolean;
 		dashMaxTvVideoQuality: boolean;
+		checkRepresentationCanPlayType: Extract<CanPlayTypeResult, "maybe" | "probably"> | false;
+		downloadTime: {
+			minLookaheadSegments: number;
+			safetyFactor: number;
+			bootstrapBufferMs: Milliseconds;
+			demandTolerance: number;
+		};
 	};
 	dashCmafLive: {
 		externalStopControl: boolean;