import {
getAverageBandwidth,
getStoredMute,
- getStoredVolume,
+ getStoredVolume, isMobile,
saveAverageBandwidth,
saveMuteInStore,
- saveVolumeInStore
+ saveVolumeInStore,
+ videoFileMaxByResolution,
+ videoFileMinByResolution
} from './utils'
-import minBy from 'lodash-es/minBy'
-import maxBy from 'lodash-es/maxBy'
+import * as CacheChunkStore from 'cache-chunk-store'
+import { PeertubeChunkStore } from './peertube-chunk-store'
const webtorrent = new WebTorrent({
tracker: {
constructor (player: videojs.Player, options: PeertubePluginOptions) {
super(player, options)
- // Fix canplay event on google chrome by disabling default videojs autoplay
- this.autoplay = this.player.options_.autoplay
- this.player.options_.autoplay = false
+ // Disable auto play on iOS
+ this.autoplay = options.autoplay && this.isIOS() === false
this.startTime = options.startTime
this.videoFiles = options.videoFiles
return this.currentVideoFile ? this.currentVideoFile.resolution.label : ''
}
- updateVideoFile (videoFile?: VideoFile, delay = 0, done?: () => void) {
- if (done === undefined) {
- done = () => { /* empty */ }
- }
-
+ updateVideoFile (
+ videoFile?: VideoFile,
+ options: {
+ forcePlay?: boolean,
+ seek?: number,
+ delay?: number
+ } = {},
+ done: () => void = () => { /* empty */ }
+ ) {
// Automatically choose the adapted video file
if (videoFile === undefined) {
const savedAverageBandwidth = getAverageBandwidth()
videoFile = savedAverageBandwidth
? this.getAppropriateFile(savedAverageBandwidth)
- : this.videoFiles[0]
+ : this.pickAverageVideoFile()
}
// Don't add the same video file once again
const previousVideoFile = this.currentVideoFile
this.currentVideoFile = videoFile
- this.addTorrent(this.currentVideoFile.magnetUri, previousVideoFile, delay, () => {
+ this.addTorrent(this.currentVideoFile.magnetUri, previousVideoFile, options, () => {
this.player.playbackRate(oldPlaybackRate)
return done()
})
this.trigger('videoFileUpdate')
}
- addTorrent (magnetOrTorrentUrl: string, previousVideoFile: VideoFile, delay = 0, done: Function) {
+ addTorrent (
+ magnetOrTorrentUrl: string,
+ previousVideoFile: VideoFile,
+ options: {
+ forcePlay?: boolean,
+ seek?: number,
+ delay?: number
+ },
+ done: Function
+ ) {
console.log('Adding ' + magnetOrTorrentUrl + '.')
const oldTorrent = this.torrent
- this.torrent = webtorrent.add(magnetOrTorrentUrl, torrent => {
+ const torrentOptions = {
+ store: (chunkLength, storeOpts) => new CacheChunkStore(new PeertubeChunkStore(chunkLength, storeOpts), {
+ max: 100
+ })
+ }
+
+ this.torrent = webtorrent.add(magnetOrTorrentUrl, torrentOptions, torrent => {
console.log('Added ' + magnetOrTorrentUrl + '.')
// Pause the old torrent
oldTorrent.removePeer(oldTorrent['ws'])
}
+ // Render the video in a few seconds? (on resolution change for example, we wait some seconds of the new video resolution)
this.addTorrentDelay = setTimeout(() => {
+ const paused = this.player.paused()
+
this.flushVideoFile(previousVideoFile)
- const options = { autoplay: true, controls: true }
- renderVideo(torrent.files[0], this.playerElement, options,(err, renderer) => {
+ const renderVideoOptions = { autoplay: false, controls: true }
+ renderVideo(torrent.files[0], this.playerElement, renderVideoOptions,(err, renderer) => {
this.renderer = renderer
if (err) return this.fallbackToHttp(done)
- if (!this.player.paused()) {
- const playPromise = this.player.play()
- if (playPromise !== undefined) return playPromise.then(done)
-
- return done()
- }
+ return this.tryToPlay(err => {
+ if (err) return done(err)
- return done()
+ if (options.seek) this.seek(options.seek)
+ if (options.forcePlay === false && paused === true) this.player.pause()
+ })
})
- }, delay)
+ }, options.delay || 0)
})
this.torrent.on('error', err => this.handleError(err))
// Magnet hash is not up to date with the torrent file, add directly the torrent file
if (err.message.indexOf('incorrect info hash') !== -1) {
console.error('Incorrect info hash detected, falling back to torrent file.')
- return this.addTorrent(this.torrent['xs'], previousVideoFile, 0, done)
+ const options = { forcePlay: true }
+ return this.addTorrent(this.torrent['xs'], previousVideoFile, options, done)
}
return this.handleError(err)
}
const newVideoFile = this.videoFiles.find(f => f.resolution.id === resolutionId)
- this.updateVideoFile(newVideoFile, delay, () => this.seek(currentTime))
+ const options = {
+ forcePlay: false,
+ delay,
+ seek: currentTime + (delay / 1000)
+ }
+ this.updateVideoFile(newVideoFile, options)
}
flushVideoFile (videoFile: VideoFile, destroyRenderer = true) {
this.trigger('autoResolutionUpdate')
}
+ getCurrentVideoFile () {
+ return this.currentVideoFile
+ }
+
+ getTorrent () {
+ return this.torrent
+ }
+
+ private tryToPlay (done?: Function) {
+ if (!done) done = function () { /* empty */ }
+
+ const playPromise = this.player.play()
+ if (playPromise !== undefined) {
+ return playPromise.then(done)
+ .catch(err => {
+ console.error(err)
+ this.player.pause()
+ this.player.posterImage.show()
+ this.player.removeClass('vjs-has-autoplay')
+ this.player.removeClass('vjs-has-big-play-button-clicked')
+
+ return done()
+ })
+ }
+
+ return done()
+ }
+
private seek (time: number) {
this.player.currentTime(time)
this.player.handleTechSeeked_()
private getAppropriateFile (averageDownloadSpeed?: number): VideoFile {
if (this.videoFiles === undefined || this.videoFiles.length === 0) return undefined
if (this.videoFiles.length === 1) return this.videoFiles[0]
- if (this.torrent && this.torrent.progress === 1) return this.currentVideoFile
- if (!averageDownloadSpeed) averageDownloadSpeed = this.getActualDownloadSpeed()
+ // Don't change the torrent is the play was ended
+ if (this.torrent && this.torrent.progress === 1 && this.player.ended()) return this.currentVideoFile
+
+ if (!averageDownloadSpeed) averageDownloadSpeed = this.getAndSaveActualDownloadSpeed()
// Filter videos we can play according to our bandwidth
const filteredFiles = this.videoFiles.filter(f => {
})
// If the download speed is too bad, return the lowest resolution we have
- if (filteredFiles.length === 0) return minBy(this.videoFiles, 'resolution.id')
+ if (filteredFiles.length === 0) return videoFileMinByResolution(this.videoFiles)
- return maxBy(filteredFiles, 'resolution.id')
+ return videoFileMaxByResolution(filteredFiles)
}
- private getActualDownloadSpeed () {
+ private getAndSaveActualDownloadSpeed () {
const start = Math.max(this.downloadSpeeds.length - this.CONSTANTS.BANDWIDTH_AVERAGE_NUMBER_OF_VALUES, 0)
const lastDownloadSpeeds = this.downloadSpeeds.slice(start, this.downloadSpeeds.length)
if (lastDownloadSpeeds.length === 0) return -1
}
private initializePlayer () {
+ if (isMobile()) this.player.addClass('vjs-is-mobile')
+
this.initSmoothProgressBar()
this.alterInactivity()
if (this.autoplay === true) {
this.player.posterImage.hide()
- this.updateVideoFile(undefined, 0, () => this.seek(this.startTime))
+ this.updateVideoFile(undefined, { forcePlay: true, seek: this.startTime })
} else {
+ // Don't try on iOS that does not support MediaSource
+ if (this.isIOS()) {
+ this.currentVideoFile = this.pickAverageVideoFile()
+ return this.fallbackToHttp(undefined, false)
+ }
+
// Proxy first play
const oldPlay = this.player.play.bind(this.player)
this.player.play = () => {
this.player.addClass('vjs-has-big-play-button-clicked')
this.player.play = oldPlay
- this.updateVideoFile(undefined, 0, () => this.seek(this.startTime))
+ this.updateVideoFile(undefined, { forcePlay: true, seek: this.startTime })
}
}
}
return fetch(this.videoViewUrl, { method: 'POST' })
}
- private fallbackToHttp (done: Function) {
+ private fallbackToHttp (done?: Function, play = true) {
this.flushVideoFile(this.currentVideoFile, true)
this.torrent = null
const httpUrl = this.currentVideoFile.fileUrl
this.player.src = this.savePlayerSrcFunction
this.player.src(httpUrl)
- this.player.play()
+ if (play) this.tryToPlay()
- return done()
+ if (done) return done()
}
private handleError (err: Error | string) {
this.player.removeClass('vjs-error-display-enabled')
}
+ private isIOS () {
+ return !!navigator.platform && /iPad|iPhone|iPod/.test(navigator.platform)
+ }
+
private alterInactivity () {
let saveInactivityTimeout: number
settingsDialog.on('mouseleave', () => enableInactivity())
}
+ private pickAverageVideoFile () {
+ if (this.videoFiles.length === 1) return this.videoFiles[0]
+
+ return this.videoFiles[Math.floor(this.videoFiles.length / 2)]
+ }
+
// Thanks: https://github.com/videojs/video.js/issues/4460#issuecomment-312861657
private initSmoothProgressBar () {
const SeekBar = videojsUntyped.getComponent('SeekBar')
projects / github / Chocobozzz / PeerTube.git / blobdiff