@vkontakte/videoplayer-core 2.0.42 → 2.0.45

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vkontakte/videoplayer-core",
-  "version": "2.0.42",
+  "version": "2.0.45",
   "author": "vk.com",
   "description": "Videoplayer core library based on the vk.com platform",
   "homepage": "https://vk.com",
@@ -14,7 +14,7 @@
     "**/*.d.ts"
   ],
   "dependencies": {
-    "@vkontakte/videoplayer-shared": "1.0.8",
+    "@vkontakte/videoplayer-shared": "1.0.9",
     "dashjs": "4.3.0",
     "hls.js": "1.1.5",
     "lodash": "4.17.21"

package/player/Player.d.ts

@@ -1,7 +1,7 @@
 import { Subject, ValueSubject, ILogEntry, IError } from '@vkontakte/videoplayer-shared';
 import { IOptionalTuningConfig } from "../utils/tuningConfig";
 import { HttpConnectionType, ICueSettings } from "./types";
-import { VideoQuality } from "../utils/quality/types";
+import { QualityLimits, VideoQuality } from "../utils/quality/types";
 import { IRange } from "../utils/range";
 import { IConfig, ChromecastState, IExternalTextTrack, IPlayer, ISeekRequest, ITextTrack, PlaybackState, StartStatus, VideoFormat } from './types';
 export default class Player implements IPlayer {
@@ -26,6 +26,7 @@ export default class Player implements IPlayer {
         availableQualitiesFps$: ValueSubject<Partial<Record<VideoQuality, number>>>;
         currentQuality$: ValueSubject<VideoQuality | undefined>;
         isAutoQualityEnabled$: ValueSubject<boolean>;
+        autoQualityLimits$: ValueSubject<QualityLimits>;
         currentBuffer$: ValueSubject<IRange<number> | undefined>;
         isBuffering$: ValueSubject<boolean>;
         isStalled$: ValueSubject<boolean>;
@@ -60,6 +61,7 @@ export default class Player implements IPlayer {
         managedError$: Subject<IError>;
         fatalError$: Subject<IError>;
         ended$: Subject<void>;
+        looped$: Subject<number>;
         seeked$: Subject<void>;
         willSeek$: Subject<ISeekRequest>;
         firstBytes$: Subject<number>;
@@ -87,6 +89,7 @@ export default class Player implements IPlayer {
     setMuted(muted: boolean): IPlayer;
     setQuality(quality: VideoQuality): IPlayer;
     setAutoQuality(enable: boolean): IPlayer;
+    setAutoQualityLimits(limits: QualityLimits): IPlayer;
     setExternalTextTracks(tracks: Omit<IExternalTextTrack, 'type'>[]): IPlayer;
     selectTextTrack(id: ITextTrack['id'] | undefined): IPlayer;
     setTextTrackCueSettings(settings: ICueSettings): IPlayer;

package/player/types.d.ts

@@ -1,5 +1,5 @@
 import { IObservable, IValueObservable, IValueSubject, ILogEntry, Kbps, Milliseconds, Seconds, IError } from '@vkontakte/videoplayer-shared';
-import { VideoQuality } from "../utils/quality/types";
+import { QualityLimits, VideoQuality } from "../utils/quality/types";
 import { IRange } from "../utils/range";
 import { IRectangle } from "../utils/rectangle";
 export interface IPlayer {
@@ -28,6 +28,7 @@ export interface IPlayer {
     setMuted(muted: boolean): IPlayer;
     setQuality(quality: VideoQuality): IPlayer;
     setAutoQuality(enable: boolean): IPlayer;
+    setAutoQualityLimits(limit: QualityLimits): IPlayer;
     setLooped(isLooped: boolean): IPlayer;
     setExternalTextTracks(tracks: Omit<IExternalTextTrack, 'type'>[]): IPlayer;
     selectTextTrack(id: ITextTrack['id'] | undefined): IPlayer;
@@ -105,6 +106,10 @@ export interface IPlayerEvents {
      * Проигрывание видео завершено
      */
     ended$: IObservable<void>;
+    /**
+     * Видео доиграло до конца, перемоталось в начало и заиграло снова, в параметре время в которое произошло переключение
+     */
+    looped$: IObservable<Seconds>;
     /**
      * Совершена перемотка
      */

package/player/utils/watchCoverage.d.ts

@@ -1,4 +1,4 @@
-import { IObservable, IValueObservable } from '@vkontakte/videoplayer-shared';
+import { IObservable, IValueObservable, Seconds } from '@vkontakte/videoplayer-shared';
 import { IRange } from "../../utils/range";
 import { IStateMachine } from "../../utils/StateMachine/types";
 import { PlaybackState } from "../types";
@@ -6,8 +6,9 @@ interface IParams {
     playbackState: IStateMachine<PlaybackState>;
     seekPosition: IStateMachine<number | undefined>;
     playbackAbort$: IObservable<void>;
-    position$: IValueObservable<number>;
+    looped$: IObservable<Seconds>;
+    position$: IValueObservable<Seconds>;
 }
-export declare const watchCoverageRecord: ({ playbackState, seekPosition, playbackAbort$, position$, }: IParams) => IObservable<IRange<number>>;
-export declare const watchCoverageLive: ({ playbackState, seekPosition, playbackAbort$, position$, }: IParams) => IObservable<IRange<number>>;
+export declare const watchCoverageRecord: ({ playbackState, seekPosition, playbackAbort$, looped$, position$, }: IParams) => IObservable<IRange<number>>;
+export declare const watchCoverageLive: ({ playbackState, seekPosition, playbackAbort$, looped$, position$, }: IParams) => IObservable<IRange<number>>;
 export {};

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

@@ -8,6 +8,7 @@ interface IParams {
 export default class LiveDashPlayer {
     private paused;
     private autoQuality;
+    private maxAutoQuality;
     private buffering;
     private destroyed;
     private videoPlayStarted;
@@ -35,6 +36,7 @@ export default class LiveDashPlayer {
      * switch to auto quality
      */
     setAutoQualityEnabled(enabled: boolean): void;
+    setMaxAutoQuality(height: number | undefined): void;
     /**
      * switch quality by name
      */

package/providers/DashVKProvider/lib/types.d.ts

@@ -25,6 +25,7 @@ export interface Representation {
     height: number;
     url: string;
     fps?: number;
+    quality?: string;
 }
 export interface Segment {
     status: SegmentStatus;

package/providers/ProviderContainer/index.d.ts

@@ -28,6 +28,7 @@ export default class ProviderContainer implements IProviderContainer {
         error$: Subject<IError>;
         willSeekEvent$: Subject<void>;
         seekedEvent$: Subject<void>;
+        loopedEvent$: Subject<number>;
         endedEvent$: Subject<void>;
         firstBytesEvent$: Subject<number>;
         firstFrameEvent$: Subject<number>;

package/providers/types.d.ts

@@ -1,3 +1,4 @@
+import { QualityLimits } from "../utils/quality/types";
 import { ITuningConfig } from "../utils/tuningConfig";
 import { ILogger, ISubject, IValueSubject, Milliseconds, Seconds, IError } from '@vkontakte/videoplayer-shared';
 import { IChromecastInitializer } from "./ChromecastProvider/ChromecastInitializer/types";
@@ -29,6 +30,7 @@ export interface IDesiredState {
     volume: IStateMachine<IVolumeState>;
     videoTrack: IStateMachine<IVideoTrack['id'] | undefined>;
     autoVideoTrackSwitching: IStateMachine<boolean>;
+    autoVideoTrackLimits: IStateMachine<QualityLimits>;
     isLooped: IStateMachine<boolean>;
     externalTextTracks: IStateMachine<IExternalTextTrack[]>;
     currentTextTrack: IStateMachine<ITextTrack['id'] | undefined>;
@@ -54,6 +56,7 @@ export interface IProviderOutput {
     seekedEvent$: ISubject<void>;
     error$: ISubject<IError>;
     endedEvent$: ISubject<void>;
+    loopedEvent$: ISubject<Seconds>;
     firstBytesEvent$: ISubject<number>;
     firstFrameEvent$: ISubject<number>;
 }

package/providers/utils/observableVideo.d.ts

@@ -6,6 +6,7 @@ interface IObservableVideo {
     pause$: IObservable<undefined>;
     canplay$: IObservable<undefined>;
     ended$: IObservable<undefined>;
+    looped$: IObservable<Seconds>;
     error$: IObservable<IError>;
     seeked$: IObservable<undefined>;
     seeking$: IObservable<undefined>;

package/utils/autoSelectVideoTrack.d.ts

@@ -2,13 +2,15 @@ import { IRepresentation } from "../providers/DashProvider/types";
 import { ITuningConfig } from "./tuningConfig";
 import { Kbps } from '@vkontakte/videoplayer-shared';
 import { IVideoTrack } from "../player/types";
+import { QualityLimits } from "./quality/types";
 import { IRectangle } from "./rectangle";
 export interface Constraints {
     container?: IRectangle;
     throughput?: Kbps;
     tuning: ITuningConfig['autoTrackSelection'];
+    limits?: QualityLimits;
     forwardBufferHealth?: number;
     currentRepresentation?: IRepresentation;
 }
-declare const autoSelectVideoTrack: (tracks: IVideoTrack[], { container, throughput, tuning, forwardBufferHealth, currentRepresentation, }: Constraints) => IVideoTrack;
+declare const autoSelectVideoTrack: (tracks: IVideoTrack[], { container, throughput, tuning, limits, forwardBufferHealth, currentRepresentation, }: Constraints) => IVideoTrack;
 export default autoSelectVideoTrack;

package/utils/quality/types.d.ts

@@ -11,3 +11,11 @@ export declare enum VideoQuality {
     Q_4320P = "4320p"
 }
 export declare type ExactVideoQuality = Exclude<VideoQuality, VideoQuality.INVARIANT>;
+/**
+ * Лимиты трактуются включительно
+ * Значение undefined снимает лимит
+ */
+export declare type QualityLimits = {
+    max?: ExactVideoQuality;
+    min?: ExactVideoQuality;
+};

package/utils/quality/utils.d.ts

@@ -1,7 +1,9 @@
 import { IRectangle } from '../rectangle';
 import { ExactVideoQuality, VideoQuality } from './types';
 export declare const isHigher: (a: ExactVideoQuality, b: ExactVideoQuality) => boolean;
+export declare const isHigherOrEqual: (a: ExactVideoQuality, b: ExactVideoQuality) => boolean;
 export declare const isLower: (a: ExactVideoQuality, b: ExactVideoQuality) => boolean;
+export declare const isLowerOrEqual: (a: ExactVideoQuality, b: ExactVideoQuality) => boolean;
 export declare const getHighestQuality: (qualities: VideoQuality[]) => VideoQuality | undefined;
 /**
  * Выбирает качество, наиболее близкое к указанной высоте кадра, но не менее её.
@@ -11,7 +13,7 @@ export declare const videoHeightToQuality: (height: number, tolerance?: number)
 /**
  * Выбирает качество описывающее заданные размеры видео потока, т.е. не меньше его.
  */
-export declare const videoSizeToQuality: ({ width, height }: IRectangle, tolerance?: number | undefined) => ExactVideoQuality | undefined;
+export declare const videoSizeToQuality: ({ width, height }: IRectangle) => ExactVideoQuality | undefined;
 export declare const videoQualityToHeight: (quality: ExactVideoQuality) => number;
 export declare const isInvariantQuality: (quality: VideoQuality) => quality is VideoQuality.INVARIANT;
 export declare const areQualitiesExact: (qualities: VideoQuality[]) => qualities is ExactVideoQuality[];