@vkontakte/videoplayer-core 2.0.129-dev.93c0f27a.0 → 2.0.129-dev.d16e5b92.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vkontakte/videoplayer-core",
-  "version": "2.0.129-dev.93c0f27a.0",
+  "version": "2.0.129-dev.d16e5b92.0",
   "author": "vk.com",
   "description": "Videoplayer core library based on the vk.com platform",
   "homepage": "https://vk.com",
@@ -49,7 +49,7 @@
     "**/*.d.ts"
   ],
   "dependencies": {
-    "@vkontakte/videoplayer-shared": "1.0.56",
+    "@vkontakte/videoplayer-shared": "1.0.57-dev.1524525f.0",
     "hls.js": "~1.4.7"
   }
 }

package/types/player/Player.d.ts

@@ -1,5 +1,5 @@
 import { IOptionalTuningConfig } from '../utils/tuningConfig';
-import { IError, ILogEntry, Seconds, Subject, ValueSubject, QualityLimits, VideoQuality, ITracer } from '@vkontakte/videoplayer-shared';
+import { IError, ILogEntry, ITracer, QualityLimits, Seconds, Subject, ValueSubject, VideoQuality } from '@vkontakte/videoplayer-shared';
 import { ChromecastState, HttpConnectionType, IAudioStream, IConfig, ICueSettings, IExternalTextTrack, IPlayer, ISeekRequest, ISources, ITextTrack, IVideoStream, PlaybackRate, PlaybackState, PredefinedQualityLimits, StartEnd, Surface, VideoFormat } from './types';
 export default class Player implements IPlayer {
     private subscription;
@@ -40,6 +40,7 @@ export default class Player implements IPlayer {
         currentAudioStream$: ValueSubject<IVideoStream | undefined>;
         availableAudioTracks$: ValueSubject<import("./types").IBaseTrack[]>;
         isAudioAvailable$: ValueSubject<boolean>;
+        isAudioOnly$: ValueSubject<boolean>;
         currentPlaybackRate$: ValueSubject<number>;
         currentBuffer$: ValueSubject<StartEnd<number>>;
         isBuffering$: ValueSubject<boolean>;
@@ -47,7 +48,7 @@ export default class Player implements IPlayer {
         isEnded$: ValueSubject<boolean>;
         isLooped$: ValueSubject<boolean>;
         isLive$: ValueSubject<boolean | undefined>;
-        isLiveEnded$: ValueSubject<boolean | null>;
+        isLiveEnded$: ValueSubject<boolean | undefined>;
         canChangePlaybackSpeed$: ValueSubject<boolean | undefined>;
         atLiveEdge$: ValueSubject<boolean | undefined>;
         atLiveDurationEdge$: ValueSubject<boolean | undefined>;
@@ -113,6 +114,8 @@ export default class Player implements IPlayer {
         getCurrentTime$: ValueSubject<null>;
     };
     constructor(tuning?: IOptionalTuningConfig, tracer?: ITracer);
+    setAudioOnly(value: boolean): IPlayer;
+    isAudioOnly(): boolean;
     initVideo(config: IConfig): IPlayer;
     destroy(): void;
     prepare(): IPlayer;
@@ -180,9 +183,12 @@ export default class Player implements IPlayer {
     releaseCamera(): this;
     getExactTime(): Seconds;
     getAllLogs(): ILogEntry[];
+    private isAudioOnlyPossible;
     private getScene3D;
     private setIntrinsicVideoSize;
     private initDesiredStateSubscriptions;
+    private readonly handleProviderWillSeek;
+    private readonly handleProviderSeekedEvent;
     private initProviderContainerSubscription;
     private initChromecastSubscription;
     private initStartingVideoTrack;

package/types/player/types.d.ts

@@ -7,6 +7,8 @@ export interface StartEnd<Unit extends number> {
 export interface IPlayer {
     info: IPlayerInfo;
     events: IPlayerEvents;
+    setAudioOnly(value: boolean): IPlayer;
+    isAudioOnly(): boolean;
     /**
      * Инициализация видео
      */
@@ -256,6 +258,12 @@ export interface IPlayerInfo {
      * default value: true
      */
     isAudioAvailable$: IValueSubject<boolean>;
+    /**
+     * Режим "только звук"
+     *
+     * default value: false
+     */
+    isAudioOnly$: IValueSubject<boolean>;
     /**
      * Реальное качество, в котором сейчас воспроизводится видео.
      *
@@ -313,7 +321,7 @@ export interface IPlayerInfo {
     /**
      * Был ли завершен бесконечный стрим
      */
-    isLiveEnded$: IValueObservable<boolean | null>;
+    isLiveEnded$: IValueObservable<boolean | undefined>;
     /**
      * Доступно ли ускоренное воспроизведении в лайв трансляции
      */

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

@@ -1,9 +1,9 @@
-import { IAudioTrack, IDashURLSource, IHLSSource, IInternalTextTrack, IVideoTrack } from '../../player/types';
+import { IAudioTrack, IBaseTrack, IDashURLSource, IHLSSource, IInternalTextTrack, IVideoTrack } from '../../player/types';
 import { CommonInit, IProviderSubscriptionInfo, ProviderState, Representation, Stream } from './lib/types';
 import { IProvider, IProviderParams } from '../../providers/types';
 import { TrackHistory } from '../../utils/autoSelectTrack';
 import { IStateMachine } from '../../utils/StateMachine/types';
-import { ISubscription, Milliseconds, ITracer } from '@vkontakte/videoplayer-shared';
+import { ISubscription, ITracer, Milliseconds } from '@vkontakte/videoplayer-shared';
 import { Player } from './lib/player';
 import { Scene3D } from '../../utils/3d/Scene3D';
 import DroppedFramesManager from '../../providers/utils/HTMLVideoElement/DroppedFramesManager';
@@ -40,12 +40,17 @@ export default abstract class BaseDashProvider implements IProvider {
     protected videoStreamsMap: Map<Stream, IVideoTrack[]>;
     protected audioStreamsMap: Map<Stream, IAudioTrack[]>;
     protected videoTrackSwitchHistory: TrackHistory<IVideoTrack>;
-    protected audioTrackSwitchHistory: TrackHistory<import("../../player/types").IBaseTrack>;
+    protected audioTrackSwitchHistory: TrackHistory<IBaseTrack>;
     constructor(params: IParams);
+    protected getDesiredAudioOnly(): boolean;
     protected abstract seek(position: Milliseconds, forcePrecise: boolean): void;
     protected getProviderSubscriptionInfo(): IProviderSubscriptionInfo;
     protected subscribe(): void;
-    protected selectVideoAudioRepresentations(): [Representation, Representation | undefined] | undefined;
+    protected getForwardBufferHealth(isAuto: boolean): number;
+    protected selectVideoAudioRepresentations(): {
+        video?: Representation;
+        audio?: Representation;
+    };
     protected prepare(manifestOffset?: number): void;
     protected syncPlayback: () => undefined;
     protected init3DScene: (init: CommonInit) => void;

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

@@ -108,7 +108,7 @@ export declare class BufferManager {
     private pruneBuffer;
     private abortBuffer;
     getDebugBufferState(): IRange<Milliseconds> | undefined;
-    getForwardBufferDuration(): Milliseconds;
+    getForwardBufferDuration(currentPosition?: Milliseconds | undefined): Milliseconds;
     private detectGaps;
     private detectGapsWhenIdle;
     private checkEjectedSegments;

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

@@ -23,10 +23,10 @@ export declare class Player {
     private manifest;
     private tuning;
     private tracer;
-    private videoBufferManager;
-    private audioBufferManager;
+    private videoBufferManager?;
+    private audioBufferManager?;
     private bufferManagers;
-    private liveTextManager;
+    private liveTextManager?;
     private throughputEstimator;
     private subscription;
     private representationSubscription;
@@ -42,7 +42,8 @@ export declare class Player {
     lastConnectionReused$: IValueSubject<boolean | undefined>;
     lastRequestFirstBytes$: IValueSubject<Milliseconds | undefined>;
     currentLiveTextRepresentation$: IValueSubject<TextRepresentation | null>;
-    isLive$: IValueSubject<boolean>;
+    private timeoutSourceOpenId;
+    isLive$: IValueSubject<boolean | undefined>;
     isActiveLive$: IValueSubject<boolean>;
     isLowLatency$: IValueSubject<boolean>;
     liveDuration$: IValueSubject<Milliseconds>;
@@ -66,15 +67,19 @@ export declare class Player {
     private gapWatchdogSubscription;
     private stallWatchdogSubscription;
     private livePauseWatchdogSubscription;
+    private isAudioOnly;
     private destroyController;
     constructor(params: Params);
+    setAudioOnly(value: boolean): void;
     initManifest: (param_0: HTMLVideoElement, param_1: string, param_2: number) => Promise<void | undefined>;
     updateManifest: () => Promise<Manifest | null | undefined>;
     seekLive(nextOffset: Milliseconds): Promise<void>;
-    initRepresentations: (param_0: string, param_1: string | undefined, param_2: import("../../../player/types").URLSource | undefined) => Promise<void | undefined>;
+    initRepresentations: (param_0: string | undefined, param_1: string | undefined, param_2: import("../../../player/types").URLSource | undefined) => Promise<void | undefined>;
     initBuffer(): void;
     switchRepresentation(kind: StreamKind, id: Representation['id'], dropBuffer?: boolean): Promise<void>;
     seek(requestedPosition: Milliseconds, forcePrecise: boolean): Promise<void>;
+    warmUpMediaSourceIfNeeded(position?: Milliseconds | undefined): void;
+    get isStreamEnded(): boolean;
     stop(): void;
     setBufferTarget(time: Milliseconds): void;
     getStreams(): Manifest['streams'] | undefined;

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

@@ -30,7 +30,7 @@ export default class ProviderContainer implements IProviderContainer {
     init(): void;
     destroy(): void;
     private initProvider;
-    private reinitProvider;
+    reinitProvider(): void;
     private switchToNextProvider;
     private destroyProvider;
     private createProvider;

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

@@ -8,6 +8,7 @@ export interface IProviderContainer {
     volumeMultiplierError$: ISubject<IError>;
     providerOutput: IProviderOutput;
     init(): void;
+    reinitProvider(): void;
     destroy(): void;
 }
 export type IProviderEntry = {

package/types/providers/types.d.ts

@@ -44,6 +44,7 @@ export interface IDesiredState {
     currentTextTrack: IStateMachine<ITextTrack['id'] | undefined>;
     textTrackCuesSettings: IStateMachine<ICueSettings>;
     cameraOrientation: IStateMachine<Vector2D>;
+    isAudioOnly: IStateMachine<boolean>;
 }
 export interface IProviderOutput {
     position$: IValueSubject<Seconds>;
@@ -61,13 +62,14 @@ export interface IProviderOutput {
     availableTextTracks$: IValueSubject<ITextTrack[]>;
     currentTextTrack$: IValueSubject<ITextTrack['id'] | undefined>;
     isAudioAvailable$: IValueSubject<boolean>;
+    isAudioOnlyAvailable$: IValueSubject<boolean>;
     autoVideoTrackLimits$: IValueSubject<QualityLimits | undefined>;
     autoVideoTrackLimitingAvailable$: IValueSubject<boolean>;
     canChangePlaybackSpeed$: IValueSubject<boolean | undefined>;
     currentBuffer$: IValueSubject<IRange<Seconds> | undefined>;
     isBuffering$: IValueSubject<boolean>;
     isLive$: IValueSubject<boolean | undefined>;
-    isLiveEnded$: IValueSubject<boolean | null>;
+    isLiveEnded$: IValueSubject<boolean | undefined>;
     isLowLatency$: IValueSubject<boolean | undefined>;
     liveTime$: IValueSubject<Milliseconds | undefined>;
     liveBufferTime$: IValueSubject<Milliseconds | undefined>;

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

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

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

@@ -1,4 +1,4 @@
-import { ExactVideoQuality, IObservable, IValueSubject, Milliseconds, Kbps } from '@vkontakte/videoplayer-shared';
+import { ExactVideoQuality, IObservable, IValueSubject, Milliseconds, Kbps, Seconds } from '@vkontakte/videoplayer-shared';
 import { IVideoTrack } from '../../player/types';
 import { ITuningConfig } from '../../utils/tuningConfig';
 interface IConnectData {
@@ -7,6 +7,7 @@ interface IConnectData {
     rtt$: IValueSubject<Milliseconds>;
     isBuffering$: IObservable<boolean>;
     isSeeked$: IObservable<boolean>;
+    looped$: IObservable<Seconds>;
     currentStallDuration$: IObservable<Milliseconds>;
     qualityLimitsOnStall: ITuningConfig['dash']['qualityLimitsOnStall'];
 }

package/types/utils/autoSelectTrack.d.ts

@@ -27,5 +27,10 @@ export declare class TrackHistory<T extends IBaseTrack> {
 export declare const defaultEmptyArrayErrorMessage = "Assertion \"ABR Tracks is empty array\" failed";
 export declare const getMinPossibleAudioForVideo: (videoTrack: IVideoTrack, videoTracks: IVideoTrack[], audioTracks: IAudioTrack[], minVideoAudioRatio: number) => IAudioTrack | undefined;
 export declare const autoSelectVideoTrack: (videoTracks: IVideoTrack[], { container, estimatedThroughput, tuning, limits, reserve, forwardBufferHealth, playbackRate, current, history, visible, droppedVideoMaxQualityLimit, stallsVideoMaxQualityLimit, stallsPredictedThroughput, abrLogger, }: IConstraints<IVideoTrack>) => IVideoTrack;
+/**
+ * Выбор аудио для режима "только звук"
+ * Просто берём лучшее качество
+ */
+export declare const autoSelectAudioTrack: (audioTracks: IAudioTrack[]) => IAudioTrack;
 export declare const autoSelectAudioTrackForVideo: (selectedVideoTrack: IVideoTrack, videoTracks: IVideoTrack[], audioTracks: IAudioTrack[], { estimatedThroughput, tuning, playbackRate, forwardBufferHealth, history, abrLogger, stallsPredictedThroughput, }: IConstraints<IAudioTrack>) => IAudioTrack | undefined;
 export {};

package/types/utils/tuningConfig.d.ts

@@ -61,6 +61,7 @@ export type ITuningConfig = {
         forwardBufferTargetAuto: Milliseconds;
         forwardBufferTargetManual: Milliseconds;
         forwardBufferTargetPreload: Milliseconds;
+        seekBiasInTheEnd: Milliseconds;
         maxSegmentDurationLeftToSelectNextSegment: Milliseconds;
         minSafeBufferThreshold: number;
         bufferPruningSafeZone: Milliseconds;
@@ -73,11 +74,15 @@ export type ITuningConfig = {
         useFetchPriorityHints: boolean;
         qualityLimitsOnStall: {
             stallDurationNoDataBeforeQualityDecrease: Milliseconds;
+            stallDurationToBeCount: Milliseconds;
             stallCountBeforeQualityDecrease: Milliseconds;
             resetQualityRestrictionTimeout: Milliseconds;
+            ignoreStallsOnSeek: boolean;
         };
         enableBaseUrlSupport: boolean;
         maxSegmentRetryCount: number;
+        sourceOpenTimeout: number;
+        rejectOnSourceOpenTimeout: boolean;
     };
     dashCmafLive: {
         maxActiveLiveOffset: Milliseconds;
@@ -141,6 +146,7 @@ export type ITuningConfig = {
     stripRangeHeader: boolean;
     flushShortLoopedBuffers: boolean;
     insufficientBufferRuleMargin: Milliseconds;
+    seekNearDurationBias: Seconds;
     dashSeekInSegmentDurationThreshold: Milliseconds;
     dashSeekInSegmentAlwaysSeekDelta: Milliseconds;
     endGapTolerance: Milliseconds;