From 83fcadac86da0bc6120a5b93850bb9a7fc069fba Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 31 Jan 2020 11:39:50 +0100 Subject: Move streamroot plugin in core project To avoid an already bundled HLS.js library, and adapt some parts of the code --- .../src/assets/player/peertube-videojs-typings.ts | 57 +++++++++++++++++----- 1 file changed, 44 insertions(+), 13 deletions(-) (limited to 'client/src/assets/player/peertube-videojs-typings.ts') diff --git a/client/src/assets/player/peertube-videojs-typings.ts b/client/src/assets/player/peertube-videojs-typings.ts index e45722661..8f3d76cac 100644 --- a/client/src/assets/player/peertube-videojs-typings.ts +++ b/client/src/assets/player/peertube-videojs-typings.ts @@ -1,13 +1,17 @@ -import videojs from 'video.js' import { PeerTubePlugin } from './peertube-plugin' import { WebTorrentPlugin } from './webtorrent/webtorrent-plugin' import { P2pMediaLoaderPlugin } from './p2p-media-loader/p2p-media-loader-plugin' import { PlayerMode } from './peertube-player-manager' import { RedundancyUrlManager } from './p2p-media-loader/redundancy-url-manager' import { VideoFile } from '@shared/models' +import videojs from 'video.js' +import { Config, Level } from 'hls.js' declare module 'video.js' { + export interface VideoJsPlayer { + srOptions_: HlsjsConfigHandlerOptions + theaterEnabled: boolean // FIXME: add it to upstream typings @@ -21,32 +25,57 @@ declare module 'video.js' { // Plugins peertube (): PeerTubePlugin + webtorrent (): WebTorrentPlugin + p2pMediaLoader (): P2pMediaLoaderPlugin contextmenuUI (options: any): any bezels (): void - qualityLevels (): { height: number, id: number }[] & { - selectedIndex: number - selectedIndex_: number - - addQualityLevel (representation: { - id: number - label: string - height: number - _enabled: boolean - }): void - } + qualityLevels (): QualityLevels textTracks (): TextTrackList & { on: Function tracks_: { kind: string, mode: string, language: string }[] } + + audioTracks (): AudioTrackList } } +export interface VideoJSTechHLS extends videojs.Tech { + hlsProvider: any // FIXME: typings +} + +export interface HlsjsConfigHandlerOptions { + hlsjsConfig?: Config & { cueHandler: any }// FIXME: typings + captionConfig?: any // FIXME: typings + + levelLabelHandler?: (level: Level) => string +} + +type QualityLevelRepresentation = { + id: number + height: number + + label?: string + width?: number + bandwidth?: number + bitrate?: number + + enabled?: Function + _enabled: boolean +} + +type QualityLevels = QualityLevelRepresentation[] & { + selectedIndex: number + selectedIndex_: number + + addQualityLevel (representation: QualityLevelRepresentation): void +} + type VideoJSCaption = { label: string language: string @@ -148,5 +177,7 @@ export { WebtorrentPluginOptions, P2PMediaLoaderPluginOptions, VideoJSPluginOptions, - LoadedQualityData + LoadedQualityData, + QualityLevelRepresentation, + QualityLevels } -- cgit v1.2.3