X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fassets%2Fplayer%2Fpeertube-videojs-plugin.ts;h=4b0677faba6dc43f9a85e8e22277371bf919c7a5;hb=ad77475251c3516dd5851a08655be79d7bf76245;hp=e4fea0991901159fdfedd3d21bfbe55782ae99ab;hpb=91d9558963c4eb6e47d74a14ff8d527c6326e0e1;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/assets/player/peertube-videojs-plugin.ts b/client/src/assets/player/peertube-videojs-plugin.ts index e4fea0991..4b0677fab 100644 --- a/client/src/assets/player/peertube-videojs-plugin.ts +++ b/client/src/assets/player/peertube-videojs-plugin.ts @@ -3,37 +3,20 @@ import * as WebTorrent from 'webtorrent' import { VideoFile } from '../../../../shared/models/videos/video.model' import { renderVideo } from './video-renderer' import './settings-menu-button' -import { PeertubePluginOptions, VideoJSComponentInterface, videojsUntyped } from './peertube-videojs-typings' +import { PeertubePluginOptions, VideoJSCaption, VideoJSComponentInterface, videojsUntyped } from './peertube-videojs-typings' +import { isMobile, videoFileMaxByResolution, videoFileMinByResolution, timeToInt } from './utils' +import * as CacheChunkStore from 'cache-chunk-store' +import { PeertubeChunkStore } from './peertube-chunk-store' import { - getAverageBandwidth, + getAverageBandwidthInStore, getStoredMute, - getStoredVolume, isMobile, + getStoredVolume, saveAverageBandwidth, saveMuteInStore, - saveVolumeInStore, - videoFileMaxByResolution, - videoFileMinByResolution -} from './utils' -import * as CacheChunkStore from 'cache-chunk-store' -import { PeertubeChunkStore } from './peertube-chunk-store' + saveVolumeInStore +} from './peertube-player-local-storage' -const webtorrent = new WebTorrent({ - tracker: { - rtcConfig: { - iceServers: [ - { - urls: 'stun:stun.stunprotocol.org' - }, - { - urls: 'stun:stun.framasoft.org' - } - ] - } - }, - dht: false -}) - -const Plugin: VideoJSComponentInterface = videojsUntyped.getPlugin('plugin') +const Plugin: VideoJSComponentInterface = videojs.getPlugin('plugin') class PeerTubePlugin extends Plugin { private readonly playerElement: HTMLVideoElement @@ -52,10 +35,30 @@ class PeerTubePlugin extends Plugin { BANDWIDTH_AVERAGE_NUMBER_OF_VALUES: 5 // Last 5 seconds to build average bandwidth } + private readonly webtorrent = new WebTorrent({ + tracker: { + rtcConfig: { + iceServers: [ + { + urls: 'stun:stun.stunprotocol.org' + }, + { + urls: 'stun:stun.framasoft.org' + } + ] + } + }, + dht: false + }) + private player: any private currentVideoFile: VideoFile private torrent: WebTorrent.Torrent + private videoCaptions: VideoJSCaption[] + private renderer + private fakeRenderer private autoResolution = true + private forbidAutoResolution = false private isAutoResolutionObservation = false private videoViewInterval @@ -73,10 +76,11 @@ class PeerTubePlugin extends Plugin { // Disable auto play on iOS this.autoplay = options.autoplay && this.isIOS() === false - this.startTime = options.startTime + this.startTime = timeToInt(options.startTime) this.videoFiles = options.videoFiles this.videoViewUrl = options.videoViewUrl this.videoDuration = options.videoDuration + this.videoCaptions = options.videoCaptions this.savePlayerSrcFunction = this.player.src // Hack to "simulate" src link in video.js >= 6 @@ -123,6 +127,8 @@ class PeerTubePlugin extends Plugin { // Don't need to destroy renderer, video player will be destroyed this.flushVideoFile(this.currentVideoFile, false) + + this.destroyFakeRenderer() } getCurrentResolutionId () { @@ -130,7 +136,10 @@ class PeerTubePlugin extends Plugin { } getCurrentResolutionLabel () { - return this.currentVideoFile ? this.currentVideoFile.resolution.label : '' + if (!this.currentVideoFile) return '' + + const fps = this.currentVideoFile.fps >= 50 ? this.currentVideoFile.fps : '' + return this.currentVideoFile.resolution.label + fps } updateVideoFile ( @@ -144,7 +153,7 @@ class PeerTubePlugin extends Plugin { ) { // Automatically choose the adapted video file if (videoFile === undefined) { - const savedAverageBandwidth = getAverageBandwidth() + const savedAverageBandwidth = getAverageBandwidthInStore() videoFile = savedAverageBandwidth ? this.getAppropriateFile(savedAverageBandwidth) : this.pickAverageVideoFile() @@ -191,18 +200,33 @@ class PeerTubePlugin extends Plugin { }) } - this.torrent = webtorrent.add(magnetOrTorrentUrl, torrentOptions, torrent => { + this.torrent = this.webtorrent.add(magnetOrTorrentUrl, torrentOptions, torrent => { console.log('Added ' + magnetOrTorrentUrl + '.') - // Pause the old torrent if (oldTorrent) { + // Pause the old torrent oldTorrent.pause() // Pause does not remove actual peers (in particular the webseed peer) oldTorrent.removePeer(oldTorrent['ws']) + + // We use a fake renderer so we download correct pieces of the next file + if (options.delay) { + const fakeVideoElem = document.createElement('video') + renderVideo(torrent.files[0], fakeVideoElem, { autoplay: false, controls: false }, (err, renderer) => { + this.fakeRenderer = renderer + + if (err) console.error('Cannot render new torrent in fake video element.', err) + + // Load the future file at the correct time + fakeVideoElem.currentTime = this.player.currentTime() + (options.delay / 2000) + }) + } } // Render the video in a few seconds? (on resolution change for example, we wait some seconds of the new video resolution) this.addTorrentDelay = setTimeout(() => { + this.destroyFakeRenderer() + const paused = this.player.paused() this.flushVideoFile(previousVideoFile) @@ -218,12 +242,14 @@ class PeerTubePlugin extends Plugin { if (options.seek) this.seek(options.seek) if (options.forcePlay === false && paused === true) this.player.pause() + + return done(err) }) }) }, options.delay || 0) }) - this.torrent.on('error', err => this.handleError(err)) + this.torrent.on('error', err => console.error(err)) this.torrent.on('warning', (err: any) => { // We don't support HTTP tracker but we don't care -> we use the web socket tracker @@ -231,18 +257,23 @@ class PeerTubePlugin extends Plugin { // Users don't care about issues with WebRTC, but developers do so log it in the console if (err.message.indexOf('Ice connection failed') !== -1) { - console.error(err) + console.log(err) return } // 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.') - const options = { forcePlay: true } - return this.addTorrent(this.torrent['xs'], previousVideoFile, options, done) + const newOptions = { forcePlay: true, seek: options.seek } + return this.addTorrent(this.torrent['xs'], previousVideoFile, newOptions, done) + } + + // Remote instance is down + if (err.message.indexOf('from xs param') !== -1) { + this.handleError(err) } - return this.handleError(err) + console.warn(err) }) } @@ -269,10 +300,10 @@ class PeerTubePlugin extends Plugin { } flushVideoFile (videoFile: VideoFile, destroyRenderer = true) { - if (videoFile !== undefined && webtorrent.get(videoFile.magnetUri)) { + if (videoFile !== undefined && this.webtorrent.get(videoFile.magnetUri)) { if (destroyRenderer === true && this.renderer && this.renderer.destroy) this.renderer.destroy() - webtorrent.remove(videoFile.magnetUri) + this.webtorrent.remove(videoFile.magnetUri) console.log('Removed ' + videoFile.magnetUri) } } @@ -286,11 +317,17 @@ class PeerTubePlugin extends Plugin { this.trigger('autoResolutionUpdate') } - disableAutoResolution () { + disableAutoResolution (forbid = false) { + if (forbid === true) this.forbidAutoResolution = true + this.autoResolution = false this.trigger('autoResolutionUpdate') } + isAutoResolutionForbidden () { + return this.forbidAutoResolution === true + } + getCurrentVideoFile () { return this.currentVideoFile } @@ -306,6 +343,10 @@ class PeerTubePlugin extends Plugin { if (playPromise !== undefined) { return playPromise.then(done) .catch(err => { + if (err.message.indexOf('The play() request was interrupted by a call to pause()') !== -1) { + return + } + console.error(err) this.player.pause() this.player.posterImage.show() @@ -333,18 +374,34 @@ class PeerTubePlugin extends Plugin { if (!averageDownloadSpeed) averageDownloadSpeed = this.getAndSaveActualDownloadSpeed() - // Filter videos we can play according to our bandwidth - const filteredFiles = this.videoFiles.filter(f => { - const fileBitrate = (f.size / this.videoDuration) - let threshold = fileBitrate - - // If this is for a higher resolution or an initial load: add a margin - if (!this.currentVideoFile || f.resolution.id > this.currentVideoFile.resolution.id) { - threshold += ((fileBitrate * this.CONSTANTS.AUTO_QUALITY_THRESHOLD_PERCENT) / 100) + // Limit resolution according to player height + const playerHeight = this.playerElement.offsetHeight as number + + // We take the first resolution just above the player height + // Example: player height is 530px, we want the 720p file instead of 480p + let maxResolution = this.videoFiles[0].resolution.id + for (let i = this.videoFiles.length - 1; i >= 0; i--) { + const resolutionId = this.videoFiles[i].resolution.id + if (resolutionId >= playerHeight) { + maxResolution = resolutionId + break } + } - return averageDownloadSpeed > threshold - }) + // Filter videos we can play according to our screen resolution and bandwidth + const filteredFiles = this.videoFiles + .filter(f => f.resolution.id <= maxResolution) + .filter(f => { + const fileBitrate = (f.size / this.videoDuration) + let threshold = fileBitrate + + // If this is for a higher resolution or an initial load: add a margin + if (!this.currentVideoFile || f.resolution.id > this.currentVideoFile.resolution.id) { + threshold += ((fileBitrate * this.CONSTANTS.AUTO_QUALITY_THRESHOLD_PERCENT) / 100) + } + + return averageDownloadSpeed > threshold + }) // If the download speed is too bad, return the lowest resolution we have if (filteredFiles.length === 0) return videoFileMinByResolution(this.videoFiles) @@ -371,6 +428,8 @@ class PeerTubePlugin extends Plugin { this.initSmoothProgressBar() + this.initCaptions() + this.alterInactivity() if (this.autoplay === true) { @@ -442,13 +501,15 @@ class PeerTubePlugin extends Plugin { // Http fallback if (this.torrent === null) return this.trigger('torrentInfo', false) - // webtorrent.downloadSpeed because we need to take into account the potential old torrent too - if (webtorrent.downloadSpeed !== 0) this.downloadSpeeds.push(webtorrent.downloadSpeed) + // this.webtorrent.downloadSpeed because we need to take into account the potential old torrent too + if (this.webtorrent.downloadSpeed !== 0) this.downloadSpeeds.push(this.webtorrent.downloadSpeed) return this.trigger('torrentInfo', { downloadSpeed: this.torrent.downloadSpeed, numPeers: this.torrent.numPeers, - uploadSpeed: this.torrent.uploadSpeed + uploadSpeed: this.torrent.uploadSpeed, + downloaded: this.torrent.downloaded, + uploaded: this.torrent.uploaded }) }, this.CONSTANTS.INFO_SCHEDULER) } @@ -483,10 +544,14 @@ class PeerTubePlugin extends Plugin { } private addViewToVideo () { + if (!this.videoViewUrl) return Promise.resolve(undefined) + return fetch(this.videoViewUrl, { method: 'POST' }) } private fallbackToHttp (done?: Function, play = true) { + this.disableAutoResolution(true) + this.flushVideoFile(this.currentVideoFile, true) this.torrent = null @@ -542,6 +607,31 @@ class PeerTubePlugin extends Plugin { return this.videoFiles[Math.floor(this.videoFiles.length / 2)] } + private destroyFakeRenderer () { + if (this.fakeRenderer) { + if (this.fakeRenderer.destroy) { + try { + this.fakeRenderer.destroy() + } catch (err) { + console.log('Cannot destroy correctly fake renderer.', err) + } + } + this.fakeRenderer = undefined + } + } + + private initCaptions () { + for (const caption of this.videoCaptions) { + this.player.addRemoteTextTrack({ + kind: 'captions', + label: caption.label, + language: caption.language, + id: caption.language, + src: caption.src + }, false) + } + } + // Thanks: https://github.com/videojs/video.js/issues/4460#issuecomment-312861657 private initSmoothProgressBar () { const SeekBar = videojsUntyped.getComponent('SeekBar') @@ -565,5 +655,5 @@ class PeerTubePlugin extends Plugin { } } -videojsUntyped.registerPlugin('peertube', PeerTubePlugin) +videojs.registerPlugin('peertube', PeerTubePlugin) export { PeerTubePlugin }