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

Fix missing p2p media loader config for hls

pull/4867/head
Chocobozzz 2022-03-18 13:32:20 +01:00
parent 57e4e1c1a9
commit e71e2d8a8f
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
client/src/assets/player/shared/manager-options/hls-options-builder.ts
View File

@ -46,13 +46,14 @@ export class HLSOptionsBuilder {
if (file.fps >= 50) label += file.fps
return label
},
html5: {
hlsjsConfig: this.getHLSJSOptions(loader)
}
}
return { p2pMediaLoader, hlsjs }
const html5 = {
hlsjsConfig: this.getHLSJSOptions(loader)
}
return { p2pMediaLoader, hlsjs, html5 }
}
// ---------------------------------------------------------------------------
@ -73,7 +74,6 @@ export class HLSOptionsBuilder {
return {
loader: {
trackerAnnounce,
rtcConfig: getRtcConfig(),

6
client/src/assets/player/shared/manager-options/manager-options-builder.ts
View File

@ -2,7 +2,7 @@ import videojs from 'video.js'
import { copyToClipboard } from '@root-helpers/utils'
import { buildVideoOrPlaylistEmbed } from '@root-helpers/video'
import { isIOS, isSafari } from '@root-helpers/web-browser'
import { buildVideoLink, decorateVideoLink } from '@shared/core-utils'
import { buildVideoLink, decorateVideoLink, pick } from '@shared/core-utils'
import { isDefaultLocale } from '@shared/core-utils/i18n'
import { VideoJSPluginOptions } from '../../types'
import { CommonOptions, PeertubePlayerManagerOptions, PlayerMode } from '../../types/manager-options'
@ -49,8 +49,10 @@ export class ManagerOptionsBuilder {
if (this.mode === 'p2p-media-loader') {
const hlsOptionsBuilder = new HLSOptionsBuilder(this.options, this.p2pMediaLoaderModule)
const options = hlsOptionsBuilder.getPluginOptions()
Object.assign(plugins, hlsOptionsBuilder.getPluginOptions())
Object.assign(plugins, pick(options, [ 'hlsjs', 'p2pMediaLoader' ]))
Object.assign(html5, options.html5)
} else if (this.mode === 'webtorrent') {
const webtorrentOptionsBuilder = new WebTorrentOptionsBuilder(this.options, this.getAutoPlayValue(autoplay, alreadyPlayed))