@vkontakte/videoplayer-core 2.0.172-dev.c95ba2d10.0 → 2.0.172

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vkontakte/videoplayer-core",
-  "version": "2.0.172-dev.c95ba2d10.0",
+  "version": "2.0.172",
   "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.101-dev.c95ba2d10.0"
+    "@vkontakte/videoplayer-shared": "1.0.101"
   }
 }

package/types/player/types.d.ts

@@ -331,6 +331,10 @@ export interface PlayerInfoValues {
 	/**
 	* Текущий браузерный аудио-буффер (тот; который содержит текущую позицию воспроизведения)
 	*
+	* Семантика: для большинства провайдеров источник один — HTMLMediaElement, у которого `buffered` общий на audio- и video-данные
+	* (по спеке HTML audio data = mix всех enabled audio tracks, video data = currently selected video track — https://html.spec.whatwg.org/multipage/media.html#media-resource).
+	* В таких случаях значение совпадает с `currentNativeVideoBuffer$`.
+	*
 	* default value: `undefined`
 	*/
 	currentNativeAudioBuffer$: StartEnd<Seconds> | undefined;

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

@@ -3,7 +3,7 @@ import type { IProviderSubscriptionInfo } from "./lib/types";
 import { ProviderState } from "./lib/types";
 import type { Representation, Stream } from "../utils/parsers/types";
 import type { IProvider, IProviderAllocationResolution, IProviderParams } from "../types";
-import type { IObservableVideo } from "../utils/HTMLVideoElement/observable";
+import type { IObservableMediaElement } from "../utils/HTMLVideoElement/observable";
 import type { IStateMachine } from "../../utils/StateMachine/types";
 import type { ExactVideoQuality, ISubscription, ITracer, Milliseconds, Nullable } from "@vkontakte/videoplayer-shared";
 import { Player } from "./lib/player";
@@ -23,7 +23,7 @@ export default abstract class BaseDashProvider implements IProvider {
 	protected volumeSubscription: ISubscription;
 	protected videoState: IStateMachine<ProviderState>;
 	protected readonly allocation: IProviderAllocationResolution;
-	protected observableVideo: IObservableVideo | null;
+	protected observableVideo: IObservableMediaElement | null;
 	protected player: Player;
 	protected params: IParams;
 	protected tracer: ITracer;

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

@@ -1,6 +1,6 @@
 import type { IObservable, ISubject, IValueSubject } from "@vkontakte/videoplayer-shared";
 import type { IDesiredState, IProviderOutput, IProviderParams } from "../../types";
-import type { IObservableVideo } from "../../utils/HTMLVideoElement/observable";
+import type { IObservableMediaElement } from "../../utils/HTMLVideoElement/observable";
 import type { IDashURLSource } from "../../../player/types";
 export declare enum LiveStatus {
 	ActiveLowLatency = "active_low_latency",
@@ -16,7 +16,7 @@ export declare enum LiveStreamStatus {
 export interface IProviderSubscriptionInfo {
 	output: IProviderOutput;
 	desiredState: IDesiredState;
-	observableVideo: IObservableVideo;
+	observableVideo: IObservableMediaElement;
 	genericErrorListener: (error: Error | unknown) => void;
 	connect: <Value>(from: IObservable<Value>, to: ISubject<Value> | IValueSubject<Value> | ((v: Value) => void)) => void;
 }

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

@@ -3,7 +3,7 @@ import type { IProviderSubscriptionInfo } from "./lib/types";
 import { ProviderState } from "./lib/types";
 import type { Representation, Stream } from "../utils/parsers/types";
 import type { IProvider, IProviderAllocationResolution, IProviderParams } from "../types";
-import type { IObservableVideo } from "../utils/HTMLVideoElement/observable";
+import type { IObservableMediaElement } from "../utils/HTMLVideoElement/observable";
 import type { IStateMachine } from "../../utils/StateMachine/types";
 import type { ExactVideoQuality, ISubscription, ITracer, Milliseconds, Nullable } from "@vkontakte/videoplayer-shared";
 import DroppedFramesManager from "../utils/HTMLVideoElement/DroppedFramesManager";
@@ -23,7 +23,7 @@ export default abstract class BaseDashProvider implements IProvider {
 	protected volumeSubscription: ISubscription;
 	protected videoState: IStateMachine<ProviderState>;
 	protected readonly allocation: IProviderAllocationResolution;
-	protected observableVideo: IObservableVideo | null;
+	protected observableVideo: IObservableMediaElement | null;
 	protected player: BasePlayer;
 	protected params: IParams;
 	protected tracer: ITracer;

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

@@ -1,6 +1,6 @@
 import type { IObservable, ISubject, IValueSubject } from "@vkontakte/videoplayer-shared";
 import type { IDesiredState, IProviderOutput, IProviderParams } from "../../types";
-import type { IObservableVideo } from "../../utils/HTMLVideoElement/observable";
+import type { IObservableMediaElement } from "../../utils/HTMLVideoElement/observable";
 import type { IDashURLSource } from "../../../player/types";
 export declare enum LiveStatus {
 	ActiveLowLatency = "active_low_latency",
@@ -16,7 +16,7 @@ export declare enum LiveStreamStatus {
 export interface IProviderSubscriptionInfo {
 	output: IProviderOutput;
 	desiredState: IDesiredState;
-	observableVideo: IObservableVideo;
+	observableVideo: IObservableMediaElement;
 	genericErrorListener: (error: Error | unknown) => void;
 	connect: <Value>(from: IObservable<Value>, to: ISubject<Value> | IValueSubject<Value> | ((v: Value) => void)) => void;
 }

package/types/providers/HlsProvider/manifestDataExtractor.d.ts

@@ -12,8 +12,6 @@ export type ManifestUrl = {
 	bandwidth?: Kbps;
 	size?: IRectangle;
 	fps?: number;
-	/** HLS fMP4: идентификатор аудио-группы (EXT-X-MEDIA GROUP-ID), к которой привязан вариант через STREAM-INF AUDIO= */
-	audioGroupId?: string;
 };
 export type HLSManifestData = {
 	qualityManifests: ManifestUrl[];

package/types/providers/utils/Abr/controllers/stallsController.d.ts

@@ -1,13 +1,13 @@
 import type { IObservable, ITracer, IValueSubject, Milliseconds } from "@vkontakte/videoplayer-shared";
 import type { ITuningConfig } from "../../../../utils/tuningConfig";
 import type { IVideoTrack } from "../../../../player/types";
-import type { IObservableVideo } from "../../HTMLVideoElement/observable";
+import type { IObservableMediaElement } from "../../HTMLVideoElement/observable";
 interface IConnectData {
 	videoLastDataObtainedTimestamp$: IValueSubject<Milliseconds>;
 	lastVideoTrackSelected$: IValueSubject<IVideoTrack | undefined>;
 	rtt$: IValueSubject<Milliseconds>;
 	isSeeked$: IObservable<boolean>;
-	observableVideo: IObservableVideo;
+	observableVideo: IObservableMediaElement;
 	currentStallDuration$: IValueSubject<Milliseconds>;
 	tuning: ITuningConfig["stallsManager"];
 	tracer: ITracer;

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

@@ -3,7 +3,7 @@ import type { Byte, IComponentLogger, IObservable, IRectangle, ITracer, IValueSu
 import type { ITuningConfig } from "../../../utils/tuningConfig";
 import type { Representation, Segment } from "../parsers/types";
 import type { ElementSizeManager } from "../HTMLVideoElement/ElementSizeManager";
-import type { IObservableVideo } from "../HTMLVideoElement/observable";
+import type { IObservableMediaElement } from "../HTMLVideoElement/observable";
 import type { AbrPhase } from "./controllers/abrPhaseController";
 export declare enum RuleConfidence {
 	Low = 0,
@@ -61,7 +61,7 @@ export interface IInitAbrManagerContext {
 	panelSize?: IRectangle;
 }
 export interface IVideoElementAbrManagerContext {
-	observableVideo: IObservableVideo;
+	observableVideo: IObservableMediaElement;
 	elementVisible$: IValueSubject<boolean>;
 	elementSizeManager?: ElementSizeManager;
 }

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

@@ -1,8 +1,8 @@
-import type { IObservableVideo } from "./observable";
+import type { IObservableMediaElement } from "./observable";
 import type { IListener, IRectangle, ISubscription, IValueSubject } from "@vkontakte/videoplayer-shared";
 interface ConnectParams {
 	video: HTMLVideoElement;
-	observableVideo: IObservableVideo;
+	observableVideo: IObservableMediaElement;
 }
 export declare class ElementSizeManager {
 	private readonly subscription;

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

@@ -1,6 +1,6 @@
 import type { Seconds, IRange, IObservable, IError, IValueObservable, Milliseconds } from "@vkontakte/videoplayer-shared";
 import type { IVolumeState, PlaybackRate } from "../../../player/types";
-export interface IObservableVideo {
+export interface IObservableMediaElement {
 	playing$: IObservable<undefined>;
 	pause$: IObservable<undefined>;
 	canplay$: IObservable<undefined>;
@@ -17,7 +17,7 @@ export interface IObservableVideo {
 	loadedMetadata$: IObservable<undefined>;
 	loadedData$: IObservable<undefined>;
 	isBuffering$: IObservable<boolean>;
-	currentVideoBuffer$: IObservable<IRange<Seconds>>;
+	currentBuffer$: IObservable<IRange<Seconds>>;
 	totalBufferDuration$: IObservable<Milliseconds>;
 	bufferRangeCount$: IObservable<number>;
 	volumeState$: IObservable<IVolumeState>;
@@ -28,4 +28,4 @@ export interface IObservableVideo {
 	leavePip$: IObservable<PictureInPictureEvent>;
 	destroy: () => void;
 }
-export declare const observe: (video: HTMLMediaElement) => IObservableVideo;
+export declare const observe: (video: HTMLMediaElement) => IObservableMediaElement;

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

@@ -1,11 +1,11 @@
 import type { ISubscription, IValueSubject } from "@vkontakte/videoplayer-shared";
 import type { IDesiredState } from "../types";
-import type { IObservableVideo } from "./HTMLVideoElement/observable";
+import type { IObservableMediaElement } from "./HTMLVideoElement/observable";
 type Params = {
 	subscription: ISubscription;
 	desiredState: IDesiredState;
 	videoElement$: IValueSubject<HTMLVideoElement | undefined>;
-	observableVideo: IObservableVideo;
+	observableVideo: IObservableMediaElement;
 };
 /**
 * Когда сафари из за медиа политик отключает звук у видео, и пользователь возвращает звук

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

@@ -1,12 +0,0 @@
-import type { ManifestUrl } from "../HlsProvider/manifestDataExtractor";
-export declare const FMP4_QUALITY_QUERY_PARAMS: readonly ["mq", "lq"];
-/**
-* HLS fMP4: дочерний плейлист варианта не содержит EXT-X-MEDIA групп, поэтому нативный HLS
-* не знает какую аудио-группу подцепить и продолжает держать предыдущую — звук пропадает при
-* смене качества. Решение — грузить мастер-плейлист с зафиксированным качеством через
-* mq=lq=<height>, тогда бэк сам отдаст нужный вариант с правильной аудио-группой.
-*
-* Возвращает undefined, если у варианта нельзя надёжно определить высоту — в этом случае
-* лучше оставить дефолтное поведение провайдера, чем отправлять мусор в URL.
-*/
-export declare const buildFmp4MasterUrl: (masterUrl: string, qualityManifest: ManifestUrl) => URL | undefined;