@vkontakte/videoplayer-core 2.0.161 → 2.0.162-beta.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (48) hide show
  1. package/es2015.cjs +60 -34
  2. package/es2015.esm.js +71 -45
  3. package/esnext.cjs +60 -34
  4. package/esnext.esm.js +60 -34
  5. package/evergreen.esm.js +60 -34
  6. package/package.json +2 -2
  7. package/types/index.d.ts +3 -2
  8. package/types/player/types.d.ts +13 -2
  9. package/types/providers/DashProvider/baseDashProvider.d.ts +3 -2
  10. package/types/providers/DashProvider/lib/buffer.d.ts +4 -1
  11. package/types/providers/DashProvider/lib/player.d.ts +6 -1
  12. package/types/providers/DashProvider/lib/utils.d.ts +1 -1
  13. package/types/providers/DashProviderVirtual/baseDashProvider.d.ts +3 -2
  14. package/types/providers/DashProviderVirtual/lib/buffer/types.d.ts +4 -0
  15. package/types/providers/DashProviderVirtual/lib/buffer/virtualBuffer/baseVirtualBufferManager.d.ts +3 -0
  16. package/types/providers/DashProviderVirtual/lib/player/basePlayer.d.ts +4 -0
  17. package/types/providers/DashProviderVirtual/lib/player/types.d.ts +2 -1
  18. package/types/providers/DashProviderVirtual/lib/utils.d.ts +2 -2
  19. package/types/providers/ProviderContainer/index.d.ts +2 -0
  20. package/types/providers/ProviderContainer/utils/formatsSupport.d.ts +10 -3
  21. package/types/providers/utils/Abr/abrController.d.ts +7 -4
  22. package/types/providers/utils/Abr/abrManager.d.ts +2 -0
  23. package/types/providers/utils/Abr/controllers/abrPhaseController.d.ts +17 -0
  24. package/types/providers/utils/Abr/rules/audio/audioThroughputRule.d.ts +3 -2
  25. package/types/providers/utils/Abr/rules/audio/minAudioForVideoRule.d.ts +3 -2
  26. package/types/providers/utils/Abr/rules/audioRuleFactory.d.ts +2 -2
  27. package/types/providers/utils/Abr/rules/baseRule.d.ts +9 -5
  28. package/types/providers/utils/Abr/rules/limitAboveRule.d.ts +3 -2
  29. package/types/providers/utils/Abr/rules/limitBelowRule.d.ts +3 -2
  30. package/types/providers/utils/Abr/rules/video/abandonRequestRule.d.ts +12 -0
  31. package/types/providers/utils/Abr/rules/video/bolaRule.d.ts +31 -0
  32. package/types/providers/utils/Abr/rules/video/bufferRule.d.ts +7 -2
  33. package/types/providers/utils/Abr/rules/video/failedVideoTrackRule.d.ts +4 -3
  34. package/types/providers/utils/Abr/rules/video/fitsContainerRule.d.ts +3 -2
  35. package/types/providers/utils/Abr/rules/video/insufficientBufferRule.d.ts +15 -0
  36. package/types/providers/utils/Abr/rules/video/lowerLimitRule.d.ts +3 -2
  37. package/types/providers/utils/Abr/rules/video/stallsRule.d.ts +3 -2
  38. package/types/providers/utils/Abr/rules/video/throughputRule.d.ts +5 -4
  39. package/types/providers/utils/Abr/rules/video/upperLimitRule.d.ts +3 -2
  40. package/types/providers/utils/Abr/rules/videoRuleFactory.d.ts +3 -2
  41. package/types/providers/utils/Abr/types.d.ts +31 -5
  42. package/types/providers/utils/Abr/utils.d.ts +2 -1
  43. package/types/providers/utils/parsers/types.d.ts +1 -0
  44. package/types/utils/ThroughputEstimator.d.ts +1 -0
  45. package/types/utils/dashMaxTvVideoQuality.d.ts +7 -0
  46. package/types/utils/smoothedValue/baseSmoothedValue.d.ts +1 -0
  47. package/types/utils/smoothedValue/types.d.ts +1 -0
  48. package/types/utils/tuningConfig.d.ts +41 -2
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@vkontakte/videoplayer-core",
3
- "version": "2.0.161",
3
+ "version": "2.0.162-beta.1",
4
4
  "author": "vk.com",
5
5
  "description": "Videoplayer core library based on the vk.com platform",
6
6
  "homepage": "https://vk.com",
@@ -42,6 +42,6 @@
42
42
  "**/*.d.ts"
43
43
  ],
44
44
  "dependencies": {
45
- "@vkontakte/videoplayer-shared": "1.0.90"
45
+ "@vkontakte/videoplayer-shared": "1.0.91-beta.1"
46
46
  }
47
47
  }
package/types/index.d.ts CHANGED
@@ -1,6 +1,7 @@
1
1
  import { VERSION } from "./env";
2
2
  import type { IMpegSource, IDashSource, IHLSSource, IDashURLSource, IHLSLiveSource, ISeekRequest, URLSource, RawSource, URLSourceWithSeek } from "./player/types";
3
- import { VideoFormat, Surface, PredefinedQualityLimits, VideoCodec } from "./player/types";
3
+ import type { VideoCodec } from "./player/types";
4
+ import { VideoFormat, Surface, PredefinedQualityLimits, VideoCodecName } from "./player/types";
4
5
  import Player from "./player/Player";
5
6
  import type { IPlayer, IPlayerInfo, IPlayerEvents, IConfig, ISources, ICueSettings, IExternalTextTrack, ITextTrack, PlaybackRate, IVideoStream, IAudioStream } from "./player/types";
6
7
  import { PlaybackState, ChromecastState, HttpConnectionType } from "./player/types";
@@ -15,4 +16,4 @@ import { Subscription, Observable, Subject, ValueSubject, VideoQuality } from "@
15
16
  */
16
17
  declare const SDK_VERSION: string;
17
18
  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 };
