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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vkontakte/videoplayer-core",
-  "version": "2.0.163-dev.eb086bcd9.0",
+  "version": "2.0.164-beta.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.eb086bcd9.0"
+    "@vkontakte/videoplayer-shared": "1.0.93-beta.0"
   }
 }

package/types/player/Player.d.ts

@@ -1,6 +1,6 @@
 import type { IOptionalTuningConfig } from "../utils/tuningConfig";
-import type { ILogEntry, Seconds, QualityLimits, VideoQuality, ITracer } from "@vkontakte/videoplayer-shared";
-import { type IAudioStream, type IConfig, type ICueSettings, type IExternalTextTrack, type IPlayer, type ITextTrack, type IVideoStream, type PlaybackRate, PredefinedQualityLimits, type PlayerInfoImpl, type PlayerEventsImpl, type PlayerExperimentalImpl } from "./types";
+import type { ILogEntry, ITracer, QualityLimits, Seconds, VideoQuality } from "@vkontakte/videoplayer-shared";
+import { type IAudioStream, type IConfig, type ICueSettings, type IExternalTextTrack, type IPlayer, type ITextTrack, type IVideoStream, type PlaybackRate, type PlayerEventsImpl, type PlayerExperimentalImpl, type PlayerInfoImpl, PredefinedQualityLimits } from "./types";
 import type { IPlayerOptions } from "../utils/playerOptions";
 export default class Player implements IPlayer {
 	private readonly subscription;
@@ -16,6 +16,7 @@ export default class Player implements IPlayer {
 	private throughputEstimator;
 	private internalsExposure;
 	private isPlaybackStarted;
+	private suppressWillStop;
 	private initedAt;
 	private hasLiveOffsetByPaused;
 	private hasLiveOffsetByPausedTimer;
@@ -40,8 +41,13 @@ export default class Player implements IPlayer {
 	* Позвонялет переиспользовать для другого видео
 	*/
 	private reset;
+	initAudio(config: Omit<IConfig, "container"> & {
+		audioElement?: HTMLAudioElement;
+	}): IPlayer;
 	initVideo(config: IConfig): IPlayer;
-	destroy(): void;
+	destroy(options?: {
+		reportStop?: boolean;
+	}): void;
 	private waitInit;
 	prepare(): IPlayer;
 	play(): IPlayer;

package/types/player/types.d.ts

@@ -1,4 +1,4 @@
-import type { IObservable, IValueObservable, IValueSubject, ILogEntry, Kbps, Milliseconds, Seconds, IRectangle, IError, QualityLimits, VideoQuality, Subject, ValueSubject } from "@vkontakte/videoplayer-shared";
+import type { IError, ILogEntry, IObservable, IRectangle, IValueObservable, IValueSubject, Kbps, Milliseconds, QualityLimits, Seconds, Subject, ValueSubject, VideoQuality } from "@vkontakte/videoplayer-shared";
 import type { Pixel } from "../utils/3d/types";
 import type { dump } from "../utils/playbackTelemetry";
 export interface StartEnd<Unit extends number> {
@@ -16,7 +16,9 @@ export interface IPlayer {
 	/**
 	*  Полная деинициализация плеера
 	*/
-	destroy(): void;
+	destroy(options?: {
+		reportStop?: boolean;
+	}): void;
 	prepare(): IPlayer;
 	play(): IPlayer;
 	pause(): IPlayer;
@@ -251,6 +253,12 @@ export interface PlayerInfoValues {
 	* default value: `Infinity`
 	*/
 	duration$: Seconds;
+	/**
+	* Сумма времени воспроизведенных отрывков
+	*
+	* default value: `0`
+	*/
+	playedTime$: Seconds;
 	muted$: boolean;
 	volume$: number;
 	availableVideoStreams$: IVideoStream[];
@@ -457,8 +465,8 @@ export interface PlayerInfoValues {
 	*/
 	currentAudioSegmentLength$: number;
 }
-export type IPlayerInfo = { [K in keyof PlayerInfoValues] : IValueObservable<PlayerInfoValues[K]> };
-export type PlayerInfoImpl = { [K in keyof PlayerInfoValues] : ValueSubject<PlayerInfoValues[K]> };
+export type IPlayerInfo = { [K in keyof PlayerInfoValues]: IValueObservable<PlayerInfoValues[K]> };
+export type PlayerInfoImpl = { [K in keyof PlayerInfoValues]: ValueSubject<PlayerInfoValues[K]> };
 export interface PlayerEventsImpl {
 	inited$: Subject<void>;
 	ready$: Subject<void>;

package/types/providers/ChromecastProvider/types.d.ts

@@ -1,7 +1,7 @@
 import type { IMetadata, ISources, VideoFormat } from "../../player/types";
 import type { IProviderParams } from "../types";
 import type { IChromecastConnection } from "./ChromecastInitializer/types";
-export interface IParams extends Omit<IProviderParams<ISources>, "skipVideoElVolumeSync$"> {
+export interface IParams extends Omit<IProviderParams<ISources>, "skipVideoElVolumeSync$" | "allocation"> {
 	meta: IMetadata;
 	format: VideoFormat;
 	connection: IChromecastConnection;

package/types/providers/DashLiveProvider/DashLiveProvider.d.ts

@@ -11,7 +11,7 @@ type Params = IProviderParams<IDashURLSource> & {
 export default class DashLiveProvider implements IProvider {
 	private subscription;
 	private volumeSubscription;
-	private video;
+	private readonly allocation;
 	private videoState;
 	private dash;
 	private representations$;

package/types/providers/DashLiveProvider/utils/LiveDashPlayer.d.ts

@@ -5,7 +5,7 @@ import { IRepresentation, State } from "../types";
 import { Subject } from "@vkontakte/videoplayer-shared";
 import { PlaybackState } from "../../../player/types";
 interface IParams {
-	videoElement: HTMLVideoElement;
+	videoElement: HTMLMediaElement;
 	videoState: IStateMachine<State>;
 	playbackState: IStateMachine<PlaybackState>;
 	liveOffset: ILiveOffset;

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

@@ -2,7 +2,7 @@ import type { IAudioTrack, IDashURLSource, IHLSSource, IInternalTextTrack, IVide
 import type { IProviderSubscriptionInfo } from "./lib/types";
 import { ProviderState } from "./lib/types";
 import type { CommonInit, Representation, Stream } from "../utils/parsers/types";
-import type { IProvider, IProviderParams } from "../types";
+import type { IProvider, IProviderAllocationResolution, IProviderParams } from "../types";
 import type { IObservableVideo } from "../utils/HTMLVideoElement/observable";
 import { TrackHistory } from "../../utils/autoSelectTrack";
 import type { IStateMachine } from "../../utils/StateMachine/types";
@@ -26,7 +26,7 @@ export default abstract class BaseDashProvider implements IProvider {
 	protected subscription: ISubscription;
 	protected volumeSubscription: ISubscription;
 	protected videoState: IStateMachine<ProviderState>;
-	protected video: HTMLVideoElement;
+	protected readonly allocation: IProviderAllocationResolution;
 	protected observableVideo: IObservableVideo | null;
 	protected player: Player;
 	protected params: IParams;
@@ -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/dashCmafLiveProvider.d.ts

@@ -3,6 +3,6 @@ import type { IParams } from "./lib/types";
 import BaseDashProvider from "./baseDashProvider";
 export default class DashCmafLiveProvider extends BaseDashProvider {
 	constructor(params: IParams);
-	protected subscribe(): void;
-	protected seek(position: Milliseconds): void;
+	protected override subscribe(): void;
+	protected override seek(position: Milliseconds): void;
 }

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

@@ -1,6 +1,6 @@
 import type { Milliseconds } from "@vkontakte/videoplayer-shared";
 import BaseDashProvider from "./baseDashProvider";
 export default class DashProvider extends BaseDashProvider {
-	protected subscribe(): void;
-	protected seek(position: Milliseconds, forcePrecise: boolean): void;
+	protected override subscribe(): void;
+	protected override seek(position: Milliseconds, forcePrecise: boolean): void;
 }

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

@@ -89,14 +89,14 @@ export declare class Player {
 	private dashMaxTvVideoQuality;
 	private destroyController;
 	constructor(params: Params);
-	initManifest: ReturnType<typeof abortable<[HTMLVideoElement, string, number]>>;
+	initManifest: ReturnType<typeof abortable<[HTMLMediaElement, string, number]>>;
 	updateManifest: ReturnType<typeof abortable<[], Manifest | null>>;
 	setSmartRepresentationSwitch(state: boolean): void;
 	seekLive(nextOffset: Milliseconds): Promise<void>;
 	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

@@ -2,7 +2,7 @@ import type { IAudioTrack, IBaseTrack, IDashURLSource, IHLSSource, IInternalText
 import type { IProviderSubscriptionInfo } from "./lib/types";
 import { ProviderState } from "./lib/types";
 import type { CommonInit, Representation, Stream } from "../utils/parsers/types";
-import type { IProvider, IProviderParams } from "../types";
+import type { IProvider, IProviderAllocationResolution, IProviderParams } from "../types";
 import type { IObservableVideo } from "../utils/HTMLVideoElement/observable";
 import { TrackHistory } from "../../utils/autoSelectTrack";
 import type { IStateMachine } from "../../utils/StateMachine/types";
@@ -26,7 +26,7 @@ export default abstract class BaseDashProvider implements IProvider {
 	protected subscription: ISubscription;
 	protected volumeSubscription: ISubscription;
 	protected videoState: IStateMachine<ProviderState>;
-	protected video: HTMLVideoElement;
+	protected readonly allocation: IProviderAllocationResolution;
 	protected observableVideo: IObservableVideo | null;
 	protected player: BasePlayer;
 	protected params: IParams;
@@ -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/dashCmafLiveProvider.d.ts

@@ -4,7 +4,7 @@ import BaseDashProvider from "./baseDashProvider";
 import { LivePlayer } from "./lib/player/livePlayer";
 export default class DashCmafLiveProvider extends BaseDashProvider {
 	constructor(params: IParams);
-	protected getPlayer(): LivePlayer;
-	protected subscribe(): void;
-	protected seek(position: Milliseconds): void;
+	protected override getPlayer(): LivePlayer;
+	protected override subscribe(): void;
+	protected override seek(position: Milliseconds): void;
 }

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

@@ -2,7 +2,7 @@ import type { Milliseconds } from "@vkontakte/videoplayer-shared";
 import BaseDashProvider from "./baseDashProvider";
 import { Player } from "./lib/player/player";
 export default class DashProvider extends BaseDashProvider {
-	protected subscribe(): void;
-	protected getPlayer(): Player;
-	protected seek(position: Milliseconds, forcePrecise: boolean): void;
+	protected override subscribe(): void;
+	protected override getPlayer(): Player;
+	protected override seek(position: Milliseconds, forcePrecise: boolean): void;
 }

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

@@ -78,6 +78,7 @@ export declare abstract class BaseVirtualBufferManager<T extends Segment> implem
 	setTarget(time: Milliseconds): void;
 	setPreloadOnly(preloadOnly: boolean): void;
 	destroy(): void;
+	protected verifyBufferPlaybackQueue(position: Milliseconds): Promise<void>;
 	protected forceSwitchCondition(oldRepresentation: Representation, newRepresentation: Representation): boolean;
 	protected clearBuffer(): Promise<void>;
 	protected abortDownload(): void;
@@ -94,7 +95,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/buffer/virtualBuffer/byteRangeVirtualBufferManager.d.ts

@@ -5,9 +5,9 @@ import type { NativeBufferManager } from "../nativeBufferManager";
 import type { FetchParamsWithUrl, Priority } from "../../fetcher";
 export declare class ByteRangeVirtualBufferManager extends BaseVirtualBufferManager<ByteRangeSegment> implements IVirtualBufferManager<ByteRangeSegment> {
 	constructor(kind: StreamKind, nativeBufferManager: NativeBufferManager, representations: Representation[], dependencies: Dependencies);
-	protected loadItems(itemsToLoad: IBufferPlaybackQueueItem<ByteRangeSegment>[], representation: Representation, priority?: Priority): Promise<void>;
-	protected selectItemsToLoad(): IBufferPlaybackQueueItem<ByteRangeSegment>[];
-	protected prepareFetchParams(items: IBufferPlaybackQueueItem<ByteRangeSegment>[], representation: Representation): FetchParamsWithUrl;
+	protected override loadItems(itemsToLoad: IBufferPlaybackQueueItem<ByteRangeSegment>[], representation: Representation, priority?: Priority): Promise<void>;
+	protected override selectItemsToLoad(): IBufferPlaybackQueueItem<ByteRangeSegment>[];
+	protected override prepareFetchParams(items: IBufferPlaybackQueueItem<ByteRangeSegment>[], representation: Representation): FetchParamsWithUrl;
 	/**
 	* Закидываем в буфер сегменты атомарнее чем сегмент целиком. Например, по боксам в мпеге и по блокам в вебме.
 	* Таким образом не ждём его полной загрузки и готовы играть его намного быстрее
@@ -16,6 +16,6 @@ export declare class ByteRangeVirtualBufferManager extends BaseVirtualBufferMana
 	* @param loaded – Объём загруженных в dataView данных (всё что больше – пока нули)
 	* @private
 	*/
-	protected onSomeDataLoaded({ downloadingItems, dataView, representationId, globalFrom, loaded, signal }: ISomeDataLoadedCallbackParams<ByteRangeSegment>): Promise<void>;
-	protected updateRepresentationBaseUrl(representation: Representation, newBaseUrl: string): void;
+	protected override onSomeDataLoaded({ downloadingItems, dataView, representationId, globalFrom, loaded, signal }: ISomeDataLoadedCallbackParams<ByteRangeSegment>): Promise<void>;
+	protected override updateRepresentationBaseUrl(representation: Representation, newBaseUrl: string): void;
 }

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

@@ -15,13 +15,13 @@ export declare class LiveVirtualBuffer extends TemplateVirtualBufferManager {
 	proceedLowLatencyLive(): void;
 	getLiveSegmentsToLoadState(manifest: Manifest | null): IRange<Milliseconds> | undefined;
 	getRepresentationInitialTime(): Milliseconds;
-	protected prepareFetchParams(items: IBufferPlaybackQueueItem<TemplateSegment>[], representation: Representation): FetchParamsWithUrl;
-	protected onSomeDataLoaded({ downloadingItems, ...params }: ISomeDataLoadedCallbackParams<TemplateSegment>): Promise<void>;
-	protected onItemFullyDownloaded(downloadedItem: IBufferPlaybackQueueItem<TemplateSegment>): void;
+	protected override prepareFetchParams(items: IBufferPlaybackQueueItem<TemplateSegment>[], representation: Representation): FetchParamsWithUrl;
+	protected override onSomeDataLoaded({ downloadingItems, ...params }: ISomeDataLoadedCallbackParams<TemplateSegment>): Promise<void>;
+	protected override onItemFullyDownloaded(downloadedItem: IBufferPlaybackQueueItem<TemplateSegment>): void;
 	protected updateLowLatencyItemTime(item: IBufferPlaybackQueueItem<TemplateSegment>): void;
 	protected updateLowLatencyLive(latestItem: IBufferPlaybackQueueItem<TemplateSegment>): void;
 	protected parseFeedableSegmentChunk(chunk: DataView): DataView | null;
 	protected getFetchUrl(items: IBufferPlaybackQueueItem<TemplateSegment>[], representation: Representation): URL;
-	protected loadInit(representation: Representation, requestedPriority?: Priority, critical?: boolean): Promise<void>;
+	protected override loadInit(representation: Representation, requestedPriority?: Priority, critical?: boolean): Promise<void>;
 	protected getActualLiveStartingSegments(templateSegmentReference: TemplateSegmentReference): TemplateSegment[];
 }

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

@@ -5,9 +5,9 @@ import type { NativeBufferManager } from "../nativeBufferManager";
 import type { FetchParamsWithUrl, Priority } from "../../fetcher";
 export declare class TemplateVirtualBufferManager extends BaseVirtualBufferManager<TemplateSegment> implements IVirtualBufferManager<TemplateSegment> {
 	constructor(kind: StreamKind, nativeBufferManager: NativeBufferManager, representations: Representation[], dependencies: Dependencies);
-	protected loadItems(itemsToLoad: IBufferPlaybackQueueItem<TemplateSegment>[], representation: Representation, priority?: Priority): Promise<void>;
-	protected selectItemsToLoad(): IBufferPlaybackQueueItem<TemplateSegment>[];
-	protected prepareFetchParams(items: IBufferPlaybackQueueItem<TemplateSegment>[], representation: Representation): FetchParamsWithUrl;
+	protected override loadItems(itemsToLoad: IBufferPlaybackQueueItem<TemplateSegment>[], representation: Representation, priority?: Priority): Promise<void>;
+	protected override selectItemsToLoad(): IBufferPlaybackQueueItem<TemplateSegment>[];
+	protected override prepareFetchParams(items: IBufferPlaybackQueueItem<TemplateSegment>[], representation: Representation): FetchParamsWithUrl;
 	protected getFetchUrl(items: IBufferPlaybackQueueItem<TemplateSegment>[], representation: Representation): URL;
 	/**
 	* Закидываем в буфер сегменты атомарнее чем сегмент целиком. Например, по боксам в мпеге и по блокам в вебме.
@@ -16,6 +16,6 @@ export declare class TemplateVirtualBufferManager extends BaseVirtualBufferManag
 	* @param loaded – Объём загруженных в dataView данных (всё что больше – пока нули)
 	* @private
 	*/
-	protected onSomeDataLoaded({ downloadingItems, dataView, representationId, loaded, signal }: ISomeDataLoadedCallbackParams<TemplateSegment>): Promise<void>;
-	protected updateRepresentationBaseUrl(representation: Representation, newBaseUrl: string): void;
+	protected override onSomeDataLoaded({ downloadingItems, dataView, representationId, loaded, signal }: ISomeDataLoadedCallbackParams<TemplateSegment>): Promise<void>;
+	protected override updateRepresentationBaseUrl(representation: Representation, newBaseUrl: string): void;
 }

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

@@ -14,13 +14,13 @@ import type { Params } from "./types";
 import { State } from "./types";
 import { NativeBufferManager } from "../buffer/nativeBufferManager";
 export declare abstract class BasePlayer {
-	protected element: HTMLVideoElement | null;
+	protected element: HTMLMediaElement | null;
 	protected manifestUrlString: string;
 	protected source: MediaSource | null;
 	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;
@@ -79,8 +79,8 @@ 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]>>;
-	initManifest(element: HTMLVideoElement, manifestBaseUrlString: string, offset: number): Promise<void>;
+	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>;
 	seek(requestedPosition: Milliseconds, forcePrecise?: boolean): 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/DashProviderVirtual/lib/player/livePlayer.d.ts

@@ -14,18 +14,18 @@ export declare class LivePlayer extends BasePlayer {
 	protected livePauseWatchdogSubscription: ISubscription | undefined;
 	protected liveWasInterrupted: boolean;
 	constructor(params: Params);
-	seek(nextOffset: Milliseconds): Promise<void>;
-	initBuffer(): void;
+	override seek(nextOffset: Milliseconds): Promise<void>;
+	override initBuffer(): void;
 	protected forcePositionToRepresentationInitialTime(): Promise<void>;
 	protected tick(): Promise<void>;
-	protected setSourceInitDuration(): void;
-	protected isStallExceeded(timeInWaiting: Milliseconds): boolean;
-	protected restoreAfterDeepStall(): Promise<void>;
-	protected updateManifest(): Promise<Manifest | null>;
-	protected prepareManifestUrlString(manifestBaseUrlString: string, offset: number): string;
+	protected override setSourceInitDuration(): void;
+	protected override isStallExceeded(timeInWaiting: Milliseconds): boolean;
+	protected override restoreAfterDeepStall(): Promise<void>;
+	protected override updateManifest(): Promise<Manifest | null>;
+	protected override prepareManifestUrlString(manifestBaseUrlString: string, offset: number): string;
 	protected updateManifestUrlWithTimeOffset(nextOffset: Milliseconds): void;
-	protected createBuffers(dependencies: Dependencies, initialVideo: Representation["id"], initialAudio?: Representation["id"], sourceHls?: IHLSSource): void;
-	protected initRepresentationSubscriptions(): void;
+	protected override createBuffers(dependencies: Dependencies, initialVideo: Representation["id"], initialAudio?: Representation["id"], sourceHls?: IHLSSource): void;
+	protected override initRepresentationSubscriptions(): void;
 	protected initStreamDurationOnPauseSubscription(): void;
 	protected initLiveDurationSubscriptions(videoBufferManager: LiveVirtualBuffer): void;
 	protected initLiveChangePlaybackRateSubscriptions(): void;

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

@@ -2,10 +2,10 @@ import { BasePlayer } from "./basePlayer";
 import type { Params } from "./types";
 export declare class Player extends BasePlayer {
 	constructor(params: Params);
-	protected prepareManifestUrlString(manifestBaseUrlString: string, _offset: number): string;
-	protected initRepresentationSubscriptions(): void;
-	protected setSourceInitDuration(): void;
-	protected restoreAfterDeepStall(): Promise<void>;
+	protected override prepareManifestUrlString(manifestBaseUrlString: string, _offset: number): string;
+	protected override initRepresentationSubscriptions(): void;
+	protected override setSourceInitDuration(): void;
+	protected override restoreAfterDeepStall(): Promise<void>;
 	protected initDisableStallWatchdogSubscription(): void;
 	protected initEndOfVideoSubscription(): void;
 }

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

@@ -12,7 +12,7 @@ export default class HlsLiveProvider implements IProvider {
 	private subscription;
 	private volumeSubscription;
 	private videoState;
-	private video;
+	private readonly allocation;
 	private params;
 	private textTracksManager;
 	private liveTextManager;

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

@@ -7,7 +7,7 @@ export default class HlsProvider implements IProvider {
 	private subscription;
 	private volumeSubscription;
 	private videoState;
-	private video;
+	private readonly allocation;
 	private params;
 	private textTracksManager;
 	private masterManifest;

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

@@ -1,5 +1,10 @@
 import type { Kbps, IRectangle, VideoQuality } from "@vkontakte/videoplayer-shared";
-import type { IInternalTextTrack } from "../../player/types";
+import type { IInternalTextTrack, IAudioStream } from "../../player/types";
+import type { ITuningConfig } from "../../utils/tuningConfig";
+export interface IInternalAudioStream extends IAudioStream {
+	type: "internal";
+	url: string;
+}
 export type ManifestUrl = {
 	id: string;
 	quality: VideoQuality;
@@ -11,11 +16,8 @@ export type ManifestUrl = {
 export type HLSManifestData = {
 	qualityManifests: ManifestUrl[];
 	textTracks: IInternalTextTrack[];
+	audioStreams: IInternalAudioStream[];
 };
-type ExtractHLSManifestDataConfig = {
-	manifestRetryMaxCount: number;
-	manifestRetryInterval: number;
-	manifestRetryMaxInterval: number;
-};
+type ExtractHLSManifestDataConfig = Pick<ITuningConfig, "manifestRetryInterval" | "manifestRetryMaxCount" | "manifestRetryMaxInterval" | "audioOnly">;
 declare const extractHLSManifestData: (masterManifestUrl: string, baseUrl: string | undefined, config: ExtractHLSManifestDataConfig, init?: RequestInit) => Promise<HLSManifestData>;
 export default extractHLSManifestData;

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

@@ -5,7 +5,7 @@ export default class MpegProvider implements IProvider {
 	private subscription;
 	private volumeSubscription;
 	private videoState;
-	private video;
+	private readonly allocation;
 	private trackUrls;
 	private params;
 	private textTracksManager;

package/types/providers/WebRTCLiveProvider/WebRTCLiveProvider.d.ts

@@ -10,7 +10,7 @@ export default class WebRTCLiveProvider implements IProvider {
 	private readonly volumeSubscription;
 	private readonly params;
 	private log;
-	private video;
+	private readonly allocation;
 	private videoState;
 	private liveStreamClient;
 	private maxSeekBackTime$;

package/types/providers/types.d.ts

@@ -1,8 +1,8 @@
 import type { ITuningConfig } from "../utils/tuningConfig";
-import type { ILogger, ISubject, IValueSubject, Milliseconds, Seconds, IRange, IError, QualityLimits, IWarning, IComponentLogger, ITracer, IRectangle } from "@vkontakte/videoplayer-shared";
+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 { HttpConnectionType, HttpConnectionMetrics, HttpDownloadMetrics, VideoCodec, AudioCodec, IAudioStream, IAudioTrack, ICueSettings, ISources, IVideoStream, SeekState } from "../player/types";
-import type { IExternalTextTrack, IInternalTextTrack, ITextTrack, IVideoTrack, IVolumeState, PlaybackState, PlaybackRate } from "../player/types";
+import type { IExternalTextTrack, IInternalTextTrack, ITextTrack, IVideoTrack, IVolumeState, PlaybackRate, PlaybackState } 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";
@@ -62,10 +62,11 @@ export interface DesiredStateValues {
 	videoTrack: IVideoTrack | undefined;
 	volume: IVolumeState;
 }
-export type IDesiredState = { [K in keyof DesiredStateValues] : IStateMachine<DesiredStateValues[K]> };
+export type IDesiredState = { [K in keyof DesiredStateValues]: IStateMachine<DesiredStateValues[K]> };
 export interface IProviderOutput {
 	position$: IValueSubject<Seconds>;
 	duration$: IValueSubject<Seconds>;
+	playedTime$: IValueSubject<Seconds>;
 	volume$: IValueSubject<IVolumeState>;
 	currentVideoSegmentLength$: IValueSubject<number>;
 	currentAudioSegmentLength$: IValueSubject<number>;
@@ -129,3 +130,7 @@ export interface IProviderOutput {
 	playbackState$: IValueSubject<PlaybackState | string>;
 	getCurrentTime$: IValueSubject<(() => number) | null>;
 }
+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/insufficientBufferRule.d.ts

@@ -7,7 +7,7 @@ type LogsArgs = [forwardBufferDuration: Milliseconds | undefined, thresholdMs: M
 export declare class InsufficientBufferRule extends LimitAboveRule<IVideoTrack, IVideoAbrContext, LogsArgs> implements IAbrRule<IVideoTrack, IVideoAbrContext> {
 	private lastPlaybackResetAtMs;
 	constructor(phaseConfig: RulePhaseConfig);
-	init(initContext: IRuleInitContext): void;
+	override init(initContext: IRuleInitContext): void;
 	execute(context: IVideoAbrContext): IAbrRuleResolution<IVideoTrack>;
 	private selectThroughputAwareFallback;
 	protected createLogMessage(selectedTrack: IVideoTrack, forwardBufferDuration: Milliseconds | undefined, thresholdMs: Milliseconds, triggered: boolean, suppressedByGrace: boolean): string;

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;
@@ -55,7 +58,7 @@ export interface IInitAbrManagerContext {
 	throughput$: IValueSubject<Kbps>;
 	rtt$: IValueSubject<Milliseconds>;
 	throughputVariance$?: IValueSubject<number>;
-	element: HTMLVideoElement;
+	element: HTMLMediaElement;
 	failedVideoTrack: Nullable<IVideoTrack>;
 	abrLogger: IComponentLogger;
 	panelSize?: IRectangle;
@@ -63,7 +66,7 @@ export interface IInitAbrManagerContext {
 export interface IVideoElementAbrManagerContext {
 	observableVideo: IObservableVideo;
 	elementVisible$: IValueSubject<boolean>;
-	elementSizeManager: ElementSizeManager;
+	elementSizeManager?: ElementSizeManager;
 }
 export interface IVideoTracksContext {
 	videoTracksAsc: IVideoTrack[];
@@ -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;