-import { VideoFile } from '../../../../shared/models/videos'
-// @ts-ignore
-import * as videojs from 'video.js'
-import 'videojs-hotkeys'
+import 'videojs-hotkeys/videojs.hotkeys'
import 'videojs-dock'
import 'videojs-contextmenu-ui'
import 'videojs-contrib-quality-levels'
+import './upnext/end-card'
+import './upnext/upnext-plugin'
+import './bezels/bezels-plugin'
import './peertube-plugin'
+import './videojs-components/next-video-button'
+import './videojs-components/p2p-info-button'
import './videojs-components/peertube-link-button'
+import './videojs-components/peertube-load-progress-bar'
import './videojs-components/resolution-menu-button'
+import './videojs-components/resolution-menu-item'
+import './videojs-components/settings-dialog'
import './videojs-components/settings-menu-button'
-import './videojs-components/p2p-info-button'
-import './videojs-components/peertube-load-progress-bar'
+import './videojs-components/settings-menu-item'
+import './videojs-components/settings-panel'
+import './videojs-components/settings-panel-child'
import './videojs-components/theater-button'
-import { P2PMediaLoaderPluginOptions, UserWatching, VideoJSCaption, VideoJSPluginOptions, videojsUntyped } from './peertube-videojs-typings'
-import { buildVideoEmbed, buildVideoLink, copyToClipboard, getRtcConfig } from './utils'
-import { getCompleteLocale, getShortLocale, is18nLocale, isDefaultLocale } from '../../../../shared/models/i18n/i18n'
-import { segmentValidatorFactory } from './p2p-media-loader/segment-validator'
-import { segmentUrlBuilderFactory } from './p2p-media-loader/segment-url-builder'
+import videojs from 'video.js'
+import { VideoFile } from '@shared/models'
+import { isDefaultLocale } from '@shared/core-utils/i18n'
import { RedundancyUrlManager } from './p2p-media-loader/redundancy-url-manager'
+import { segmentUrlBuilderFactory } from './p2p-media-loader/segment-url-builder'
+import { segmentValidatorFactory } from './p2p-media-loader/segment-validator'
import { getStoredP2PEnabled } from './peertube-player-local-storage'
+import { P2PMediaLoaderPluginOptions, UserWatching, VideoJSCaption, VideoJSPluginOptions } from './peertube-videojs-typings'
+import { TranslationsManager } from './translations-manager'
+import { buildVideoEmbed, buildVideoLink, copyToClipboard, getRtcConfig, isIOS, isSafari } from './utils'
// Change 'Playback Rate' to 'Speed' (smaller for our settings menu)
-videojsUntyped.getComponent('PlaybackRateMenuButton').prototype.controlText_ = 'Speed'
+(videojs.getComponent('PlaybackRateMenuButton') as any).prototype.controlText_ = 'Speed'
+
+const CaptionsButton = videojs.getComponent('CaptionsButton') as any
// Change Captions to Subtitles/CC
-videojsUntyped.getComponent('CaptionsButton').prototype.controlText_ = 'Subtitles/CC'
+CaptionsButton.prototype.controlText_ = 'Subtitles/CC'
// We just want to display 'Off' instead of 'captions off', keep a space so the variable == true (hacky I know)
-videojsUntyped.getComponent('CaptionsButton').prototype.label_ = ' '
+CaptionsButton.prototype.label_ = ' '
export type PlayerMode = 'webtorrent' | 'p2p-media-loader'
muted?: boolean
loop?: boolean
subtitle?: string
+ resume?: string
peertubeLink: boolean
}
onPlayerElementChange: (element: HTMLVideoElement) => void
autoplay: boolean
+ nextVideo?: Function
videoDuration: number
enableHotkeys: boolean
inactivityTimeout: number
}
export class PeertubePlayerManager {
-
- private static videojsLocaleCache: { [ path: string ]: any } = {}
private static playerElementClassName: string
- private static onPlayerChange: (player: any) => void
-
- static getServerTranslations (serverUrl: string, locale: string) {
- const path = PeertubePlayerManager.getLocalePath(serverUrl, locale)
- // It is the default locale, nothing to translate
- if (!path) return Promise.resolve(undefined)
-
- return fetch(path + '/server.json')
- .then(res => res.json())
- .catch(err => {
- console.error('Cannot get server translations', err)
- return undefined
- })
- }
+ private static onPlayerChange: (player: videojs.Player) => void
- static async initialize (mode: PlayerMode, options: PeertubePlayerManagerOptions, onPlayerChange: (player: any) => void) {
+ static async initialize (mode: PlayerMode, options: PeertubePlayerManagerOptions, onPlayerChange: (player: videojs.Player) => void) {
let p2pMediaLoader: any
this.onPlayerChange = onPlayerChange
const videojsOptions = this.getVideojsOptions(mode, options, p2pMediaLoader)
- await this.loadLocaleInVideoJS(options.common.serverUrl, options.common.language)
+ await TranslationsManager.loadLocaleInVideoJS(options.common.serverUrl, options.common.language, videojs)
const self = this
return new Promise(res => {
- videojs(options.common.playerElement, videojsOptions, function (this: any) {
+ videojs(options.common.playerElement, videojsOptions, function (this: videojs.Player) {
const player = this
let alreadyFallback = false
- player.tech_.one('error', () => {
+ player.tech(true).one('error', () => {
if (!alreadyFallback) self.maybeFallbackToWebTorrent(mode, player, options)
alreadyFallback = true
})
self.addContextMenu(mode, player, options.common.embedUrl)
+ player.bezels()
+
return res(player)
})
})
const videojsOptions = this.getVideojsOptions(mode, options)
const self = this
- videojs(newVideoElement, videojsOptions, function (this: any) {
+ videojs(newVideoElement, videojsOptions, function (this: videojs.Player) {
const player = this
self.addContextMenu(mode, player, options.common.embedUrl)
})
}
- private static loadLocaleInVideoJS (serverUrl: string, locale: string) {
- const path = PeertubePlayerManager.getLocalePath(serverUrl, locale)
- // It is the default locale, nothing to translate
- if (!path) return Promise.resolve(undefined)
-
- let p: Promise<any>
-
- if (PeertubePlayerManager.videojsLocaleCache[path]) {
- p = Promise.resolve(PeertubePlayerManager.videojsLocaleCache[path])
- } else {
- p = fetch(path + '/player.json')
- .then(res => res.json())
- .then(json => {
- PeertubePlayerManager.videojsLocaleCache[path] = json
- return json
- })
- .catch(err => {
- console.error('Cannot get player translations', err)
- return undefined
- })
- }
-
- const completeLocale = getCompleteLocale(locale)
- return p.then(json => videojs.addLanguage(getShortLocale(completeLocale), json))
- }
-
- private static getVideojsOptions (mode: PlayerMode, options: PeertubePlayerManagerOptions, p2pMediaLoaderModule?: any) {
+ private static getVideojsOptions (
+ mode: PlayerMode,
+ options: PeertubePlayerManagerOptions,
+ p2pMediaLoaderModule?: any
+ ): videojs.PlayerOptions {
const commonOptions = options.common
- let autoplay = commonOptions.autoplay
+ let autoplay = this.getAutoPlayValue(commonOptions.autoplay)
let html5 = {}
const plugins: VideoJSPluginOptions = {
}
if (mode === 'p2p-media-loader') {
- const { streamrootHls } = PeertubePlayerManager.addP2PMediaLoaderOptions(plugins, options, p2pMediaLoaderModule)
+ const { hlsjs } = PeertubePlayerManager.addP2PMediaLoaderOptions(plugins, options, p2pMediaLoaderModule)
- html5 = streamrootHls.html5
+ html5 = hlsjs.html5
}
if (mode === 'webtorrent') {
html5,
// We don't use text track settings for now
- textTrackSettings: false,
+ textTrackSettings: false as any, // FIXME: typings
controls: commonOptions.controls !== undefined ? commonOptions.controls : true,
loop: commonOptions.loop !== undefined ? commonOptions.loop : false,
? commonOptions.muted
: undefined, // Undefined so the player knows it has to check the local storage
- autoplay: autoplay === true
- ? 'any' // Use 'any' instead of true to get notifier by videojs if autoplay fails
- : autoplay,
+ autoplay: this.getAutoPlayValue(autoplay),
poster: commonOptions.poster,
inactivityTimeout: commonOptions.inactivityTimeout,
children: this.getControlBarChildren(mode, {
captions: commonOptions.captions,
peertubeLink: commonOptions.peertubeLink,
- theaterButton: commonOptions.theaterButton
- })
+ theaterButton: commonOptions.theaterButton,
+ nextVideo: commonOptions.nextVideo
+ }) as any // FIXME: typings
}
}
let consumeOnly = false
// FIXME: typings
- if (navigator && (navigator as any).connection && (navigator as any).connection.effectiveType === 'cellular') {
+ if (navigator && (navigator as any).connection && (navigator as any).connection.type === 'cellular') {
console.log('We are on a cellular connection: disabling seeding.')
consumeOnly = true
}
swarmId: p2pMediaLoaderOptions.playlistUrl
}
}
- const streamrootHls = {
+ const hlsjs = {
levelLabelHandler: (level: { height: number, width: number }) => {
- const file = p2pMediaLoaderOptions.videoFiles.find(f => f.resolution.id === level.height)
+ const resolution = Math.min(level.height || 0, level.width || 0)
+
+ const file = p2pMediaLoaderOptions.videoFiles.find(f => f.resolution.id === resolution)
+ if (!file) {
+ console.error('Cannot find video file for level %d.', level.height)
+ return level.height
+ }
let label = file.resolution.label
if (file.fps >= 50) label += file.fps
}
}
- const toAssign = { p2pMediaLoader, streamrootHls }
+ const toAssign = { p2pMediaLoader, hlsjs }
Object.assign(plugins, toAssign)
return toAssign
private static getControlBarChildren (mode: PlayerMode, options: {
peertubeLink: boolean
theaterButton: boolean,
- captions: boolean
+ captions: boolean,
+ nextVideo?: Function
}) {
const settingEntries = []
const loadProgressBar = mode === 'webtorrent' ? 'peerTubeLoadProgressBar' : 'loadProgressBar'
settingEntries.push('resolutionMenuButton')
const children = {
- 'playToggle': {},
+ 'playToggle': {}
+ }
+
+ if (options.nextVideo) {
+ Object.assign(children, {
+ 'nextVideoButton': {
+ handler: options.nextVideo
+ }
+ })
+ }
+
+ Object.assign(children, {
'currentTimeDisplay': {},
'timeDivider': {},
'durationDisplay': {},
},
entries: settingEntries
}
- }
+ })
if (options.peertubeLink === true) {
Object.assign(children, {
return children
}
- private static addContextMenu (mode: PlayerMode, player: any, videoEmbedUrl: string) {
+ private static addContextMenu (mode: PlayerMode, player: videojs.Player, videoEmbedUrl: string) {
const content = [
{
label: player.localize('Copy the video URL'),
},
{
label: player.localize('Copy the video URL at the current time'),
- listener: function () {
- const player = this as videojs.Player
- copyToClipboard(buildVideoLink({ startTime: player.currentTime() }))
+ listener: function (this: videojs.Player) {
+ copyToClipboard(buildVideoLink({ startTime: this.currentTime() }))
}
},
{
if (mode === 'webtorrent') {
content.push({
label: player.localize('Copy magnet URI'),
- listener: function () {
- const player = this as videojs.Player
- copyToClipboard(player.webtorrent().getCurrentVideoFile().magnetUri)
+ listener: function (this: videojs.Player) {
+ copyToClipboard(this.webtorrent().getCurrentVideoFile().magnetUri)
}
})
}
private static addHotkeysOptions (plugins: VideoJSPluginOptions) {
Object.assign(plugins, {
hotkeys: {
+ skipInitialFocus: true,
+ enableInactiveFocus: false,
+ captureDocumentHotkeys: true,
+ documentHotkeysFocusElementFilter: (e: HTMLElement) => {
+ const tagName = e.tagName.toLowerCase()
+ return e.id === 'content' || tagName === 'body' || tagName === 'video'
+ },
+
enableVolumeScroll: false,
enableModifiersForNumbers: false,
return event.key === '>'
},
handler: function (player: videojs.Player) {
- player.playbackRate((player.playbackRate() + 0.1).toFixed(2))
+ const newValue = Math.min(player.playbackRate() + 0.1, 5)
+ player.playbackRate(parseFloat(newValue.toFixed(2)))
}
},
decreasePlaybackRateKey: {
return event.key === '<'
},
handler: function (player: videojs.Player) {
- player.playbackRate((player.playbackRate() - 0.1).toFixed(2))
+ const newValue = Math.max(player.playbackRate() - 0.1, 0.10)
+ player.playbackRate(parseFloat(newValue.toFixed(2)))
}
},
frameByFrame: {
})
}
- private static getLocalePath (serverUrl: string, locale: string) {
- const completeLocale = getCompleteLocale(locale)
+ private static getAutoPlayValue (autoplay: any) {
+ if (autoplay !== true) return autoplay
+
+ // Giving up with iOS
+ if (isIOS()) return false
- if (!is18nLocale(completeLocale) || isDefaultLocale(completeLocale)) return undefined
+ // We have issues with autoplay and Safari.
+ // any that tries to play using auto mute seems to work
+ if (isSafari()) return 'any'
- return serverUrl + '/client/locales/' + completeLocale
+ return 'play'
}
}
projects / github / Chocobozzz / PeerTube.git / blobdiff