18
- export { Player, PlaybackState, ChromecastState, HttpConnectionType, Surface, Subscription, VideoFormat, VideoQuality, Observable, Subject, ValueSubject, VERSION, SDK_VERSION, PredefinedQualityLimits, VideoCodec };
19
+ export { Player, PlaybackState, ChromecastState, HttpConnectionType, Surface, Subscription, VideoFormat, VideoQuality, Observable, Subject, ValueSubject, VERSION, SDK_VERSION, PredefinedQualityLimits, VideoCodec, VideoCodecName };
@@ -326,10 +326,12 @@ export interface PlayerInfoValues {
326
326
  */
327
327
  isBuffering$: boolean;
328
328
  /**
329
- * Статус только нежелательной буферизации; возникает при опустошении буфера в процессе воспроизведения
329
+ * Состояние столла. Возникает по истечении stallIgnoreThreshold после старта нежелательной буферизации
330
+ * Статус только нежелательной буферизации возникает при опустошении буфера в процессе воспроизведения
330
331
  * и не возникает при начальном наполнении буфера или после перемотки
331
332
  */
332
333
  isStalled$: boolean;
334
+ stallStartTime$: Milliseconds;
333
335
  /**
334
336
  * Закончилось ли видео
335
337
  */
@@ -532,6 +534,10 @@ export interface IConfig {
532
534
  volumeMultiplier?: number;
533
535
  panelSize?: IRectangle;
534
536
  isMuted?: boolean;
537
+ /**
538
+ * Нужно ли recoverableError обрабатывать как ошибку провайдера или будет снаружи обрабатываться.
539
+ */
540
+ handleNetworkRecoverableErrorAsProviderError?: boolean;
535
541
  }
536
542
  export interface ISources {
537
543
  [VideoFormat.MPEG]?: IMpegSource;
@@ -599,12 +605,16 @@ export declare enum VideoFormat {
599
605
  HLS_LIVE_CMAF = "HLS_LIVE_CMAF",
600
606
  WEB_RTC_LIVE = "WEB_RTC_LIVE"
601
607
  }
602
- export declare enum VideoCodec {
608
+ export declare enum VideoCodecName {
603
609
  AV1 = "av1",
604
610
  VP9 = "vp9",
605
611
  AVC1 = "avc1",
606
612
  HEV1 = "hev1"
607
613
  }
614
+ export interface VideoCodec {
615
+ name: VideoCodecName;
616
+ hdr: boolean;
617
+ }
608
618
  export declare enum AudioCodec {
609
619
  OPUS = "opus",
610
620
  MP4A = "mp4a"
@@ -633,6 +643,7 @@ export interface IAudioStream {
633
643
  label?: string;
634
644
  codec?: string;
635
645
  isDefault?: boolean;
646
+ channels?: number;
636
647
  }
637
648
  export type IAudioTrack = IBaseTrack;
638
649
  interface ITextTrackBase {
@@ -6,7 +6,7 @@ import type { IProvider, IProviderParams } from "../types";
6
6
  import type { IObservableVideo } from "../utils/HTMLVideoElement/observable";
7
7
  import { TrackHistory } from "../../utils/autoSelectTrack";
8
8
  import type { IStateMachine } from "../../utils/StateMachine/types";
9
- import type { ISubscription, ITracer, Milliseconds, Nullable } from "@vkontakte/videoplayer-shared";
9
+ import type { ExactVideoQuality, ISubscription, ITracer, Milliseconds, Nullable } from "@vkontakte/videoplayer-shared";
10
10
  import { Player } from "./lib/player";
11
11
  import { Scene3D } from "../../utils/3d/Scene3D";
12
12
  import DroppedFramesManager from "../utils/HTMLVideoElement/DroppedFramesManager";
@@ -19,6 +19,7 @@ type IParams = IProviderParams<IDashURLSource> & {
19
19
  forceVideoCodec?: VideoCodec;
20
20
  failedVideoTrack?: Nullable<IVideoTrack>;
21
21
  isOnDemand?: boolean;
22
+ dashMaxTvVideoQuality?: Nullable<ExactVideoQuality>;
22
23
  };
23
24
  export default abstract class BaseDashProvider implements IProvider {
24
25
  scene3D: Scene3D | undefined;
@@ -30,7 +31,7 @@ export default abstract class BaseDashProvider implements IProvider {
30
31
  protected player: Player;
31
32
  protected params: IParams;
32
33
  protected tracer: ITracer;
33
- protected textTracksManager: TextTrackManager;
34
+ protected textTracksManager: TextTrackManager | null;
34
35
  protected droppedFramesManager: DroppedFramesManager;
35
36
  protected stallsManager: StallsManager;
36
37
  protected elementSizeManager: ElementSizeManager;
@@ -3,6 +3,7 @@ import type { IError, IRange, ISubject, IValueSubject, Milliseconds } from "@vko
3
3
  import { abortable } from "@vkontakte/videoplayer-shared";
4
4
  import type { Fetcher } from "./fetcher";
5
5
  import type { CommonInit, Manifest, Representation, Segment, Stream, StreamKind } from "../../utils/parsers/types";
6
+ import type { VideoSegmentLoadProgress } from "../../utils/Abr/types";
6
7
  export interface Dependencies {
7
8
  fetcher: Fetcher;
8
9
  tuning: ITuningConfig;
@@ -75,7 +76,7 @@ export declare class BufferManager {
75
76
  private loadByteRangeSegmentsTimeoutId;
76
77
  constructor(kind: StreamKind, mediaSource: MediaSource, representations: Representation[], { fetcher, tuning, getCurrentPosition, isActiveLowLatency, compatibilityMode, manifest }: Dependencies);
77
78
  startWith: ReturnType<typeof abortable<[Representation["id"]]>>;
78
- switchToWithPreviousAbort(newRepresentationId: Representation["id"], dropBuffer?: boolean): void;
79
+ switchToWithPreviousAbort(newRepresentationId: Representation["id"], dropBuffer?: boolean): Promise<void | undefined>;
79
80
  switchTo: ReturnType<typeof abortable<[Representation["id"], boolean | undefined], void>>;
80
81
  switchToOld: ReturnType<typeof abortable<[Representation["id"], boolean | undefined], void>>;
81
82
  warmUpMediaSource(): void;
@@ -125,6 +126,8 @@ export declare class BufferManager {
125
126
  getDebugBufferState(): IRange<Milliseconds> | undefined;
126
127
  getForwardBufferDuration(currentPosition?: Milliseconds | undefined): Milliseconds;
127
128
  getForwardBufferRepresentations(currentPosition?: Milliseconds | undefined): Map<Representation["id"], Segment[]>;
129
+ getMpdSegmentDuration(): Milliseconds | undefined;
130
+ getActiveSegmentProgress(): VideoSegmentLoadProgress | undefined;
128
131
  private detectGaps;
129
132
  private detectGapsWhenIdle;
130
133
  private checkEjectedSegments;
@@ -5,8 +5,9 @@ import { StreamKind } from "../../utils/parsers/types";
5
5
  import StateMachine from "../../../utils/StateMachine/StateMachine";
6
6
  import type ThroughputEstimator from "../../../utils/ThroughputEstimator";
7
7
  import type { ITuningConfig } from "../../../utils/tuningConfig";
8
- import type { IError, ISubject, ITracer, IValueSubject, Milliseconds } from "@vkontakte/videoplayer-shared";
8
+ import type { ExactVideoQuality, IError, ISubject, ITracer, IValueSubject, Milliseconds, Nullable } from "@vkontakte/videoplayer-shared";
9
9
  import { abortable, Subject } from "@vkontakte/videoplayer-shared";
10
+ import type { VideoSegmentLoadProgress } from "../../utils/Abr/types";
10
11
  export declare enum State {
11
12
  NONE = "none",
12
13
  MANIFEST_READY = "manifest_ready",
@@ -20,6 +21,7 @@ export interface Params {
20
21
  forceVideoCodec?: VideoCodec;
21
22
  tracer: ITracer;
22
23
  isOnDemand: boolean;
24
+ dashMaxTvVideoQuality: Nullable<ExactVideoQuality>;
23
25
  }
24
26
  export declare class Player {
25
27
  private element;
@@ -84,6 +86,7 @@ export declare class Player {
84
86
  private livePauseWatchdogSubscription;
85
87
  private liveWasInterrupted;
86
88
  private isOnDemand;
89
+ private dashMaxTvVideoQuality;
87
90
  private destroyController;
88
91
  constructor(params: Params);
89
92
  initManifest: ReturnType<typeof abortable<[HTMLVideoElement, string, number]>>;
@@ -101,6 +104,8 @@ export declare class Player {
101
104
  get isStreamEnded(): boolean;
102
105
  stop(): void;
103
106
  getForwardBufferRepresentations(kind: Exclude<StreamKind, StreamKind.TEXT>): Map<Representation["id"], Segment[]> | undefined;
107
+ getActiveVideoSegmentProgress(): VideoSegmentLoadProgress | undefined;
108
+ getMpdVideoSegmentDuration(): Milliseconds | undefined;
104
109
  setBufferTarget(time: Milliseconds): void;
105
110
  getStreams(): Manifest["streams"] | undefined;
106
111
  getCodecs(): Manifest["codecs"] | undefined;
@@ -7,7 +7,7 @@ export declare const representationToTextTrack: ({ language, label }: Stream, {
7
7
  isAuto: boolean;
8
8
  }) => IInternalTextTrack;
9
9
  export declare const textRepresentationToTextTrack: ({ language, label, id, url, isAuto }: TextRepresentation) => IInternalTextTrack;
10
- export declare const streamToIAudioStream: ({ id, language, label, codecs, isDefault }: Stream) => IAudioStream;
10
+ export declare const streamToIAudioStream: ({ id, language, label, codecs, isDefault, channels }: Stream) => IAudioStream;
11
11
  export declare const streamToIVideoStream: ({ id, language, label, hdr, codecs }: Stream) => IVideoStream;
12
12
  export declare const isTemplateSegment: (segment: Segment) => segment is TemplateSegment;
13
13
  export declare const isTemplateSegmentReference: (segmentReference: SegmentReference) => segmentReference is TemplateSegmentReference;
@@ -6,7 +6,7 @@ import type { IProvider, IProviderParams } from "../types";
6
6
  import type { IObservableVideo } from "../utils/HTMLVideoElement/observable";
7
7
  import { TrackHistory } from "../../utils/autoSelectTrack";
8
8
  import type { IStateMachine } from "../../utils/StateMachine/types";
9
- import type { ISubscription, ITracer, Milliseconds, Nullable } from "@vkontakte/videoplayer-shared";
9
+ import type { ExactVideoQuality, ISubscription, ITracer, Milliseconds, Nullable } from "@vkontakte/videoplayer-shared";
10
10
  import { Scene3D } from "../../utils/3d/Scene3D";
11
11
  import DroppedFramesManager from "../utils/HTMLVideoElement/DroppedFramesManager";
12
12
  import TextTrackManager from "../utils/HTMLVideoElement/TextTrackManager";
@@ -19,6 +19,7 @@ type IParams = IProviderParams<IDashURLSource> & {
19
19
  forceVideoCodec?: VideoCodec;
20
20
  failedVideoTrack?: Nullable<IVideoTrack>;
21
21
  isOnDemand?: boolean;
22
+ dashMaxTvVideoQuality?: Nullable<ExactVideoQuality>;
22
23
  };
23
24
  export default abstract class BaseDashProvider implements IProvider {
24
25
  scene3D: Scene3D | undefined;
@@ -30,7 +31,7 @@ export default abstract class BaseDashProvider implements IProvider {
30
31
  protected player: BasePlayer;
31
32
  protected params: IParams;
32
33
  protected tracer: ITracer;
33
- protected textTracksManager: TextTrackManager;
34
+ protected textTracksManager: TextTrackManager | null;
34
35
  protected droppedFramesManager: DroppedFramesManager;
35
36
  protected stallsManager: StallsManager;
36
37
  protected elementSizeManager: ElementSizeManager;
@@ -2,6 +2,7 @@ import type { Byte, IError, IRange, ISubject, IValueSubject, Milliseconds } from
2
2
  import type { CommonInit, Manifest, Representation, Segment } from "../../../utils/parsers/types";
3
3
  import type { Fetcher } from "../fetcher";
4
4
  import type { ITuningConfig } from "../../../../utils/tuningConfig";
5
+ import type { VideoSegmentLoadProgress } from "../../../utils/Abr/types";
5
6
  export type TRepresentationSwitchMode = "lazy" | "force";
6
7
  export declare enum SwithRepresentationMode {
7
8
  Lazy = "lazy",
@@ -37,6 +38,8 @@ export interface IVirtualBufferManager<T extends Segment = Segment> {
37
38
  setPreloadOnly(preloadOnly: boolean): void;
38
39
  findSegmentStartTime(position: Milliseconds): Milliseconds | undefined;
39
40
  calculateDurationFromSegments(): Milliseconds;
41
+ getActiveSegmentProgress(): VideoSegmentLoadProgress | undefined;
42
+ getMpdSegmentDuration(): Milliseconds | undefined;
40
43
  destroy(): void;
41
44
  get lastDataObtainedTimestamp(): Milliseconds;
42
45
  }
@@ -44,6 +47,7 @@ export interface IBufferPlaybackQueueItem<T extends Segment> {
44
47
  representationId: Representation["id"];
45
48
  segmentIndex: number;
46
49
  segment: T;
50
+ startedAtMs?: Milliseconds;
47
51
  }
48
52
  export interface ISomeDataLoadedCallbackParams<T extends Segment> {
49
53
  downloadingItems: IBufferPlaybackQueueItem<T>[];
@@ -6,6 +6,7 @@ import type { Byte, IError, IRange, ISubject, IValueSubject, Milliseconds, Secon
6
6
  import { abortable, Subscription } from "@vkontakte/videoplayer-shared";
7
7
  import type { NativeBufferManager } from "../nativeBufferManager";
8
8
  import { SwithRepresentationMode, type Dependencies, type IBufferPlaybackQueueItem, type ISomeDataLoadedCallbackParams, type IVirtualBufferManager } from "../types";
9
+ import type { VideoSegmentLoadProgress } from "../../../../utils/Abr/types";
9
10
  export declare abstract class BaseVirtualBufferManager<T extends Segment> implements IVirtualBufferManager<T> {
10
11
  error$: ISubject<IError>;
11
12
  playingRepresentation$: IValueSubject<Representation["id"] | undefined>;
@@ -70,6 +71,8 @@ export declare abstract class BaseVirtualBufferManager<T extends Segment> implem
70
71
  getRepresentationInitialTime(): Seconds;
71
72
  getMutexInfo(): string;
72
73
  calculateDurationFromSegments(): Milliseconds;
74
+ getActiveSegmentProgress(): VideoSegmentLoadProgress | undefined;
75
+ getMpdSegmentDuration(): Milliseconds | undefined;
73
76
  get lastDataObtainedTimestamp(): Milliseconds;
74
77
  setTarget(time: Milliseconds): void;
75
78
  setPreloadOnly(preloadOnly: boolean): void;
@@ -7,6 +7,7 @@ import type ThroughputEstimator from "../../../../utils/ThroughputEstimator";
7
7
  import type { ITuningConfig } from "../../../../utils/tuningConfig";
8
8
  import type { IError, IRange, ISubject, ISubscription, ITracer, IValueSubject, Milliseconds, Nullable, Seconds } from "@vkontakte/videoplayer-shared";
9
9
  import { abortable, Subject, Subscription, SubscriptionRemovable } from "@vkontakte/videoplayer-shared";
10
+ import type { VideoSegmentLoadProgress } from "../../../utils/Abr/types";
10
11
  import { Fetcher } from "../fetcher";
11
12
  import type { Dependencies, IVirtualBufferManager, SwithRepresentationMode } from "../buffer/types";
12
13
  import type { Params } from "./types";
@@ -72,6 +73,7 @@ export declare abstract class BasePlayer {
72
73
  fetcherError$: Subject<IError>;
73
74
  updateDurationError$: Subject<IError>;
74
75
  private isOnDemand;
76
+ private dashMaxTvVideoQuality;
75
77
  protected constructor(params: Params);
76
78
  protected abstract prepareManifestUrlString(manifestBaseUrlString: string, offset: number): string;
77
79
  protected abstract setSourceInitDuration(): void;
@@ -83,6 +85,8 @@ export declare abstract class BasePlayer {
83
85
  seek(requestedPosition: Milliseconds, forcePrecise?: boolean): Promise<void>;
84
86
  warmUpMediaSourceIfNeeded(position?: Milliseconds | undefined): void;
85
87
  getForwardBufferRepresentations(kind: Exclude<StreamKind, StreamKind.TEXT>): Map<Representation["id"], Segment[]> | undefined;
88
+ getActiveVideoSegmentProgress(): VideoSegmentLoadProgress | undefined;
89
+ getMpdVideoSegmentDuration(): Milliseconds | undefined;
86
90
  get isStreamEnded(): boolean;
87
91
  getStreams(): Manifest["streams"] | undefined;
88
92
  getCodecs(): Manifest["codecs"] | undefined;
@@ -1,7 +1,7 @@
1
1
  import type ThroughputEstimator from "../../../../utils/ThroughputEstimator";
2
2
  import type { ITuningConfig } from "../../../../utils/tuningConfig";
3
3
  import type { VideoCodec } from "../../../../player/types";
4
- import type { ITracer } from "@vkontakte/videoplayer-shared";
4
+ import type { ExactVideoQuality, ITracer, Nullable } from "@vkontakte/videoplayer-shared";
5
5
  export declare enum State {
6
6
  NONE = "none",
7
7
  MANIFEST_READY = "manifest_ready",
@@ -15,4 +15,5 @@ export interface Params {
15
15
  forceVideoCodec?: VideoCodec;
16
16
  tracer: ITracer;
17
17
  isOnDemand?: boolean;
18
+ dashMaxTvVideoQuality?: Nullable<ExactVideoQuality>;
18
19
  }
@@ -1,13 +1,13 @@
1
1
  import type { Representation, Segment, SegmentReference, Stream, TemplateSegment, TemplateSegmentReference, TextRepresentation } from "../../utils/parsers/types";
2
2
  import type { IAudioStream, IAudioTrack, IInternalTextTrack, IVideoStream, IVideoTrack } from "../../../player/types";
3
- export declare const representationToVideoTrack: ({ id, width, height, bitrate, fps, quality: qualityString, streamId }: Representation) => IVideoTrack | undefined;
3
+ export declare const representationToVideoTrack: ({ id, width, height, bitrate, fps, quality: qualityString, streamId, tvDisabled }: Representation) => IVideoTrack | undefined;
4
4
  export declare const representationToAudioTrack: ({ id, bitrate }: Representation) => IAudioTrack;
5
5
  export declare const representationToTextTrack: ({ language, label }: Stream, { id, url, isAuto }: Representation & {
6
6
  url: string;
7
7
  isAuto: boolean;
8
8
  }) => IInternalTextTrack;
9
9
  export declare const textRepresentationToTextTrack: ({ language, label, id, url, isAuto }: TextRepresentation) => IInternalTextTrack;
10
- export declare const streamToIAudioStream: ({ id, language, label, codecs, isDefault }: Stream) => IAudioStream;
10
+ export declare const streamToIAudioStream: ({ id, language, label, codecs, isDefault, channels }: Stream) => IAudioStream;
11
11
  export declare const streamToIVideoStream: ({ id, language, label, hdr, codecs }: Stream) => IVideoStream;
12
12
  export declare const isTemplateSegment: (segment: Segment) => segment is TemplateSegment;
13
13
  export declare const isTemplateSegmentReference: (segmentReference: SegmentReference) => segmentReference is TemplateSegmentReference;
@@ -15,6 +15,7 @@ interface IParams extends IProviderDependencies {
15
15
  volumeMultiplier?: number;
16
16
  panelSize?: IRectangle;
17
17
  skipVideoElVolumeSync$: ValueSubject<boolean>;
18
+ handleNetworkRecoverableErrorAsProviderError?: boolean;
18
19
  }
19
20
  export default class ProviderContainer implements IProviderContainer {
20
21
  current$: IValueSubject<IProviderEntry>;
@@ -36,6 +37,7 @@ export default class ProviderContainer implements IProviderContainer {
36
37
  private failoverIndex;
37
38
  private currentFailedVideoTrack;
38
39
  private volumeMultiplierManager;
40
+ private dashMaxTvVideoQuality;
39
41
  constructor(params: IParams);
40
42
  init(): void;
41
43
  destroy(): void;
@@ -1,4 +1,5 @@
1
- import { VideoFormat, VideoCodec, AudioCodec } from "../../../player/types";
1
+ import type { VideoCodec } from "../../../player/types";
2
+ import { VideoFormat, VideoCodecName, AudioCodec } from "../../../player/types";
2
3
  import { type ITuningConfig } from "../../../utils/tuningConfig";
3
4
  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;
4
5
  type Constraints = Pick<ITuningConfig, "webmCodec" | "androidPreferredFormat" | "iosPreferredFormat" | "preferCMAF" | "preferWebRTC" | "preferMultiStream">;
@@ -15,7 +16,13 @@ type AllLiveFormats = [LiveFormat, LiveFormat, LiveFormat, LiveFormat, LiveForma
15
16
  export declare const getLiveFormatsPriority: ({ androidPreferredFormat, preferCMAF, preferWebRTC }: Constraints) => AllLiveFormats;
16
17
  export declare const getChromeCastFormatsPriority: (live: boolean) => VideoFormat[];
17
18
  export declare const selectCodec: (codecs: Set<string>) => string | undefined;
18
- export declare const filterAvailableVideoCodecs: (codecs: string[]) => VideoCodec[];
19
+ type CodecStream = {
20
+ codecs: string;
21
+ hdr?: boolean;
22
+ };
23
+ export declare const filterAvailableVideoCodecs: (streams: CodecStream[], { preferHdr }: {
24
+ preferHdr: boolean;
25
+ }) => VideoCodec[];
19
26
  export declare const filterAvailableAudioCodecs: (codecs: string[]) => AudioCodec[];
20
- export declare const convertCodecName: <T extends VideoCodec | AudioCodec>(codec: string) => T;
27
+ export declare const convertCodecName: <T extends VideoCodecName | AudioCodec>(codec: string) => T;
21
28
  export {};
@@ -1,4 +1,4 @@
1
- import type { IAbrController, IAbrRule, IBaseAbrControllerContext, IInitAbrManagerContext } from "./types";
1
+ import type { IAbrController, IAbrRule, IBaseAbrControllerContext, IRuleInitContext } from "./types";
2
2
  import type { IBaseTrack } from "../../../player/types";
3
3
  export default class AbrController<
4
4
  T extends IBaseTrack,
@@ -6,10 +6,13 @@ export default class AbrController<
6
6
  > implements IAbrController<T> {
7
7
  private history;
8
8
  private rules;
9
- private context;
10
- init(rules: IAbrRule<T, C>[], initContext: IInitAbrManagerContext): void;
9
+ private _context;
10
+ get context(): C;
11
+ init(rules: IAbrRule<T, C>[], initContext: IRuleInitContext): void;
11
12
  destroy(): void;
12
13
  updateContext(context: C): void;
13
- autoSelectTrack(): T;
14
+ autoSelectTrack(rules?: IAbrRule<T, C>[]): T;
14
15
  private selectTrackBasedOnHistory;
16
+ /** при переключении аудио стрима очищаем историю для предотвращения залипания в `onCooldown` */
17
+ historyReset(): void;
15
18
  }
@@ -8,6 +8,8 @@ export declare class AbrManager {
8
8
  private subscription;
9
9
  private lastVideoTrackSelected$;
10
10
  private context;
11
+ private phaseController;
12
+ private allVideoRules;
11
13
  init(context: IInitAbrManagerContext): void;
12
14
  updateContext(updateContext: IUpdatableAbrManagerContext): void;
13
15
  autoSelectTrack<T extends IVideoTrack | IAudioTrack>(kind: Exclude<StreamKind, StreamKind.TEXT>): T;
@@ -0,0 +1,17 @@
1
+ import type { IObservable } from "@vkontakte/videoplayer-shared";
2
+ import type { IVideoAbrContext, RuleConfidence } from "../types";
3
+ export declare enum AbrPhase {
4
+ Startup = "startup",
5
+ Steady = "steady"
6
+ }
7
+ export type RulePhaseConfig = Readonly<Partial<Record<AbrPhase, RuleConfidence>>>;
8
+ export declare const uniformPhaseConfig: (confidence: RuleConfidence) => RulePhaseConfig;
9
+ export declare class AbrPhaseController {
10
+ private _phase;
11
+ private readonly subscription;
12
+ constructor(isSeeked$?: IObservable<boolean>);
13
+ get phase(): AbrPhase;
14
+ updatePhase(context: IVideoAbrContext): void;
15
+ reset(): void;
16
+ destroy(): void;
17
+ }
@@ -1,11 +1,12 @@
1
- import type { IAbrRule, IAbrRuleResolution, IAudioAbrContext, RuleConfidence } from "../../types";
1
+ import type { IAbrRule, IAbrRuleResolution, IAudioAbrContext } from "../../types";
2
2
  import type { IAudioTrack, IVideoTrack } from "../../../../../player/types";
3
3
  import { LimitAboveRule } from "../limitAboveRule";
4
4
  import type { Kbps, Nullable } from "@vkontakte/videoplayer-shared";
5
5
  import type { ITuningConfig } from "../../../../../utils/tuningConfig";
6
+ import type { RulePhaseConfig } from "../../controllers/abrPhaseController";
6
7
  type AudioThroughputLogsArgs = [forwardBufferHealth: Nullable<number>, playbackRate: number, reserve: Kbps, playbackRateFactor: number, bitrateFactor: number, estimatedThroughput: Kbps, tuning: ITuningConfig];
7
8
  export declare class AudioThroughputRule extends LimitAboveRule<IAudioTrack, IAudioAbrContext, AudioThroughputLogsArgs> implements IAbrRule<IAudioTrack, IAudioAbrContext> {
8
- constructor(confidence: RuleConfidence);
9
+ constructor(phaseConfig: RulePhaseConfig);
9
10
  execute(context: IAudioAbrContext): IAbrRuleResolution<IAudioTrack>;
10
11
  protected createLogMessage(selectedTrack: IVideoTrack, forwardBufferHealth: number | undefined, playbackRate: number, reserve: Kbps, playbackRateFactor: number, bitrateFactor: number, estimatedThroughput: Kbps, tuning: ITuningConfig): string;
11
12
  }
@@ -1,11 +1,12 @@
1
- import type { IAbrRule, IAbrRuleResolution, IAudioAbrContext, RuleConfidence } from "../../types";
1
+ import type { IAbrRule, IAbrRuleResolution, IAudioAbrContext } from "../../types";
2
2
  import type { IAudioTrack, IVideoTrack } from "../../../../../player/types";
3
3
  import { LimitBelowRule } from "../limitBelowRule";
4
4
  import type { ITuningConfig } from "../../../../../utils/tuningConfig";
5
5
  import type { Nullable } from "@vkontakte/videoplayer-shared";
6
+ import type { RulePhaseConfig } from "../../controllers/abrPhaseController";
6
7
  type MinAudioForVideoLogsArgs = [lastVideoTrackSelected: Nullable<IVideoTrack>, tuning: ITuningConfig];
7
8
  export declare class MinAudioForVideoRule extends LimitBelowRule<IAudioTrack, IAudioAbrContext, MinAudioForVideoLogsArgs> implements IAbrRule<IAudioTrack, IAudioAbrContext> {
8
- constructor(confidence: RuleConfidence);
9
+ constructor(phaseConfig: RulePhaseConfig);
9
10
  execute(context: IAudioAbrContext): IAbrRuleResolution<IAudioTrack>;
10
11
  protected createLogMessage(selectedTrack: IVideoTrack, lastVideoTrackSelected: Nullable<IVideoTrack>, tuning: ITuningConfig): string;
11
12
  }
@@ -1,7 +1,7 @@
1
1
  import { AudioRuleName } from "../types";
2
2
  import type { IAbrRule, IAudioAbrContext } from "../types";
3
- import { RuleConfidence } from "../types";
4
3
  import type { IAudioTrack } from "../../../../player/types";
4
+ import { type RulePhaseConfig } from "../controllers/abrPhaseController";
5
5
  export declare class AudioRuleFactory {
6
- static createRule(ruleName: AudioRuleName, confidence?: RuleConfidence): IAbrRule<IAudioTrack, IAudioAbrContext>;
6
+ static createRule(ruleName: AudioRuleName, phaseConfig?: RulePhaseConfig): IAbrRule<IAudioTrack, IAudioAbrContext>;
7
7
  }
@@ -1,19 +1,23 @@
1
- import type { IAbrRule, IAbrRuleResolution, IBaseAbrControllerContext, IInitAbrManagerContext, RuleConfidence, RuleType } from "../types";
1
+ import type { IAbrRule, IAbrRuleResolution, IBaseAbrControllerContext, IRuleInitContext, RuleConfidence, RuleType } from "../types";
2
2
  import type { IBaseTrack } from "../../../../player/types";
3
3
  import { Subscription } from "@vkontakte/videoplayer-shared";
4
+ import type { AbrPhase } from "../controllers/abrPhaseController";
5
+ import { type RulePhaseConfig } from "../controllers/abrPhaseController";
4
6
  export declare abstract class BaseRule<
5
7
  T extends IBaseTrack,
6
8
  C extends IBaseAbrControllerContext,
7
9
  LogsArgs extends unknown[]
8
10
  > implements IAbrRule<T, C> {
11
+ readonly phaseConfig: RulePhaseConfig;
12
+ readonly activePhases: ReadonlySet<AbrPhase>;
9
13
  protected subscription: Subscription;
10
- protected confidence: RuleConfidence;
11
14
  protected type: RuleType;
12
15
  protected name: string;
13
- constructor(confidence: RuleConfidence);
14
- init(_initContext: IInitAbrManagerContext): void;
16
+ protected confidence: RuleConfidence;
17
+ constructor(phaseConfig: RulePhaseConfig);
18
+ init(_initContext: IRuleInitContext): void;
15
19
  destroy(): void;
16
20
  abstract execute(context: C): IAbrRuleResolution<T>;
17
- protected createResolution(selectedTrack: T, ...params: LogsArgs): IAbrRuleResolution<T>;
21
+ protected createResolution(context: C, selectedTrack: T, ...params: LogsArgs): IAbrRuleResolution<T>;
18
22
  protected abstract createLogMessage(selectedTrack: T, ...params: LogsArgs): string;
19
23
  }
@@ -1,11 +1,12 @@
1
- import type { IAbrRule, IAbrRuleResolution, IBaseAbrControllerContext, RuleConfidence } from "../types";
1
+ import type { IAbrRule, IAbrRuleResolution, IBaseAbrControllerContext } from "../types";
2
2
  import type { IBaseTrack } from "../../../../player/types";
3
3
  import { BaseRule } from "./baseRule";
4
+ import type { RulePhaseConfig } from "../controllers/abrPhaseController";
4
5
  export declare abstract class LimitAboveRule<
5
6
  T extends IBaseTrack,
6
7
  C extends IBaseAbrControllerContext,
7
8
  LogsArgs extends unknown[] = unknown[]
8
9
  > extends BaseRule<T, C, LogsArgs> implements IAbrRule<T, C> {
9
- constructor(confidence: RuleConfidence);
10
+ constructor(phaseConfig: RulePhaseConfig);
10
11
  abstract execute(context: C): IAbrRuleResolution<T>;
11
12
  }
@@ -1,11 +1,12 @@
1
- import type { IAbrRule, IAbrRuleResolution, IBaseAbrControllerContext, RuleConfidence } from "../types";
1
+ import type { IAbrRule, IAbrRuleResolution, IBaseAbrControllerContext } from "../types";
2
2
  import type { IBaseTrack } from "../../../../player/types";
3
3
  import { BaseRule } from "./baseRule";
4
+ import type { RulePhaseConfig } from "../controllers/abrPhaseController";
4
5
  export declare abstract class LimitBelowRule<
5
6
  T extends IBaseTrack,
6
7
  C extends IBaseAbrControllerContext,
7
8
  LogsArgs extends unknown[] = unknown[]
8
9
  > extends BaseRule<T, C, LogsArgs> implements IAbrRule<T, C> {
9
- constructor(confidence: RuleConfidence);
10
+ constructor(phaseConfig: RulePhaseConfig);
10
11
  abstract execute(context: C): IAbrRuleResolution<T>;
11
12
  }
@@ -0,0 +1,12 @@
1
+ import type { IAbrRule, IAbrRuleResolution, IVideoAbrContext } from "../../types";
2
+ import type { IVideoTrack } from "../../../../../player/types";
3
+ import type { Milliseconds } from "@vkontakte/videoplayer-shared";
4
+ import { LimitAboveRule } from "../limitAboveRule";
5
+ import type { RulePhaseConfig } from "../../controllers/abrPhaseController";
6
+ type LogsArgs = [elapsedMs: Milliseconds, loadedFraction: number, estimatedRemainingMs: Milliseconds, bufferLimitMs: Milliseconds, triggered: boolean];
7
+ export declare class AbandonRequestRule extends LimitAboveRule<IVideoTrack, IVideoAbrContext, LogsArgs> implements IAbrRule<IVideoTrack, IVideoAbrContext> {
8
+ constructor(phaseConfig: RulePhaseConfig);
9
+ execute(context: IVideoAbrContext): IAbrRuleResolution<IVideoTrack>;
10
+ protected createLogMessage(selectedTrack: IVideoTrack, elapsedMs: Milliseconds, loadedFraction: number, estimatedRemainingMs: Milliseconds, bufferLimitMs: Milliseconds, triggered: boolean): string;
11
+ }
12
+ export {};
@@ -0,0 +1,31 @@
1
+ import type { IAbrRule, IAbrRuleResolution, IRuleInitContext, IVideoAbrContext } from "../../types";
2
+ import type { IVideoTrack } from "../../../../../player/types";
3
+ import type { Kbps, Seconds } from "@vkontakte/videoplayer-shared";
4
+ import { LimitAboveRule } from "../limitAboveRule";
5
+ import { AbrPhase, type RulePhaseConfig } from "../../controllers/abrPhaseController";
6
+ export declare const calculateUtilities: (bitratesAsc: Kbps[]) => number[];
7
+ export declare const calculateVpAndGp: (utilityHigh: number, bufferTargetS: Seconds, minBufferS: Seconds) => {
8
+ Vp: number;
9
+ gp: number;
10
+ };
11
+ export declare const calculateScores: (bitratesAsc: Kbps[], utilities: number[], Vp: number, gp: number, effectiveBufferS: Seconds) => number[];
12
+ export declare const argmax: (values: number[]) => number;
13
+ export declare const adjustBufferForFinite: (effectiveBufferS: Seconds, remainingDurationS: Seconds, finiteThresholdS: Seconds, _bufferTargetS: Seconds) => Seconds;
14
+ export declare const calculateMinBufferLevelForRep: (qIndex: number, bitratesAsc: Kbps[], utilities: number[], Vp: number, gp: number) => Seconds;
15
+ export declare const calculateMaxBufferLevelForRep: (qIndex: number, utilities: number[], Vp: number, gp: number) => Seconds;
16
+ export declare const pickIndexByThroughput: (bitratesAsc: Kbps[], throughputKbps: Kbps) => number;
17
+ type BolaLogsArgs = [bufferLevelS: Seconds, placeholderBufferS: Seconds, segmentDurationS: Seconds, Vp: number, gp: number, validBitrates: Kbps[], selectedIndex: number, phase: AbrPhase | undefined];
18
+ export declare class BolaRule extends LimitAboveRule<IVideoTrack, IVideoAbrContext, BolaLogsArgs> implements IAbrRule<IVideoTrack, IVideoAbrContext> {
19
+ private placeholderBufferS;
20
+ private lastCallTimeMs;
21
+ private lastBufferLevelS;
22
+ constructor(phaseConfig: RulePhaseConfig);
23
+ init(initContext?: IRuleInitContext): void;
24
+ destroy(): void;
25
+ execute(context: IVideoAbrContext): IAbrRuleResolution<IVideoTrack>;
26
+ private resolveSegmentDurationS;
27
+ private applyBolaOSafeguard;
28
+ private resetPlaceholder;
29
+ protected createLogMessage(selectedTrack: IVideoTrack, bufferLevelS: Seconds, placeholderBufferS: Seconds, segmentDurationS: Seconds, Vp: number, gp: number, validBitrates: Kbps[], selectedIndex: number, phase: AbrPhase | undefined): string;
30
+ }
31
+ export {};
@@ -1,11 +1,16 @@
1
- import type { IAbrRule, IAbrRuleResolution, IVideoAbrContext, RuleConfidence } from "../../types";
1
+ import type { IAbrRule, IAbrRuleResolution, IVideoAbrContext } from "../../types";
2
2
  import type { IVideoTrack } from "../../../../../player/types";
3
3
  import type { Nullable } from "@vkontakte/videoplayer-shared";
4
4
  import { LimitAboveRule } from "../limitAboveRule";
5
5
  import type { ITuningConfig } from "../../../../../utils/tuningConfig";
6
+ import type { RulePhaseConfig } from "../../controllers/abrPhaseController";
6
7
  type BufferRuleLogsArgs = [currentVideoTrack: Nullable<IVideoTrack>, lastVideoTrackSelected: Nullable<IVideoTrack>, forwardBufferHealth: Nullable<number>, abrTuning: ITuningConfig["autoTrackSelection"]];
8
+ /**
9
+ * @deprecated Заменено на связку `BolaRule` + `InsufficientBufferRule` в фазовой архитектуре ABR.
10
+ * Не использовать в новых наборах правил.
11
+ */
7
12
  export declare class BufferRule extends LimitAboveRule<IVideoTrack, IVideoAbrContext, BufferRuleLogsArgs> implements IAbrRule<IVideoTrack, IVideoAbrContext> {
8
- constructor(confidence: RuleConfidence);
13
+ constructor(phaseConfig: RulePhaseConfig);
9
14
  execute(context: IVideoAbrContext): IAbrRuleResolution<IVideoTrack>;
10
15
  protected createLogMessage(selectedTrack: IVideoTrack, currentVideoTrack: Nullable<IVideoTrack>, lastVideoTrackSelected: Nullable<IVideoTrack>, forwardBufferHealth: Nullable<number>, abrTuning: ITuningConfig["autoTrackSelection"]): string;
11
16
  }
@@ -1,12 +1,13 @@
1
- import type { IAbrRule, IAbrRuleResolution, IInitAbrManagerContext, IVideoAbrContext, RuleConfidence } from "../../types";
1
+ import type { IAbrRule, IAbrRuleResolution, IRuleInitContext, IVideoAbrContext } from "../../types";
2
2
  import type { IVideoTrack } from "../../../../../player/types";
3
3
  import type { Nullable } from "@vkontakte/videoplayer-shared";
4
4
  import { LimitAboveRule } from "../limitAboveRule";
5
+ import type { RulePhaseConfig } from "../../controllers/abrPhaseController";
5
6
  type FailedVideoTracLogsArgs = [banTrack: Nullable<IVideoTrack>];
6
7
  export declare class FailedVideoTrackRule extends LimitAboveRule<IVideoTrack, IVideoAbrContext, FailedVideoTracLogsArgs> implements IAbrRule<IVideoTrack, IVideoAbrContext> {
7
8
  protected banTrack: Nullable<IVideoTrack>;
8
- constructor(confidence: RuleConfidence);
9
- init(initContext: IInitAbrManagerContext): void;
9
+ constructor(phaseConfig: RulePhaseConfig);
10
+ init(initContext: IRuleInitContext): void;
10
11
  execute(context: IVideoAbrContext): IAbrRuleResolution<IVideoTrack>;
11
12
  protected createLogMessage(selectedTrack: IVideoTrack, banTrack: Nullable<IVideoTrack>): string;
12
13
  }
@@ -1,12 +1,13 @@
1
- import type { IAbrRule, IAbrRuleResolution, IVideoAbrContext, RuleConfidence } from "../../types";
1
+ import type { IAbrRule, IAbrRuleResolution, IVideoAbrContext } from "../../types";
2
2
  import type { IVideoTrack } from "../../../../../player/types";
3
3
  import type { IRectangle, Nullable } from "@vkontakte/videoplayer-shared";
4
4
  import { LimitAboveRule } from "../limitAboveRule";
5
5
  import type { ITuningConfig } from "../../../../../utils/tuningConfig";
6
+ import type { RulePhaseConfig } from "../../controllers/abrPhaseController";
6
7
  type IContainerSizeLimit = IRectangle;
7
8
  type FitsContainerLogsArgs = [containerSizeLimit: Nullable<IContainerSizeLimit>, containerSizeFactor: number, abrTuning: ITuningConfig["autoTrackSelection"]];
8
9
  export declare class FitsContainerRule extends LimitAboveRule<IVideoTrack, IVideoAbrContext, FitsContainerLogsArgs> implements IAbrRule<IVideoTrack, IVideoAbrContext> {
9
- constructor(confidence: RuleConfidence);
10
+ constructor(phaseConfig: RulePhaseConfig);
10
11
  execute(context: IVideoAbrContext): IAbrRuleResolution<IVideoTrack>;
11
12
  protected createLogMessage(selectedTrack: IVideoTrack, containerSizeLimit: Nullable<IContainerSizeLimit>, containerSizeFactor: number, abrTuning: ITuningConfig["autoTrackSelection"]): string;
12
13
  private getContainerSizeLimit;