OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix auto quality

pull/525/head
Chocobozzz 2018-04-20 10:21:28 +02:00
parent 6cf57b443d
commit 3c40590d74
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/src/assets/player/peertube-videojs-plugin.ts
View File

@ -284,9 +284,11 @@ class PeerTubePlugin extends Plugin {
private getAppropriateFile (averageDownloadSpeed?: number): VideoFile { private getAppropriateFile (averageDownloadSpeed?: number): VideoFile {
if (this.videoFiles === undefined || this.videoFiles.length === 0) return undefined if (this.videoFiles === undefined || this.videoFiles.length === 0) return undefined
if (this.videoFiles.length === 1) return this.videoFiles[0] 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 // Filter videos we can play according to our bandwidth
const filteredFiles = this.videoFiles.filter(f => { const filteredFiles = this.videoFiles.filter(f => {
@ -307,7 +309,7 @@ class PeerTubePlugin extends Plugin {
return maxBy(filteredFiles, 'resolution.id') 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 start = Math.max(this.downloadSpeeds.length - this.CONSTANTS.BANDWIDTH_AVERAGE_NUMBER_OF_VALUES, 0)
const lastDownloadSpeeds = this.downloadSpeeds.slice(start, this.downloadSpeeds.length) const lastDownloadSpeeds = this.downloadSpeeds.slice(start, this.downloadSpeeds.length)
if (lastDownloadSpeeds.length === 0) return -1 if (lastDownloadSpeeds.length === 0) return -1

6
client/src/sass/video-js-custom.scss
View File

@ -447,7 +447,7 @@ $setting-transition-easing: ease-out;
} }
.vjs-dock-description { .vjs-dock-description {
font-size: 10px; font-size: 9px;
} }
.vjs-big-play-button { .vjs-big-play-button {
@ -465,10 +465,6 @@ $setting-transition-easing: ease-out;
font-size: 14px; font-size: 14px;
} }
.vjs-dock-description {
font-size: 9px;
}
.vjs-big-play-button { .vjs-big-play-button {
font-size: 4.5em; font-size: 4.5em;
border-width: 4.5px; border-width: 4.5px;