@vkontakte/videoplayer-core 2.0.162-dev.cd80d9e13.0 → 2.0.162-dev.ec26b2599.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vkontakte/videoplayer-core",
-  "version": "2.0.162-dev.cd80d9e13.0",
+  "version": "2.0.162-dev.ec26b2599.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.91-dev.cd80d9e13.0"
+    "@vkontakte/videoplayer-shared": "1.0.91-dev.ec26b2599.0"
   }
 }

package/types/index.d.ts

@@ -1,6 +1,7 @@
 import { VERSION } from "./env";
 import type { IMpegSource, IDashSource, IHLSSource, IDashURLSource, IHLSLiveSource, ISeekRequest, URLSource, RawSource, URLSourceWithSeek } from "./player/types";
-import { VideoFormat, Surface, PredefinedQualityLimits, VideoCodec } from "./player/types";
+import type { VideoCodec } from "./player/types";
+import { VideoFormat, Surface, PredefinedQualityLimits, VideoCodecName } from "./player/types";
 import Player from "./player/Player";
 import type { IPlayer, IPlayerInfo, IPlayerEvents, IConfig, ISources, ICueSettings, IExternalTextTrack, ITextTrack, PlaybackRate, IVideoStream, IAudioStream } from "./player/types";
 import { PlaybackState, ChromecastState, HttpConnectionType } from "./player/types";
@@ -15,4 +16,4 @@ import { Subscription, Observable, Subject, ValueSubject, VideoQuality } from "@
 */
 declare const SDK_VERSION: string;
 export type { IPlayer, IPlayerInfo, IPlayerEvents, IConfig, IOptionalTuningConfig, ILogEntry, ISources, IExternalTextTrack, ITextTrack, ISubscription, IUnsubscriber, IObservable, IEmitter, IValueObservable, IValue, IOperator, IListener, IMpegSource, IDashSource, IDashURLSource, IHLSSource, IHLSLiveSource, URLSource, RawSource, URLSourceWithSeek, ExactVideoQuality, IRange, ISeekRequest, ICueSettings, PlaybackRate, IVideoStream, IAudioStream };
-export { Player, PlaybackState, ChromecastState, HttpConnectionType, Surface, Subscription, VideoFormat, VideoQuality, Observable, Subject, ValueSubject, VERSION, SDK_VERSION, PredefinedQualityLimits, VideoCodec };
+export { Player, PlaybackState, ChromecastState, HttpConnectionType, Surface, Subscription, VideoFormat, VideoQuality, Observable, Subject, ValueSubject, VERSION, SDK_VERSION, PredefinedQualityLimits, VideoCodec, VideoCodecName };

package/types/player/Player.d.ts

