@vkontakte/videoplayer-core 2.0.180 → 2.0.181-dev.820dcf4a0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vkontakte/videoplayer-core",
-  "version": "2.0.180",
+  "version": "2.0.181-dev.820dcf4a0.0",
   "author": "vk.ru",
   "description": "Videoplayer core library based on the vk.ru platform",
   "homepage": "https://vk.ru",
@@ -42,6 +42,6 @@
     "**/*.d.ts"
   ],
   "dependencies": {
-    "@vkontakte/videoplayer-shared": "1.0.109"
+    "@vkontakte/videoplayer-shared": "1.0.110-dev.820dcf4a0.0"
   }
 }

package/types/index.d.ts

@@ -3,7 +3,7 @@ import type { IMpegSource, IDashSource, IHLSSource, IDashURLSource, IHLSLiveSour
 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, StartEnd, HttpConnectionMetrics, HttpDownloadMetrics } from "./player/types";
+import type { IPlayer, IPlayerInfo, IPlayerEvents, IConfig, ISources, IExternalTextTrack, ITextTrack, PlaybackRate, IVideoStream, IAudioStream, StartEnd, HttpConnectionMetrics, HttpDownloadMetrics } from "./player/types";
 import { PlaybackState, ChromecastState, HttpConnectionType } from "./player/types";
 import type { IOptionalTuningConfig } from "./utils/tuningConfig";
 export { clientChecker, isMobile } from "./utils/ClientChecker";
@@ -15,5 +15,5 @@ import { Subscription, Observable, Subject, ValueSubject, VideoQuality } from "@
 * @deprecated
 */
 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, StartEnd, HttpConnectionMetrics, HttpDownloadMetrics };
+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, PlaybackRate, IVideoStream, IAudioStream, StartEnd, HttpConnectionMetrics, HttpDownloadMetrics };
 export { Player, PlaybackState, ChromecastState, HttpConnectionType, Surface, Subscription, VideoFormat, VideoQuality, Observable, Subject, ValueSubject, VERSION, SDK_VERSION, PredefinedQualityLimits, VideoCodec, VideoCodecName };

package/types/player/Player.d.ts

@@ -1,6 +1,6 @@
 import type { IOptionalTuningConfig } from "../utils/tuningConfig";
 import type { ILogEntry, ITracer, QualityLimits, Seconds, VideoQuality, DebugData } 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 IAudioStream, type IConfig, 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;
