@vkontakte/videoplayer-core 2.0.163-dev.2ed41cd75.0 → 2.0.163-dev.50a3fed19.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vkontakte/videoplayer-core",
-  "version": "2.0.163-dev.2ed41cd75.0",
+  "version": "2.0.163-dev.50a3fed19.0",
   "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.2ed41cd75.0"
+    "@vkontakte/videoplayer-shared": "1.0.92-dev.50a3fed19.0"
   }
 }

package/types/player/Player.d.ts

@@ -40,6 +40,9 @@ export default class Player implements IPlayer {
 	* Позвонялет переиспользовать для другого видео
 	*/
 	private reset;
+	initAudio(config: Omit<IConfig, "container"> & {
+		audioElement?: HTMLAudioElement;
+	}): IPlayer;
 	initVideo(config: IConfig): IPlayer;
 	destroy(): void;
 	private waitInit;

package/types/player/types.d.ts

@@ -533,9 +533,7 @@ export interface IVolumeState {
 	muted: boolean;
 }
 export interface IConfig {
-	/** @deprecated */
-	container?: string | HTMLElement;
-	readonly allocation?: TAnyAllocation;
+	container: string | HTMLElement;
 	sources: ISources;
 	meta?: IMetadata;
 	failoverHosts?: string[];
@@ -547,26 +545,6 @@ export interface IConfig {
 	*/
 	handleNetworkRecoverableErrorAsProviderError?: boolean;
 }
-export type TAllocationParent = string | HTMLElement;
-export type TAllocationSelf = HTMLAudioElement;
-export interface IAllocation<Parent extends TAllocationParent = TAllocationParent> {
-	readonly strategy: string;
-	readonly parent?: Parent;
-	readonly self?: TAllocationSelf;
-}
-export interface IEmbeddableAllocation<Parent extends TAllocationParent = TAllocationParent> extends IAllocation<Parent> {
-	readonly strategy: "embeddable";
-	readonly parent: Parent;
-	readonly self?: never;
-}
-export type IStringifiedEmbeddableAllocation = IEmbeddableAllocation<string>;
-export type IDirectEmbeddableAllocation = IEmbeddableAllocation<HTMLElement>;
-export interface IPersonalAllocation extends IAllocation {
-	readonly strategy: "personal";
-	readonly self: TAllocationSelf;
-	readonly parent?: never;
-}
-export type TAnyAllocation = IStringifiedEmbeddableAllocation | IDirectEmbeddableAllocation | IPersonalAllocation;
 export interface ISources {
 	[VideoFormat.MPEG]?: IMpegSource;
 	[VideoFormat.DASH]?: IDashURLSource;

package/types/player/utils/selectContainer.d.ts

@@ -0,0 +1,3 @@
+import type { IConfig } from "../types";
+declare const _default: (config: IConfig) => HTMLElement;
+export default _default;

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

@@ -96,7 +96,7 @@ export declare class Player {
 	private updateManifestUrlWithTimeOffset;
 	private updateLiveBuffersFromManifest;
 	private stopStallWatchdogSubscription;
-	initRepresentations: ReturnType<typeof abortable<[Representation["id"], Representation["id"] | undefined, IHLSSource | undefined]>>;
+	initRepresentations: ReturnType<typeof abortable<[Representation["id"] | undefined, Representation["id"] | undefined, IHLSSource | undefined]>>;
 	initBuffer(): void;
 	switchRepresentation(kind: StreamKind, id: Representation["id"], dropBuffer?: boolean): Promise<void>;
 	seek(requestedPosition: Milliseconds, forcePrecise: boolean): Promise<void>;
@@ -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/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;
 	protected forceVideoCodec?: VideoCodec;
 	protected stallTimeInWaitingExitAttemptMade: Milliseconds;
 	protected videoBufferManager: IVirtualBufferManager | null;
@@ -79,7 +79,7 @@ export declare abstract class BasePlayer {
 	protected abstract prepareManifestUrlString(manifestBaseUrlString: string, offset: number): string;
 	protected abstract setSourceInitDuration(): void;
 	protected abstract restoreAfterDeepStall(): Promise<void>;
-	initRepresentations: ReturnType<typeof abortable<[Representation["id"], Representation["id"] | undefined, IHLSSource | undefined]>>;
+	initRepresentations: ReturnType<typeof abortable<[Representation["id"] | undefined, Representation["id"] | undefined, IHLSSource | undefined]>>;
 	initManifest(element: HTMLMediaElement, manifestBaseUrlString: string, offset: number): Promise<void>;
 	initBuffer(): void;
 	switchRepresentation(kind: StreamKind, id: Representation["id"], mode: SwithRepresentationMode): Promise<void>;
@@ -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;
@@ -107,7 +108,7 @@ export declare abstract class BasePlayer {
 	protected parseManifest(manifestString: string): Nullable<Manifest>;
 	protected getResultManifest(manifest: Manifest): Manifest;
 	protected stopStallWatchdogSubscription(): void;
-	protected createBuffers(dependencies: Dependencies, initialVideo: Representation["id"], initialAudio?: Representation["id"], sourceHls?: IHLSSource): void;
+	protected createBuffers(dependencies: Dependencies, initialVideo?: Representation["id"], initialAudio?: Representation["id"], sourceHls?: IHLSSource): void;
 	protected waitStreamToOpen(): Promise<void>;
 	protected initRepresentationSubscriptions(): void;
 	protected initBufferLengthSubscription(): void;

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

@@ -1,5 +1,9 @@
 import type { Kbps, IRectangle, VideoQuality } from "@vkontakte/videoplayer-shared";
-import type { IInternalTextTrack } from "../../player/types";
+import type { IInternalTextTrack, IAudioStream } from "../../player/types";
+export interface IInternalAudioStream extends IAudioStream {
+	type: "internal";
+	url: string;
+}
 export type ManifestUrl = {
 	id: string;
 	quality: VideoQuality;
@@ -11,6 +15,7 @@ export type ManifestUrl = {
 export type HLSManifestData = {
 	qualityManifests: ManifestUrl[];
 	textTracks: IInternalTextTrack[];
+	audioStreams: IInternalAudioStream[];
 };
 type ExtractHLSManifestDataConfig = {
 	manifestRetryMaxCount: number;

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

@@ -3,10 +3,10 @@ import { VideoFormat } from "../../player/types";
 import type { ITuningConfig } from "../../utils/tuningConfig";
 import type { IError, ISubject, IValueSubject, IRectangle } from "@vkontakte/videoplayer-shared";
 import { ValueSubject } from "@vkontakte/videoplayer-shared";
-import type { IDesiredState, IProviderDependencies, IProviderOutput, TProviderAllocation } from "../types";
+import type { IDesiredState, IProviderDependencies, IProviderOutput } from "../types";
 import type { IProviderContainer, IProviderEntry } from "./types";
 interface IParams extends IProviderDependencies {
-	allocation: TProviderAllocation;
+	container: HTMLElement;
 	sources: ISources;
 	meta: IMetadata;
 	failoverHosts: string[];

package/types/providers/types.d.ts

@@ -2,7 +2,7 @@ import type { ITuningConfig } from "../utils/tuningConfig";
 import type { IComponentLogger, IError, ILogger, IRange, IRectangle, ISubject, ITracer, IValueSubject, IWarning, Milliseconds, QualityLimits, Seconds } from "@vkontakte/videoplayer-shared";
 import type { IChromecastInitializer } from "./ChromecastProvider/ChromecastInitializer/types";
 import type { IExternalTextTrack, IInternalTextTrack, ITextTrack, IVideoTrack, IVolumeState, PlaybackRate, PlaybackState } from "../player/types";
-import type { AudioCodec, HttpConnectionMetrics, HttpConnectionType, HttpDownloadMetrics, IAudioStream, IAudioTrack, ICueSettings, IDirectEmbeddableAllocation, IPersonalAllocation, ISources, IVideoStream, SeekState, TAnyAllocation, VideoCodec } from "../player/types";
+import type { AudioCodec, HttpConnectionMetrics, HttpConnectionType, HttpDownloadMetrics, IAudioStream, IAudioTrack, ICueSettings, ISources, IVideoStream, SeekState, VideoCodec } from "../player/types";
 import type { IStateMachine } from "../utils/StateMachine/types";
 import type ThroughputEstimator from "../utils/ThroughputEstimator";
 import type { Scene3D } from "../utils/3d/Scene3D";
@@ -21,7 +21,7 @@ export interface IProviderDependencies {
 	};
 }
 export interface IProviderParams<TSourceType> extends IProviderDependencies {
-	readonly allocation: TProviderAllocation;
+	container: HTMLElement;
 	source: TSourceType;
 	desiredState: IDesiredState;
 	output: IProviderOutput;
@@ -130,7 +130,6 @@ export interface IProviderOutput {
 	playbackState$: IValueSubject<PlaybackState | string>;
 	getCurrentTime$: IValueSubject<(() => number) | null>;
 }
-export type TProviderAllocation = Extract<TAnyAllocation, IDirectEmbeddableAllocation | IPersonalAllocation>;
 export interface IProviderAllocationResolution {
 	readonly target: HTMLMediaElement;
 	readonly video: HTMLVideoElement | null;

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/HTMLVideoElement/pool.d.ts

@@ -1,7 +1,7 @@
 import type { ITuningConfig } from "../../../utils/tuningConfig";
 export type AllocateConstraints = Pick<ITuningConfig, "audioVideoSyncRate" | "disableYandexPiP" | "clearVideoElementInnerHTML" | "reuseOwnVideoElement">;
 type DisposeConstraints = Pick<ITuningConfig, "keepVideoElement" | "clearVideoElementInnerHTML" | "reuseOwnVideoElement">;
-export declare const allocate: (container: HTMLElement, { audioVideoSyncRate, disableYandexPiP, clearVideoElementInnerHTML, reuseOwnVideoElement }: AllocateConstraints) => HTMLVideoElement;
+export declare const allocate: (container: HTMLElement, { audioVideoSyncRate, disableYandexPiP, clearVideoElementInnerHTML, reuseOwnVideoElement }: ITuningConfig) => HTMLVideoElement;
 export declare const initializeAudio: (element: HTMLAudioElement) => HTMLAudioElement;
 export declare const dispose: (element: HTMLMediaElement, constraints: DisposeConstraints) => void;
 export {};

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: HTMLMediaElement, canPlayTypeRestriction: ITuningConfig["dash"]["checkRepresentationCanPlayType"]) => Stream[];

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

@@ -1,3 +1,12 @@
-import type { IProviderAllocationResolution, TProviderAllocation } from "../types";
-import { type AllocateConstraints } from "./HTMLVideoElement/pool";
-export declare function resolveAllocation(allocation: TProviderAllocation, constraints: AllocateConstraints): IProviderAllocationResolution;
+import type { ITuningConfig } from "../../utils/tuningConfig";
+import type { IProviderAllocationResolution } from "../types";
+/**
+* Разрешает аллокацию медиа-элемента для провайдера.
+*
+* Возвращает два поля:
+* - `target: HTMLMediaElement` — элемент для управления воспроизведением (play, pause, load, currentTime и т.д.).
+*   Всегда присутствует, тип определяется входным контейнером: HTMLVideoElement для видео, HTMLAudioElement для аудио.
+* - `video: HTMLVideoElement | null` — видеоэлемент для UI-специфичных операций (textTracks, getBoundingClientRect).
+*   Равен `target` если это HTMLVideoElement, иначе `null` для аудио-режима.
+*/
+export declare function resolveAllocation(container: HTMLElement, tuningConfig: ITuningConfig): IProviderAllocationResolution;

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/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;
@@ -413,6 +430,8 @@ export type ITuningConfig = {
 	* Устанавливаем длительность видео на основе последнего сегмента.
 	*/
 	useDurationFromSegments: boolean;
+	/** включен режим проигрывания только аудио (без видео) */
+	audioOnly: boolean;
 };
 export type IOptionalTuningConfig = RecursivePartial<ITuningConfig>;
 export declare const fillDefault: (partial: IOptionalTuningConfig) => ITuningConfig;

package/types/player/utils/extractEmbeddableAllocation.d.ts

@@ -1,3 +0,0 @@
-import type { IConfig, IDirectEmbeddableAllocation } from "../types";
-declare const _default: (config: IConfig) => IDirectEmbeddableAllocation | null;
-export default _default;