// Big thanks to: https://github.com/kmoskwiak/videojs-resolution-switcher
+import { VideoService } from '@app/shared/video/video.service'
import * as videojs from 'video.js'
import * as WebTorrent from 'webtorrent'
import { VideoFile } from '../../../../shared/models/videos/video.model'
import { renderVideo } from './video-renderer'
+declare module 'video.js' {
+ interface Player {
+ peertube (): PeerTubePlugin
+ }
+}
+
interface VideoJSComponentInterface {
- _player: VideoJSPlayer
+ _player: videojs.Player
- new (player: VideoJSPlayer, options?: any)
+ new (player: videojs.Player, options?: any)
registerComponent (name: string, obj: any)
}
-interface VideoJSPlayer extends videojs.Player {
- peertube (): PeerTubePlugin
-}
-
type PeertubePluginOptions = {
videoFiles: VideoFile[]
playerElement: HTMLVideoElement
peerTubeLink: boolean
+ videoViewUrl: string
+ videoDuration: number
}
// https://github.com/danrevah/ngx-pipes/blob/master/src/pipes/math/bytes.ts
const MenuItem: VideoJSComponentInterface = videojsUntyped.getComponent('MenuItem')
class ResolutionMenuItem extends MenuItem {
- constructor (player: VideoJSPlayer, options) {
+ constructor (player: videojs.Player, options) {
options.selectable = true
super(player, options)
}
handleClick (event) {
- MenuItem.prototype.handleClick.call(this, event)
+ super.handleClick(event)
+
this.player_.peertube().updateResolution(this.options_.id)
}
}
class ResolutionMenuButton extends MenuButton {
label: HTMLElement
- constructor (player: VideoJSPlayer, options) {
+ constructor (player: videojs.Player, options) {
options.label = 'Quality'
super(player, options)
private playerElement: HTMLVideoElement
private videoFiles: VideoFile[]
private torrent: WebTorrent.Torrent
+ private autoplay = false
+ private videoViewUrl: string
+ private videoDuration: number
+ private videoViewInterval
+ private torrentInfoInterval
- constructor (player: VideoJSPlayer, options: PeertubePluginOptions) {
+ 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.videoFiles = options.videoFiles
+ this.videoViewUrl = options.videoViewUrl
+ this.videoDuration = options.videoDuration
// Hack to "simulate" src link in video.js >= 6
// Without this, we can't play the video after pausing it
this.player.ready(() => {
this.initializePlayer(options)
this.runTorrentInfoScheduler()
+ this.runViewAdd()
})
}
dispose () {
+ clearInterval(this.videoViewInterval)
+ clearInterval(this.torrentInfoInterval)
+
// Don't need to destroy renderer, video player will be destroyed
this.flushVideoFile(this.currentVideoFile, false)
}
if (err) return this.handleError(err)
this.renderer = renderer
- this.player.play().then(done)
+ if (!this.player.paused()) {
+ const playPromise = this.player.play()
+ if (playPromise !== undefined) return playPromise.then(done)
+
+ return done()
+ }
+
+ return done()
})
})
this.torrent.on('error', err => this.handleError(err))
this.torrent.on('warning', (err: any) => {
// We don't support HTTP tracker but we don't care -> we use the web socket tracker
- if (err.message.indexOf('Unsupported tracker protocol: http') !== -1) return
+ if (err.message.indexOf('Unsupported tracker protocol') !== -1) return
// 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)
const currentTime = this.player.currentTime()
const isPaused = this.player.paused()
+ // Remove poster to have black background
+ this.playerElement.poster = ''
+
// Hide bigPlayButton
if (!isPaused) {
this.player.bigPlayButton.hide()
}
}
- setVideoFiles (files: VideoFile[]) {
+ setVideoFiles (files: VideoFile[], videoViewUrl: string, videoDuration: number) {
+ this.videoViewUrl = videoViewUrl
+ this.videoDuration = videoDuration
this.videoFiles = files
+ // Re run view add for the new video
+ this.runViewAdd()
this.updateVideoFile(undefined, () => this.player.play())
}
const webTorrentButton = new WebTorrentButton(this.player)
controlBar.webTorrent = controlBar.el().insertBefore(webTorrentButton.el(), controlBar.progressControl.el())
- if (this.player.options_.autoplay === true) {
- this.updateVideoFile()
+ if (this.autoplay === true) {
+ this.updateVideoFile(undefined, () => this.player.play())
} else {
this.player.one('play', () => {
- // On firefox, we need to wait to load the video before playing
- if (navigator.userAgent.toLowerCase().indexOf('firefox') !== -1) {
- this.player.pause()
- this.updateVideoFile(undefined, () => this.player.play())
- return
- }
-
- this.updateVideoFile(undefined)
+ this.player.pause()
+ this.updateVideoFile(undefined, () => this.player.play())
})
}
}
private runTorrentInfoScheduler () {
- setInterval(() => {
+ this.torrentInfoInterval = setInterval(() => {
if (this.torrent !== undefined) {
this.trigger('torrentInfo', {
downloadSpeed: this.torrent.downloadSpeed,
}, 1000)
}
+ private runViewAdd () {
+ this.clearVideoViewInterval()
+
+ // After 30 seconds (or 3/4 of the video), add a view to the video
+ let minSecondsToView = 30
+
+ if (this.videoDuration < minSecondsToView) minSecondsToView = (this.videoDuration * 3) / 4
+
+ let secondsViewed = 0
+ this.videoViewInterval = setInterval(() => {
+ if (this.player && !this.player.paused()) {
+ secondsViewed += 1
+
+ if (secondsViewed > minSecondsToView) {
+ this.clearVideoViewInterval()
+
+ this.addViewToVideo().catch(err => console.error(err))
+ }
+ }
+ }, 1000)
+ }
+
+ private clearVideoViewInterval () {
+ if (this.videoViewInterval !== undefined) {
+ clearInterval(this.videoViewInterval)
+ this.videoViewInterval = undefined
+ }
+ }
+
+ private addViewToVideo () {
+ return fetch(this.videoViewUrl, { method: 'POST' })
+ }
+
private handleError (err: Error | string) {
return this.player.trigger('customError', { err })
}
projects / github / Chocobozzz / PeerTube.git / blobdiff