Skip to content

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

Faster duration display for HLS video

Chocobozzza12da8096901
diff --git a/client/src/standalone/player/src/peertube-player.ts b/client/src/standalone/player/src/peertube-player.ts
index 1528870382..7869b3c255 100644
--- a/client/src/standalone/player/src/peertube-player.ts
+++ b/client/src/standalone/player/src/peertube-player.ts
@@ -215,7 +215,8 @@ export class PeerTubePlayer {
'isLive',
'p2pEnabled',
'liveOptions',
- 'hls'
+ 'hls',
+ 'duration'
])
})
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 92b665fe37..69d7d102a3 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
@@ -185,7 +185,7 @@ export class Html5Hlsjs {
if (this._duration === Infinity) return Infinity
if (!isNaN(this.videoElement.duration)) return this.videoElement.duration
- return this._duration || 0
+ return this._duration || this.hlsjsConfig.durationPlaceholder || 0
}
seekable () {
diff --git a/client/src/standalone/player/src/shared/player-options-builder/hls-options-builder.ts b/client/src/standalone/player/src/shared/player-options-builder/hls-options-builder.ts
index 6e3b8ef778..bb0529e995 100644
--- a/client/src/standalone/player/src/shared/player-options-builder/hls-options-builder.ts
+++ b/client/src/standalone/player/src/shared/player-options-builder/hls-options-builder.ts
@@ -33,6 +33,7 @@ type ConstructorOptions =
| 'p2pEnabled'
| 'hls'
| 'startTime'
+ | 'duration'
>
export class HLSOptionsBuilder {
@@ -220,6 +221,7 @@ export class HLSOptionsBuilder {
startPosition: exists(this.options.startTime)
? timeToInt(this.options.startTime)
: 0,
+ durationPlaceholder: this.options.duration,
p2pMediaLoaderOptions: p2pMediaLoaderConfig.loader,
diff --git a/client/src/standalone/player/src/types/peertube-videojs-typings.ts b/client/src/standalone/player/src/types/peertube-videojs-typings.ts
index 1a51028e13..0ed053d944 100644
--- a/client/src/standalone/player/src/types/peertube-videojs-typings.ts
+++ b/client/src/standalone/player/src/types/peertube-videojs-typings.ts
@@ -201,7 +201,14 @@ export type HLSLoaderClass = {
getEngine(): HlsJsP2PEngine
}
-export type HLSPluginOptions = Partial<HlsConfig & { cueHandler: any, p2pMediaLoaderOptions: CoreConfig, liveDvrEnabled?: boolean }>
+export type HLSPluginOptions = Partial<
+ HlsConfig & {
+ cueHandler: any
+ p2pMediaLoaderOptions: CoreConfig
+ liveDvrEnabled?: boolean
+ durationPlaceholder?: number
+ }
+>
export type P2PMediaLoaderPluginOptions = {
redundancyUrlManager: RedundancyUrlManager | null