@@ -71,7 +71,6 @@ export default class Player implements IPlayer {
 	setPlaybackRate(playbackRate: PlaybackRate): IPlayer;
 	setExternalTextTracks(tracks: Omit<IExternalTextTrack, "type">[]): IPlayer;
 	selectTextTrack(id: ITextTrack["id"] | undefined): IPlayer;
-	setTextTrackCueSettings(settings: ICueSettings): IPlayer;
 	setLiveLowLatency(isLowLatency: boolean): IPlayer;
 	setLooped(isLooped: boolean): IPlayer;
 	toggleChromecast(): void;

package/types/player/types.d.ts

@@ -56,8 +56,10 @@ export interface IPlayer {
 	setPlaybackRate(playbackRate: PlaybackRate): IPlayer;
 	setLooped(isLooped: boolean): IPlayer;
 	setExternalTextTracks(tracks: Omit<IExternalTextTrack, "type">[]): IPlayer;
+	/**
+	* Запоминает выбранную дорожку субтитров. Отрисовка субтитров на стороне UI
+	*/
 	selectTextTrack(id: ITextTrack["id"] | undefined): IPlayer;
-	setTextTrackCueSettings(settings: ICueSettings): IPlayer;
 	setLiveLowLatency(isLowLatency: boolean): IPlayer;
 	/**
 	* Включает или отключает Chromecast
@@ -407,7 +409,7 @@ export interface PlayerInfoValues {
 	*/
 	availableTextTracks$: ITextTrack[];
 	/**
-	* Выбранная и отображаемая дорожка субтитров
+	* Выбранная дорожка субтитров
 	*/
 	currentTextTrack$: ITextTrack["id"] | undefined;
 	/**
@@ -685,12 +687,6 @@ export interface IInternalTextTrack extends ITextTrackBase {
 	url: string;
 }
 export type ITextTrack = IExternalTextTrack | IInternalTextTrack;
-export interface ICueSettings {
-	align?: "left" | "center" | "right";
-	position?: number | "auto";
-	size?: number;
-	line?: number | "auto";
-}
 export declare enum VideoDestination {
 	SCREEN = "SCREEN",
 	CHROMECAST = "CHROMECAST"

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

@@ -8,7 +8,7 @@ import type { IStateMachine } from "../../utils/StateMachine/types";
 import type { ExactVideoQuality, ISubscription, ITracer, Milliseconds, Nullable } from "@vkontakte/videoplayer-shared";
 import { Player } from "./lib/player";
 import DroppedFramesManager from "../utils/HTMLVideoElement/DroppedFramesManager";
-import TextTrackManager from "../utils/HTMLVideoElement/TextTrackManager";
+import TextTrackManager from "../utils/TextTrackManager";
 import StallsManager from "../utils/StallsManager";
 import { AbrManager } from "../utils/Abr/abrManager";
 import { ElementSizeManager } from "../utils/HTMLVideoElement/ElementSizeManager";

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

@@ -7,7 +7,7 @@ import type { IObservableMediaElement } from "../utils/HTMLVideoElement/observab
 import type { IStateMachine } from "../../utils/StateMachine/types";
 import type { ExactVideoQuality, ISubscription, ITracer, Milliseconds, Nullable } from "@vkontakte/videoplayer-shared";
 import DroppedFramesManager from "../utils/HTMLVideoElement/DroppedFramesManager";
-import TextTrackManager from "../utils/HTMLVideoElement/TextTrackManager";
+import TextTrackManager from "../utils/TextTrackManager";
 import StallsManager from "../utils/StallsManager";
 import { ElementSizeManager } from "../utils/HTMLVideoElement/ElementSizeManager";
 import type { BasePlayer } from "./lib/player/basePlayer";

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, ISources, IVideoStream, SeekState, VideoCodec } from "../player/types";
+import type { AudioCodec, HttpConnectionMetrics, HttpConnectionType, HttpDownloadMetrics, IAudioStream, IAudioTrack, ISources, IVideoStream, SeekState, VideoCodec } from "../player/types";
 import type { IStateMachine } from "../utils/StateMachine/types";
 import type ThroughputEstimator from "../utils/ThroughputEstimator";
 export interface IProvider {
@@ -44,7 +44,6 @@ export interface DesiredStateValues {
 	playbackRate: PlaybackRate;
 	playbackState: PlaybackState;
 	seekState: SeekState;
-	textTrackCuesSettings: ICueSettings;
 	videoStream: IVideoStream | undefined;
 	/**
 	* Порядок смены видео дорожек:
@@ -76,7 +75,6 @@ export interface IProviderOutput {
 	availableAudioTracks$: IValueSubject<IAudioTrack[]>;
 	availableAudioCodecs$: IValueSubject<AudioCodec[]>;
 	availableTextTracks$: IValueSubject<ITextTrack[]>;
-	currentTextTrack$: IValueSubject<ITextTrack["id"] | undefined>;
 	isAudioAvailable$: IValueSubject<boolean>;
 	autoVideoTrackLimits$: IValueSubject<QualityLimits | undefined>;
 	autoVideoTrackLimitingAvailable$: IValueSubject<boolean>;

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

@@ -1,23 +1,21 @@
 import type { IAbrRule, IAbrRuleResolution, IVideoAbrContext, RuleLogData } from "../../types";
 import type { IVideoTrack } from "../../../../../player/types";
-import type { Kbps, Nullable } from "@vkontakte/videoplayer-shared";
 import { LimitAboveRule } from "../limitAboveRule";
-import type { ITuningConfig } from "../../../../../utils/tuningConfig";
 import type { RulePhaseConfig } from "../../controllers/abrPhaseController";
-type StallLogsArgs = [forwardBufferHealth: Nullable<number>, playbackRate: number, reserve: Kbps, playbackRateFactor: number, bitrateFactor: number, tuning: ITuningConfig];
-export declare class StallsRule extends LimitAboveRule<IVideoTrack, IVideoAbrContext, StallLogsArgs> implements IAbrRule<IVideoTrack, IVideoAbrContext> {
-	private severeStallOccurred;
-	private qualityRestrictionTimer;
-	private lastStallDurationRestriction;
+export declare class StallsRule extends LimitAboveRule<IVideoTrack, IVideoAbrContext, []> implements IAbrRule<IVideoTrack, IVideoAbrContext> {
+	private wasSevereStall;
+	private restrictedInCurrentStall;
+	private stalledQuality;
+	private stallsByQuality;
+	private recoveryStartedAt;
 	private maxQualityLimitOnStall;
-	private predictedThroughputWithoutData;
 	private restrictionTracer;
 	private restrictionStartedAt;
 	constructor(phaseConfig: RulePhaseConfig);
 	execute(context: IVideoAbrContext): IAbrRuleResolution<IVideoTrack>;
-	protected createLogData(selectedTrack: IVideoTrack, forwardBufferHealth: Nullable<number>, playbackRate: number, reserve: Kbps, playbackRateFactor: number, bitrateFactor: number, tuning: ITuningConfig): RuleLogData;
+	protected createLogData(selectedTrack: IVideoTrack): RuleLogData;
+	private trackStallEpisode;
+	private resolveQualityLimit;
 	private traceRestrictionSet;
 	private traceRestrictionReset;
-	private updateStallQualityLimits;
 }
-export {};

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

@@ -1,9 +1,8 @@
-import type { ExactVideoQuality, IObservable, IValueSubject, Milliseconds, Kbps, Seconds } from "@vkontakte/videoplayer-shared";
+import type { IObservable, IValueSubject, Milliseconds, Seconds } from "@vkontakte/videoplayer-shared";
 import type { IVideoTrack } from "../../player/types";
 import type { ITuningConfig } from "../../utils/tuningConfig";
 interface IConnectData {
 	videoLastDataObtainedTimestamp$: IValueSubject<Milliseconds>;
-	throughput$: IValueSubject<number>;
 	rtt$: IValueSubject<Milliseconds>;
 	isBuffering$: IObservable<boolean>;
 	isSeeked$: IObservable<boolean>;
@@ -18,7 +17,6 @@ interface IConnectData {
 declare class StallsManager {
 	private currentStallDuration$;
 	private videoLastDataObtainedTimestamp$;
-	private throughput$;
 	private rtt$;
 	private tuning;
 	private abrParams;
@@ -26,20 +24,15 @@ declare class StallsManager {
 	private isSeeked$;
 	private isBuffering$;
 	private isPaused;
-	private maxQualityLimit;
 	private lastUniqueVideoTrackSelected;
 	private currentStallsCount;
 	private sumStallsDuration;
 	private lastStallDuration;
 	private providerStartWatchingTimestamp;
 	private lastUniqueVideoTrackSelectedTimestamp;
-	private predictedThroughputWithoutData;
-	private qualityRestrictionTimer;
 	private subscription;
 	severeStallOccurred$: IValueSubject<boolean>;
 	init(data: IConnectData): void;
-	get videoMaxQualityLimit(): ExactVideoQuality | undefined;
-	get predictedThroughput(): Kbps;
 	get abrTuningParams(): ITuningConfig["autoTrackSelection"];
 	set lastVideoTrackSelected(lastUniqueVideoTrackSelected: IVideoTrack);
 	destroy(): void;

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

@@ -0,0 +1,16 @@
+import type { IExternalTextTrack, IInternalTextTrack } from "../../player/types";
+import type { IDesiredState, IProviderOutput } from "../types";
+declare class TextTrackManager {
+	private available$;
+	private error$;
+	private subscription;
+	private externalTracks;
+	private internalTracks;
+	private emittedIds;
+	connect(desiredState: Pick<IDesiredState, "externalTextTracks" | "internalTextTracks">, providerOutput: Pick<IProviderOutput, "availableTextTracks$" | "error$">): void;
+	setExternal(tracks: IExternalTextTrack[]): void;
+	setInternal(tracks: IInternalTextTrack[]): void;
+	destroy(): void;
+	private emitAvailable;
+}
+export default TextTrackManager;

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

@@ -1,3 +1,4 @@
 import type { Milliseconds } from "@vkontakte/videoplayer-shared";
 declare const _default: (timeRanges: TimeRanges, position: Milliseconds, tolerance?: number) => boolean;
 export default _default;
+export declare const isTimeRangeBuffered: (timeRanges: TimeRanges, from: Milliseconds, to: Milliseconds) => boolean;

package/types/utils/tuningConfig.d.ts

@@ -143,7 +143,6 @@ export type ITuningConfig = {
 		enabled: boolean;
 		ignoreDynamicAbrForShortVideo: boolean;
 		stallDurationNoDataBeforeQualityDecrease: Milliseconds;
-		stallDurationToBeCount: Milliseconds;
 		stallCountBeforeQualityDecrease: Milliseconds;
 		resetQualityRestrictionTimeout: Milliseconds;
 		ignoreStallsOnSeek: boolean;
@@ -283,6 +282,7 @@ export type ITuningConfig = {
 		* дешевле замершего воспроизведения.
 		*/
 		recoverStuckSegmentLoading: boolean;
+		skipReloadOfFullyBufferedPartiallyEjectedSegments: boolean;
 	};
 	dashCmafLive: {
 		externalStopControl: boolean;
@@ -385,7 +385,6 @@ export type ITuningConfig = {
 	/** @deprecated HLS.js удалён, флаг ничего не делает */
 	useHlsJs: boolean;
 	disableHlsOnDesktop: boolean;
-	useNativeHLSTextTracks: boolean;
 	useNewSwitchTo: boolean;
 	alwaysAbortPreviousSwitch: boolean;
 	useDashProviderVirtual: boolean;

package/types/providers/utils/HTMLVideoElement/TextTrackManager.d.ts

@@ -1,32 +0,0 @@
-import type { IExternalTextTrack, IInternalTextTrack, ITextTrack } from "../../../player/types";
-import type { IDesiredState, IProviderOutput } from "../../types";
-/**
-* TODO: сейчас externalTextTracks и internalTextTracks записываются в availableTextTracks отсюда
-* нужно будет выпилить этот класс за исключением этой логики,
-* когда перестанет быть необходима поддержка браузерных субтитров
-*/
-declare class TextTrackManager {
-	private available$;
-	private current$;
-	private error$;
-	private video;
-	private cueSettings;
-	private subscription;
-	private externalTracks;
-	private internalTracks;
-	private baseURL?;
-	constructor(baseURL?: string);
-	connect(video: HTMLVideoElement, desiredState: Pick<IDesiredState, "externalTextTracks" | "internalTextTracks" | "currentTextTrack" | "textTrackCuesSettings">, providerOutput: Pick<IProviderOutput, "availableTextTracks$" | "currentTextTrack$" | "error$">): void;
-	private subscribe;
-	private applyCueSettings;
-	private htmlTextTracksAsArray;
-	private htmlTextTrackToITextTrack;
-	private static isHealthyTrack;
-	setExternal(tracks: IExternalTextTrack[]): void;
-	setInternal(tracks: IInternalTextTrack[]): void;
-	select(selectedId: ITextTrack["id"] | undefined): void;
-	destroy(): void;
-	private attach;
-	private detach;
-}
-export default TextTrackManager;

package/types/utils/setStateWithSubscribe.d.ts

@@ -1,6 +0,0 @@
-import type { IValueSubject } from "@vkontakte/videoplayer-shared";
-import type { IStateMachine } from "./StateMachine/types";
-export declare const setStateWithSubscribe: <
-	State,
-	Value
->(nextState: State | undefined, currentState: IStateMachine<State | undefined>, availableValues: IValueSubject<Array<Value>> | undefined, predicate: (value: Value) => boolean) => void;