Skip to content

ActivityPub-federated video streaming platform using P2P directly in your web browser

Restore player resolution

Chocobozzz983f7dc3dcec
diff --git a/client/src/standalone/player/src/peertube-player-local-storage.ts b/client/src/standalone/player/src/peertube-player-local-storage.ts
index 65520d1cce..7998c1717d 100644
--- a/client/src/standalone/player/src/peertube-player-local-storage.ts
+++ b/client/src/standalone/player/src/peertube-player-local-storage.ts
@@ -53,6 +53,20 @@ export function getAverageBandwidthInStore () {
// ---------------------------------------------------------------------------
+export function savePreferredResolution (resolution: number) {
+ return setLocalStorage('preferred-resolution', resolution.toString())
+}
+
+export function getStoredPreferredResolution () {
+ return parseLocalStorageInt(getLocalStorage('preferred-resolution'))
+}
+
+export function clearStoredPreferredResolution () {
+ return removeLocalStorage('preferred-resolution')
+}
+
+// ---------------------------------------------------------------------------
+
export function saveLastSubtitle (language: string) {
return setLocalStorage('last-subtitle', language)
}
@@ -152,6 +166,10 @@ function setLocalStorage (key: string, value: string) {
peertubeLocalStorage.setItem(KEY_PREFIX + key, value)
}
+function removeLocalStorage (key: string) {
+ peertubeLocalStorage.removeItem(KEY_PREFIX + key)
+}
+
function getSessionStorage (key: string) {
return peertubeSessionStorage.getItem(KEY_PREFIX + key)
}
diff --git a/client/src/standalone/player/src/shared/p2p-media-loader/hls-plugin.ts b/client/src/standalone/player/src/shared/p2p-media-loader/hls-plugin.ts
index 1b398ee04d..b53cea6227 100644
--- a/client/src/standalone/player/src/shared/p2p-media-loader/hls-plugin.ts
+++ b/client/src/standalone/player/src/shared/p2p-media-loader/hls-plugin.ts
@@ -7,6 +7,7 @@ import Hlsjs, { ErrorData, Level, LevelSwitchingData, ManifestParsedData } from
import { HlsJsP2PEngine, HlsWithP2PInstance } from 'p2p-media-loader-hlsjs'
import videojs from 'video.js'
import Tech, { SourceObject } from 'video.js/dist/types/tech/tech'
+import { getStoredPreferredResolution } from '../../peertube-player-local-storage'
import { HLSPluginOptions, HlsjsConfigHandlerOptions, PeerTubeResolution, VideoJSTechHLS, VideojsPlayer, VideojsPlugin } from '../../types'
const HlsWithP2P = HlsJsP2PEngine.injectMixin(Hlsjs)
@@ -357,6 +358,7 @@ export class Html5Hlsjs {
resolutions.push({
id: -2, // -1 is for "Auto quality"
+ height: 0,
label: this.player.localize('Audio only'),
selected: false,
selectCallback: () => {
@@ -376,6 +378,30 @@ export class Html5Hlsjs {
})
this.player.peertubeResolutions().add(resolutions)
+
+ const preferredResolution = this.pickPreferredResolution(resolutions)
+ if (preferredResolution) {
+ this.player.peertubeResolutions().select({ id: preferredResolution.id, fireCallback: true })
+ }
+ }
+
+ private pickPreferredResolution (resolutions: PeerTubeResolution[]) {
+ const preferredHeight = getStoredPreferredResolution()
+ if (preferredHeight === undefined) return undefined
+
+ const selectableResolutions = resolutions
+ .filter(r => r.id !== -1 && r.height !== undefined)
+ .sort((a, b) => a.height - b.height)
+
+ if (selectableResolutions.length === 0) return undefined
+
+ const exactMatch = selectableResolutions.find(r => r.height === preferredHeight)
+ if (exactMatch) return exactMatch
+
+ const nearestAbove = selectableResolutions.find(r => r.height >= preferredHeight)
+ if (nearestAbove) return nearestAbove
+
+ return selectableResolutions[selectableResolutions.length - 1]
}
private manuallySelectVideoLevel (index: number) {
diff --git a/client/src/standalone/player/src/shared/settings/resolution-menu-item.ts b/client/src/standalone/player/src/shared/settings/resolution-menu-item.ts
index f5990ad0a4..40d08ece24 100644
--- a/client/src/standalone/player/src/shared/settings/resolution-menu-item.ts
+++ b/client/src/standalone/player/src/shared/settings/resolution-menu-item.ts
@@ -1,4 +1,5 @@
import videojs from 'video.js'
+import { clearStoredPreferredResolution, savePreferredResolution } from '../../peertube-player-local-storage'
import { VideojsMenuItem, VideojsMenuItemOptions, VideojsPlayer } from '../../types'
const MenuItem = videojs.getComponent('MenuItem') as typeof VideojsMenuItem
@@ -37,6 +38,16 @@ class ResolutionMenuItem extends MenuItem {
super.handleClick(event)
this.player().peertubeResolutions().select({ id: this.resolutionId, fireCallback: true })
+
+ if (this.resolutionId === -1) {
+ clearStoredPreferredResolution()
+ return
+ }
+
+ const selectedResolution = this.player().peertubeResolutions().getResolutions().find(r => r.id === this.resolutionId)
+ if (selectedResolution?.height === undefined) return
+
+ savePreferredResolution(selectedResolution.height)
}
updateSelection () {
diff --git a/client/src/standalone/player/src/shared/web-video/web-video-plugin.ts b/client/src/standalone/player/src/shared/web-video/web-video-plugin.ts
index 8486db5a44..5a11999bf4 100644
--- a/client/src/standalone/player/src/shared/web-video/web-video-plugin.ts
+++ b/client/src/standalone/player/src/shared/web-video/web-video-plugin.ts
@@ -3,6 +3,7 @@ import { VideoFile } from '@peertube/peertube-models'
import { logger } from '@root-helpers/logger'
import debug from 'debug'
import videojs from 'video.js'
+import { getStoredPreferredResolution } from '../../peertube-player-local-storage'
import { PeerTubeResolution, PlayerNetworkInfo, VideojsPlayer, VideojsPlugin, WebVideoPluginOptions } from '../../types'
const debugLogger = debug('peertube:player:web-video-plugin')
@@ -27,7 +28,7 @@ class WebVideoPlugin extends Plugin {
this.videoFiles = options.videoFiles
this.videoFileToken = options.videoFileToken
- const videoFile = this.pickAverageVideoFile()
+ const videoFile = this.pickInitialVideoFile()
if (videoFile) this.updateVideoFile({ videoFile, isUserResolutionChange: false })
this.onLoadedMetadata = () => {
@@ -161,6 +162,24 @@ class WebVideoPlugin extends Plugin {
return files[Math.floor(files.length / 2)]
}
+ private pickInitialVideoFile () {
+ const preferredResolution = getStoredPreferredResolution()
+ if (preferredResolution === undefined) return this.pickAverageVideoFile()
+
+ const sortedVideoFiles = [ ...this.videoFiles ].sort((a, b) => a.resolution.id - b.resolution.id)
+
+ const exactMatch = sortedVideoFiles.find(videoFile => videoFile.resolution.id === preferredResolution)
+ if (exactMatch) return exactMatch
+
+ const nearestAbove = sortedVideoFiles.find(videoFile => videoFile.resolution.id >= preferredResolution)
+ if (nearestAbove) return nearestAbove
+
+ const nearestBelow = [ ...sortedVideoFiles ].reverse().find(videoFile => videoFile.resolution.id < preferredResolution)
+ if (nearestBelow) return nearestBelow
+
+ return this.pickAverageVideoFile()
+ }
+
private buildQualities () {
const resolutions: PeerTubeResolution[] = this.videoFiles.map(videoFile => ({
id: videoFile.resolution.id,