import videojs from 'video.js'
import * as WebTorrent from 'webtorrent'
-import { renderVideo } from './video-renderer'
-import { LoadedQualityData, PlayerNetworkInfo, WebtorrentPluginOptions } from '../peertube-videojs-typings'
-import { getRtcConfig, timeToInt, videoFileMaxByResolution, videoFileMinByResolution, isIOS, isSafari } from '../utils'
-import { PeertubeChunkStore } from './peertube-chunk-store'
-import {
- getAverageBandwidthInStore,
- getStoredMute,
- getStoredP2PEnabled,
- getStoredVolume,
- saveAverageBandwidth
-} from '../peertube-player-local-storage'
+import { timeToInt } from '@shared/core-utils'
import { VideoFile } from '@shared/models'
+import { getAverageBandwidthInStore, getStoredMute, getStoredVolume, saveAverageBandwidth } from '../peertube-player-local-storage'
+import { PeerTubeResolution, PlayerNetworkInfo, WebtorrentPluginOptions } from '../peertube-videojs-typings'
+import { getRtcConfig, isIOS, videoFileMaxByResolution, videoFileMinByResolution } from '../utils'
+import { PeertubeChunkStore } from './peertube-chunk-store'
+import { renderVideo } from './video-renderer'
const CacheChunkStore = require('cache-chunk-store')
type PlayOptions = {
- forcePlay?: boolean,
- seek?: number,
+ forcePlay?: boolean
+ seek?: number
delay?: number
}
this.startTime = timeToInt(options.startTime)
- // Disable auto play on iOS
+ // Custom autoplay handled by webtorrent because we lazy play the video
this.autoplay = options.autoplay
- this.playerRefusedP2P = !getStoredP2PEnabled()
+
+ this.playerRefusedP2P = options.playerRefusedP2P
this.videoFiles = options.videoFiles
this.videoDuration = options.videoDuration
updateVideoFile (
videoFile?: VideoFile,
options: {
- forcePlay?: boolean,
- seek?: number,
+ forcePlay?: boolean
+ seek?: number
delay?: number
} = {},
done: () => void = () => { /* empty */ }
}
// Do not display error to user because we will have multiple fallback
- this.disableErrorDisplay();
+ this.player.peertube().hideFatalError();
// Hack to "simulate" src link in video.js >= 6
// Without this, we can't play the video after pausing it
return done()
})
- this.changeQuality()
- this.trigger('resolutionChange', { auto: this.autoResolution, resolutionId: this.currentVideoFile.resolution.id })
+ this.selectAppropriateResolution(true)
}
- updateResolution (resolutionId: number, delay = 0) {
+ updateEngineResolution (resolutionId: number, delay = 0) {
// Remember player state
const currentTime = this.player.currentTime()
const isPaused = this.player.paused()
}
}
- enableAutoResolution () {
- this.autoResolution = true
- this.trigger('resolutionChange', { auto: this.autoResolution, resolutionId: this.getCurrentResolutionId() })
- }
-
- disableAutoResolution (forbid = false) {
- if (forbid === true) this.autoResolutionPossible = false
-
+ disableAutoResolution () {
this.autoResolution = false
- this.trigger('autoResolutionChange', { possible: this.autoResolutionPossible })
- this.trigger('resolutionChange', { auto: this.autoResolution, resolutionId: this.getCurrentResolutionId() })
+ this.autoResolutionPossible = false
+ this.player.peertubeResolutions().disableAutoResolution()
}
isAutoResolutionPossible () {
return this.currentVideoFile
}
+ changeQuality (id: number) {
+ if (id === -1) {
+ if (this.autoResolutionPossible === true) {
+ this.autoResolution = true
+
+ this.selectAppropriateResolution(false)
+ }
+
+ return
+ }
+
+ this.autoResolution = false
+ this.updateEngineResolution(id)
+ this.selectAppropriateResolution(false)
+ }
+
private addTorrent (
magnetOrTorrentUrl: string,
previousVideoFile: VideoFile,
options: PlayOptions,
- done: Function
+ done: (err?: Error) => void
) {
if (!magnetOrTorrentUrl) return this.fallbackToHttp(options, done)
this.stopTorrent(oldTorrent)
// We use a fake renderer so we download correct pieces of the next file
- if (options.delay) this.renderFileInFakeElement(torrent.files[ 0 ], options.delay)
+ if (options.delay) this.renderFileInFakeElement(torrent.files[0], options.delay)
}
// Render the video in a few seconds? (on resolution change for example, we wait some seconds of the new video resolution)
if (options.seek) this.player.currentTime(options.seek)
const renderVideoOptions = { autoplay: false, controls: true }
- renderVideo(torrent.files[ 0 ], this.playerElement, renderVideoOptions, (err, renderer) => {
+ renderVideo(torrent.files[0], this.playerElement, renderVideoOptions, (err, renderer) => {
this.renderer = renderer
if (err) return this.fallbackToHttp(options, done)
if (err.message.indexOf('incorrect info hash') !== -1) {
console.error('Incorrect info hash detected, falling back to torrent file.')
const newOptions = { forcePlay: true, seek: options.seek }
- return this.addTorrent(this.torrent[ 'xs' ], previousVideoFile, newOptions, done)
+ return this.addTorrent(this.torrent['xs'], previousVideoFile, newOptions, done)
}
// Remote instance is down
if (playPromise !== undefined) {
return playPromise.then(() => done())
.catch((err: Error) => {
- if (err.message.indexOf('The play() request was interrupted by a call to pause()') !== -1) {
+ if (err.message.includes('The play() request was interrupted by a call to pause()')) {
return
}
private getAppropriateFile (averageDownloadSpeed?: number): VideoFile {
if (this.videoFiles === undefined) return undefined
+ if (this.videoFiles.length === 1) return this.videoFiles[0]
const files = this.videoFiles.filter(f => f.resolution.id !== 0)
-
if (files.length === 0) return undefined
- if (files.length === 1) return files[0]
// Don't change the torrent if the player ended
if (this.torrent && this.torrent.progress === 1 && this.player.ended()) return this.currentVideoFile
}
if (changeResolution === true) {
- this.updateResolution(file.resolution.id, changeResolutionDelay)
+ this.updateEngineResolution(file.resolution.id, changeResolutionDelay)
// Wait some seconds in observation of our new resolution
this.isAutoResolutionObservation = true
}
private isPlayerWaiting () {
- return this.player && this.player.hasClass('vjs-waiting')
+ return this.player?.hasClass('vjs-waiting')
}
private runTorrentInfoScheduler () {
}, this.CONSTANTS.INFO_SCHEDULER)
}
- private fallbackToHttp (options: PlayOptions, done?: Function) {
+ private fallbackToHttp (options: PlayOptions, done?: (err?: Error) => void) {
const paused = this.player.paused()
- this.disableAutoResolution(true)
+ this.disableAutoResolution()
this.flushVideoFile(this.currentVideoFile, true)
this.torrent = null
// Enable error display now this is our last fallback
- this.player.one('error', () => this.enableErrorDisplay())
+ this.player.one('error', () => this.player.peertube().displayFatalError())
const httpUrl = this.currentVideoFile.fileUrl
this.player.src = this.savePlayerSrcFunction
this.player.src(httpUrl)
- this.changeQuality()
+ this.selectAppropriateResolution(true)
// We changed the source, so reinit captions
this.player.trigger('sourcechange')
return this.player.trigger('customError', { err })
}
- private enableErrorDisplay () {
- this.player.addClass('vjs-error-display-enabled')
- }
-
- private disableErrorDisplay () {
- this.player.removeClass('vjs-error-display-enabled')
- }
-
private pickAverageVideoFile () {
if (this.videoFiles.length === 1) return this.videoFiles[0]
- return this.videoFiles[Math.floor(this.videoFiles.length / 2)]
+ const files = this.videoFiles.filter(f => f.resolution.id !== 0)
+ return files[Math.floor(files.length / 2)]
}
private stopTorrent (torrent: WebTorrent.Torrent) {
torrent.pause()
// Pause does not remove actual peers (in particular the webseed peer)
- torrent.removePeer(torrent[ 'ws' ])
+ torrent.removePeer(torrent['ws'])
}
private renderFileInFakeElement (file: WebTorrent.TorrentFile, delay: number) {
}
private buildQualities () {
- const qualityLevelsPayload = []
-
- for (const file of this.videoFiles) {
- const representation = {
- id: file.resolution.id,
- label: this.buildQualityLabel(file),
- height: file.resolution.id,
- _enabled: true
- }
-
- this.player.qualityLevels().addQualityLevel(representation)
-
- qualityLevelsPayload.push({
- id: representation.id,
- label: representation.label,
- selected: false
- })
- }
+ const resolutions: PeerTubeResolution[] = this.videoFiles.map(file => ({
+ id: file.resolution.id,
+ label: this.buildQualityLabel(file),
+ height: file.resolution.id,
+ selected: false,
+ selectCallback: () => this.changeQuality(file.resolution.id)
+ }))
+
+ resolutions.push({
+ id: -1,
+ label: this.player.localize('Auto'),
+ selected: true,
+ selectCallback: () => this.changeQuality(-1)
+ })
- const payload: LoadedQualityData = {
- qualitySwitchCallback: (d: any) => this.qualitySwitchCallback(d),
- qualityData: {
- video: qualityLevelsPayload
- }
- }
- this.player.tech(true).trigger('loadedqualitydata', payload)
+ this.player.peertubeResolutions().add(resolutions)
}
private buildQualityLabel (file: VideoFile) {
return label
}
- private qualitySwitchCallback (id: number) {
- if (id === -1) {
- if (this.autoResolutionPossible === true) this.enableAutoResolution()
- return
- }
+ private selectAppropriateResolution (byEngine: boolean) {
+ const resolution = this.autoResolution
+ ? -1
+ : this.getCurrentResolutionId()
- this.disableAutoResolution()
- this.updateResolution(id)
- }
+ const autoResolutionChosen = this.autoResolution
+ ? this.getCurrentResolutionId()
+ : undefined
- private changeQuality () {
- const resolutionId = this.currentVideoFile.resolution.id
- const qualityLevels = this.player.qualityLevels()
-
- if (resolutionId === -1) {
- qualityLevels.selectedIndex = -1
- return
- }
-
- for (let i = 0; i < qualityLevels.length; i++) {
- const q = qualityLevels[i]
- if (q.height === resolutionId) qualityLevels.selectedIndex_ = i
- }
+ this.player.peertubeResolutions().select({ id: resolution, autoResolutionChosenId: autoResolutionChosen, byEngine })
}
}
projects / github / Chocobozzz / PeerTube.git / blobdiff