@@ -66,6 +66,7 @@ export default class Player implements IPlayer {
 	selectTextTrack(id: ITextTrack["id"] | undefined): IPlayer;
 	setTextTrackCueSettings(settings: ICueSettings): IPlayer;
 	setLiveLowLatency(isLowLatency: boolean): IPlayer;
+	setAdPreloadMode(enabled: boolean): IPlayer;
 	setLooped(isLooped: boolean): IPlayer;
 	toggleChromecast(): void;
 	/**

package/types/player/types.d.ts

@@ -64,6 +64,11 @@ export interface IPlayer {
 	setTextTrackCueSettings(settings: ICueSettings): IPlayer;
 	setLiveLowLatency(isLowLatency: boolean): IPlayer;
 	/**
+	* Включает или выключает режим предзагрузки видео во время воспроизведения рекламы.
+	* Виртуальный буфер скачивает сегменты, но не добавляет их в нативный буфер
+	*/
+	setAdPreloadMode(enabled: boolean): IPlayer;
+	/**
 	* Включает или отключает Chromecast
 	*/
 	toggleChromecast(): void;
@@ -326,10 +331,12 @@ export interface PlayerInfoValues {
 	*/
 	isBuffering$: boolean;
 	/**
-	* Статус только нежелательной буферизации; возникает при опустошении буфера в процессе воспроизведения
+	* Состояние столла. Возникает по истечении stallIgnoreThreshold после старта нежелательной буферизации
+	* Статус только нежелательной буферизации возникает при опустошении буфера в процессе воспроизведения
 	* и не возникает при начальном наполнении буфера или после перемотки
 	*/
 	isStalled$: boolean;
+	stallStartTime$: Milliseconds;
 	/**
 	* Закончилось ли видео
 	*/
@@ -532,6 +539,10 @@ export interface IConfig {
 	volumeMultiplier?: number;
 	panelSize?: IRectangle;
 	isMuted?: boolean;
+	/**
+	* Нужно ли recoverableError обрабатывать как ошибку провайдера или будет снаружи обрабатываться.
+	*/
+	handleNetworkRecoverableErrorAsProviderError?: boolean;
 }
 export interface ISources {
 	[VideoFormat.MPEG]?: IMpegSource;
@@ -599,12 +610,16 @@ export declare enum VideoFormat {
 	HLS_LIVE_CMAF = "HLS_LIVE_CMAF",
 	WEB_RTC_LIVE = "WEB_RTC_LIVE"
 }
-export declare enum VideoCodec {
+export declare enum VideoCodecName {
 	AV1 = "av1",
 	VP9 = "vp9",
 	AVC1 = "avc1",
 	HEV1 = "hev1"
 }
+export interface VideoCodec {
+	name: VideoCodecName;
+	hdr: boolean;
+}
 export declare enum AudioCodec {
 	OPUS = "opus",
 	MP4A = "mp4a"

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

@@ -63,5 +63,6 @@ export default abstract class BaseDashProvider implements IProvider {
 	protected init3DScene: (init: CommonInit) => void;
 	protected destroy3DScene: () => void;
 	protected playIfAllowed(): void;
+	setAdPreloadMode(enabled: boolean): void;
 	destroy(): void;
 }

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

@@ -36,6 +36,7 @@ export interface IVirtualBufferManager<T extends Segment = Segment> {
 	getMutexInfo(): string;
 	setTarget(time: Milliseconds): void;
 	setPreloadOnly(preloadOnly: boolean): void;
+	setAdPreloadMode(enabled: boolean): void;
 	findSegmentStartTime(position: Milliseconds): Milliseconds | undefined;
 	calculateDurationFromSegments(): Milliseconds;
 	getActiveSegmentProgress(): VideoSegmentLoadProgress | undefined;

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

@@ -32,6 +32,7 @@ export declare abstract class BaseVirtualBufferManager<T extends Segment> implem
 	protected bufferPlaybackQueue: IBufferPlaybackQueueItem<T>[];
 	protected downloadingBufferItems: IBufferPlaybackQueueItem<T>[];
 	protected preloadOnly: boolean;
+	protected adPreloadMode: boolean;
 	protected forwardBufferTarget: Milliseconds;
 	protected failedDownloads: number;
 	protected lastDataObtainedTimestampMs: Milliseconds;
@@ -76,6 +77,7 @@ export declare abstract class BaseVirtualBufferManager<T extends Segment> implem
 	get lastDataObtainedTimestamp(): Milliseconds;
 	setTarget(time: Milliseconds): void;
 	setPreloadOnly(preloadOnly: boolean): void;
+	setAdPreloadMode(enabled: boolean): void;
 	destroy(): void;
 	protected forceSwitchCondition(oldRepresentation: Representation, newRepresentation: Representation): boolean;
 	protected clearBuffer(): Promise<void>;

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

@@ -92,6 +92,7 @@ export declare abstract class BasePlayer {
 	getCodecs(): Manifest["codecs"] | undefined;
 	setBufferTarget(time: Milliseconds): void;
 	setPreloadOnly(preloadOnly: boolean): void;
+	setAdPreloadMode(enabled: boolean): void;
 	stop(): void;
 	destroy(): void;
 	updateSourceDurationFromSegments(): void;

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

@@ -15,6 +15,7 @@ interface IParams extends IProviderDependencies {
 	volumeMultiplier?: number;
 	panelSize?: IRectangle;
 	skipVideoElVolumeSync$: ValueSubject<boolean>;
+	handleNetworkRecoverableErrorAsProviderError?: boolean;
 }
 export default class ProviderContainer implements IProviderContainer {
 	current$: IValueSubject<IProviderEntry>;
@@ -40,6 +41,7 @@ export default class ProviderContainer implements IProviderContainer {
 	constructor(params: IParams);
 	init(): void;
 	destroy(): void;
+	setAdPreloadMode(enabled: boolean): void;
 	private initProvider;
 	private reinitProvider;
 	private switchToNextProvider;

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

@@ -13,6 +13,7 @@ export interface IProviderContainer {
 	providerOutput: IProviderOutput;
 	init(): void;
 	destroy(): void;
+	setAdPreloadMode(enabled: boolean): void;
 }
 export type IProviderEntry = {
 	type: VideoFormat;

package/types/providers/ProviderContainer/utils/formatsSupport.d.ts

@@ -1,4 +1,5 @@
-import { VideoFormat, VideoCodec, AudioCodec } from "../../../player/types";
+import type { VideoCodec } from "../../../player/types";
+import { VideoFormat, VideoCodecName, AudioCodec } from "../../../player/types";
 import { type ITuningConfig } from "../../../utils/tuningConfig";
 type VodFormat = VideoFormat.MPEG | VideoFormat.DASH_SEP | VideoFormat.DASH_WEBM | VideoFormat.DASH_WEBM_AV1 | VideoFormat.DASH_STREAMS | VideoFormat.DASH_ONDEMAND | VideoFormat.HLS | VideoFormat.HLS_FMP4 | VideoFormat.HLS_ONDEMAND;
 type Constraints = Pick<ITuningConfig, "webmCodec" | "androidPreferredFormat" | "iosPreferredFormat" | "preferCMAF" | "preferWebRTC" | "preferMultiStream">;
@@ -15,7 +16,13 @@ type AllLiveFormats = [LiveFormat, LiveFormat, LiveFormat, LiveFormat, LiveForma
 export declare const getLiveFormatsPriority: ({ androidPreferredFormat, preferCMAF, preferWebRTC }: Constraints) => AllLiveFormats;
 export declare const getChromeCastFormatsPriority: (live: boolean) => VideoFormat[];
 export declare const selectCodec: (codecs: Set<string>) => string | undefined;
-export declare const filterAvailableVideoCodecs: (codecs: string[]) => VideoCodec[];
+type CodecStream = {
+	codecs: string;
+	hdr?: boolean;
+};
+export declare const filterAvailableVideoCodecs: (streams: CodecStream[], { preferHdr }: {
+	preferHdr: boolean;
+}) => VideoCodec[];
 export declare const filterAvailableAudioCodecs: (codecs: string[]) => AudioCodec[];
-export declare const convertCodecName: <T extends VideoCodec | AudioCodec>(codec: string) => T;
+export declare const convertCodecName: <T extends VideoCodecName | AudioCodec>(codec: string) => T;
 export {};

package/types/utils/tuningConfig.d.ts

@@ -1,4 +1,4 @@
-import type { VideoCodec, VideoFormat } from "../player/types";
+import type { VideoCodecName, VideoFormat } from "../player/types";
 import { WebmCodecStrategy } from "../enums/WebmCodecStrategy";
 import { AndroidPreferredFormat } from "../enums/AndroidPreferredFormat";
 import { IOSPreferredFormat } from "../enums/IOSPreferredFormat";
@@ -36,6 +36,7 @@ export type ITuningConfig = {
 		initialThroughput: Kbps;
 		measureNonSegmentRequests: boolean;
 		smallSampleMinDuration: Milliseconds;
+		cacheThresholdSize: Milliseconds;
 		rttPenaltyRequestSize: Byte;
 		streamMinSampleSize: Byte;
 		streamMinSampleTime: Milliseconds;
@@ -208,7 +209,7 @@ export type ITuningConfig = {
 			budgetFactor: number;
 			fallbackSegmentDurationMs: Milliseconds;
 		};
-		videoStreamRepresentaionsFilter: [VideoQuality, number, VideoCodec][];
+		videoStreamRepresentaionsFilter: [VideoQuality, number, VideoCodecName][];
 		filterOnDemandQualityList: boolean;
 		dashMaxTvVideoQuality: boolean;
 	};
@@ -286,7 +287,17 @@ export type ITuningConfig = {
 	useDelayedPlaybackHangupWithData: boolean;
 	playbackHangupNoDataThreshold: Milliseconds;
 	endGapTolerance: Milliseconds;
+	/**
+	* Время после перехода в состояние buffering, когда мы считаем что происходит stall
+	*/
 	stallIgnoreThreshold: Milliseconds;
+	/**
+	* Стратегия записи столлов
+	* verbose - записываем всё
+	* exclude-threshold - записываем столлы длинее stallIgnoreThreshold, но вычитаем длину stallIgnoreThreshold
+	* include-threshold - записываем столлы длинее stallIgnoreThreshold
+	*/
+	stallHandlingStrategy: "verbose" | "exclude-threshold" | "include-threshold";
 	gapWatchdogInterval: Milliseconds;
 	requestQuick: boolean;
 	/** @deprecated HLS.js удалён, флаг ничего не делает */