X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fassets%2Fplayer%2Fpeertube-player-manager.ts;h=8e0a9109f6c41d8bf0cdfb1020a607c273b38941;hb=9eccae74c844f09e9e3483db623fea00e0562365;hp=7fa84e195bb88e8f88c0d11c79609cd6e8edad5f;hpb=e85bfe96fd32e4f1c7ad872448e67f59ca03d020;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/assets/player/peertube-player-manager.ts b/client/src/assets/player/peertube-player-manager.ts index 7fa84e195..8e0a9109f 100644 --- a/client/src/assets/player/peertube-player-manager.ts +++ b/client/src/assets/player/peertube-player-manager.ts @@ -6,7 +6,7 @@ import './upnext/end-card' import './upnext/upnext-plugin' import './bezels/bezels-plugin' import './peertube-plugin' -import './videojs-components/next-video-button' +import './videojs-components/next-previous-video-button' import './videojs-components/p2p-info-button' import './videojs-components/peertube-link-button' import './videojs-components/peertube-load-progress-bar' @@ -18,16 +18,24 @@ import './videojs-components/settings-menu-item' import './videojs-components/settings-panel' import './videojs-components/settings-panel-child' import './videojs-components/theater-button' +import './playlist/playlist-plugin' import videojs from 'video.js' -import { isDefaultLocale } from '../../../../shared/models/i18n/i18n' -import { VideoFile } from '../../../../shared/models/videos' +import { isDefaultLocale } from '@shared/core-utils/i18n' +import { VideoFile } from '@shared/models' 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 { + NextPreviousVideoButtonOptions, + P2PMediaLoaderPluginOptions, + PlaylistPluginOptions, + UserWatching, + VideoJSCaption, + VideoJSPluginOptions +} from './peertube-videojs-typings' import { TranslationsManager } from './translations-manager' -import { buildVideoEmbed, buildVideoLink, copyToClipboard, getRtcConfig, isIOS, isSafari } from './utils' +import { buildVideoOrPlaylistEmbed, buildVideoLink, copyToClipboard, getRtcConfig, isSafari, isIOS } from './utils' // Change 'Playback Rate' to 'Speed' (smaller for our settings menu) (videojs.getComponent('PlaybackRateMenuButton') as any).prototype.controlText_ = 'Speed' @@ -70,7 +78,15 @@ export interface CommonOptions extends CustomizationOptions { onPlayerElementChange: (element: HTMLVideoElement) => void autoplay: boolean - nextVideo?: Function + + nextVideo?: () => void + hasNextVideo?: () => boolean + + previousVideo?: () => void + hasPreviousVideo?: () => boolean + + playlist?: PlaylistPluginOptions + videoDuration: number enableHotkeys: boolean inactivityTimeout: number @@ -101,6 +117,8 @@ export class PeertubePlayerManager { private static playerElementClassName: string private static onPlayerChange: (player: videojs.Player) => void + private static alreadyPlayed = false + static async initialize (mode: PlayerMode, options: PeertubePlayerManagerOptions, onPlayerChange: (player: videojs.Player) => void) { let p2pMediaLoader: any @@ -136,6 +154,10 @@ export class PeertubePlayerManager { alreadyFallback = true }) + player.one('play', () => { + PeertubePlayerManager.alreadyPlayed = true + }) + self.addContextMenu(mode, player, options.common.embedUrl) player.bezels() @@ -186,6 +208,7 @@ export class PeertubePlayerManager { p2pMediaLoaderModule?: any ): videojs.PlayerOptions { const commonOptions = options.common + const isHLS = mode === 'p2p-media-loader' let autoplay = this.getAutoPlayValue(commonOptions.autoplay) let html5 = {} @@ -203,11 +226,15 @@ export class PeertubePlayerManager { } } + if (commonOptions.playlist) { + plugins.playlist = commonOptions.playlist + } + if (commonOptions.enableHotkeys === true) { PeertubePlayerManager.addHotkeysOptions(plugins) } - if (mode === 'p2p-media-loader') { + if (isHLS) { const { hlsjs } = PeertubePlayerManager.addP2PMediaLoaderOptions(plugins, options, p2pMediaLoaderModule) html5 = hlsjs.html5 @@ -245,7 +272,12 @@ export class PeertubePlayerManager { captions: commonOptions.captions, peertubeLink: commonOptions.peertubeLink, theaterButton: commonOptions.theaterButton, - nextVideo: commonOptions.nextVideo + + nextVideo: commonOptions.nextVideo, + hasNextVideo: commonOptions.hasNextVideo, + + previousVideo: commonOptions.previousVideo, + hasPreviousVideo: commonOptions.hasPreviousVideo }) as any // FIXME: typings } } @@ -300,7 +332,13 @@ export class PeertubePlayerManager { } 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 @@ -340,9 +378,14 @@ export class PeertubePlayerManager { private static getControlBarChildren (mode: PlayerMode, options: { peertubeLink: boolean - theaterButton: boolean, - captions: boolean, + theaterButton: boolean + captions: boolean + nextVideo?: Function + hasNextVideo?: () => boolean + + previousVideo?: Function + hasPreviousVideo?: () => boolean }) { const settingEntries = [] const loadProgressBar = mode === 'webtorrent' ? 'peerTubeLoadProgressBar' : 'loadProgressBar' @@ -352,15 +395,39 @@ export class PeertubePlayerManager { if (options.captions === true) settingEntries.push('captionsButton') settingEntries.push('resolutionMenuButton') - const children = { - 'playToggle': {} + const children = {} + + if (options.previousVideo) { + const buttonOptions: NextPreviousVideoButtonOptions = { + type: 'previous', + handler: options.previousVideo, + isDisabled: () => { + if (!options.hasPreviousVideo) return false + + return !options.hasPreviousVideo() + } + } + + Object.assign(children, { + 'previousVideoButton': buttonOptions + }) } + Object.assign(children, { playToggle: {} }) + if (options.nextVideo) { - Object.assign(children, { - 'nextVideoButton': { - handler: options.nextVideo + const buttonOptions: NextPreviousVideoButtonOptions = { + type: 'next', + handler: options.nextVideo, + isDisabled: () => { + if (!options.hasNextVideo) return false + + return !options.hasNextVideo() } + } + + Object.assign(children, { + 'nextVideoButton': buttonOptions }) } @@ -432,7 +499,7 @@ export class PeertubePlayerManager { { label: player.localize('Copy embed code'), listener: () => { - copyToClipboard(buildVideoEmbed(videoEmbedUrl)) + copyToClipboard(buildVideoOrPlaylistEmbed(videoEmbedUrl)) } } ] @@ -519,12 +586,15 @@ export class PeertubePlayerManager { private static getAutoPlayValue (autoplay: any) { if (autoplay !== true) return autoplay - // Giving up with iOS - if (isIOS()) return false - - // We have issues with autoplay and Safari. - // any that tries to play using auto mute seems to work - if (isSafari()) return 'any' + // We have issues with autoplay and Safari with webtorrent + if (isIOS()) { + // On first play, disable autoplay to avoid issues + // But if the player already played videos, we can safely autoplay next ones + return PeertubePlayerManager.alreadyPlayed ? 'play' : false + } else if (isSafari()) { + // Issues with Safari and webtorrent on first play + return PeertubePlayerManager.alreadyPlayed ? 'play' : false + } return 'play' }