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

Fix HTTP fallback with no webtorrent files

pull/4214/head
Chocobozzz 2021-07-12 14:35:17 +02:00
parent e89cbbdf94
commit 3e9cf56480
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
client/src/assets/player/peertube-player-manager.ts
View File

@ -388,6 +388,7 @@ export class PeertubePlayerManager {
private static addWebTorrentOptions (plugins: VideoJSPluginOptions, options: PeertubePlayerManagerOptions) { private static addWebTorrentOptions (plugins: VideoJSPluginOptions, options: PeertubePlayerManagerOptions) {
const commonOptions = options.common const commonOptions = options.common
const webtorrentOptions = options.webtorrent const webtorrentOptions = options.webtorrent
const p2pMediaLoaderOptions = options.p2pMediaLoader
const autoplay = this.getAutoPlayValue(commonOptions.autoplay) === 'play' const autoplay = this.getAutoPlayValue(commonOptions.autoplay) === 'play'
? true ? true
@ -397,7 +398,11 @@ export class PeertubePlayerManager {
autoplay, autoplay,
videoDuration: commonOptions.videoDuration, videoDuration: commonOptions.videoDuration,
playerElement: commonOptions.playerElement, playerElement: commonOptions.playerElement,
videoFiles: webtorrentOptions.videoFiles, videoFiles: webtorrentOptions.videoFiles.length !== 0
? webtorrentOptions.videoFiles
// The WebTorrent plugin won't be able to play these files, but it will fallback to HTTP mode
: p2pMediaLoaderOptions.videoFiles,
fallbackVideoFiles: p2pMediaLoaderOptions.videoFiles,
startTime: commonOptions.startTime startTime: commonOptions.startTime
} }