import { renderVideo } from './video-renderer'
import './settings-menu-button'
import { PeertubePluginOptions, VideoJSComponentInterface, videojsUntyped } from './peertube-videojs-typings'
-import {
- getAverageBandwidth,
- getStoredMute,
- getStoredVolume,
- saveAverageBandwidth,
- saveMuteInStore,
- saveVolumeInStore
-} from './utils'
+import { getAverageBandwidth, getStoredMute, getStoredVolume, saveAverageBandwidth, saveMuteInStore, saveVolumeInStore } 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
+ this.autoplay = options.autoplay
this.startTime = options.startTime
this.videoFiles = options.videoFiles
console.log('Adding ' + magnetOrTorrentUrl + '.')
const oldTorrent = this.torrent
- this.torrent = webtorrent.add(magnetOrTorrentUrl, torrent => {
+ const options = {
+ store: (chunkLength, storeOpts) => new CacheChunkStore(new PeertubeChunkStore(chunkLength, storeOpts), {
+ max: 100
+ })
+ }
+
+ this.torrent = webtorrent.add(magnetOrTorrentUrl, options, torrent => {
console.log('Added ' + magnetOrTorrentUrl + '.')
// Pause the old torrent
if (err) return this.fallbackToHttp(done)
- if (!this.player.paused()) {
- const playPromise = this.player.play()
- if (playPromise !== undefined) return playPromise.then(done)
-
- return done()
- }
+ if (!this.player.paused()) return this.tryToPlay(done)
return done()
})
this.trigger('autoResolutionUpdate')
}
+ 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')
+
+ 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 => {
return maxBy(filteredFiles, 'resolution.id')
}
- 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
if (this.autoplay === true) {
this.player.posterImage.hide()
- this.updateVideoFile(undefined, 0, () => this.seek(this.startTime))
+ this.updateVideoFile(undefined, 0, () => {
+ this.seek(this.startTime)
+ this.tryToPlay()
+ })
} else {
// Proxy first play
const oldPlay = this.player.play.bind(this.player)