aboutsummaryrefslogtreecommitdiffhomepage
path: root/shared
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2023-01-27 08:34:16 +0100
committerChocobozzz <me@florianbigard.com>2023-01-27 08:34:16 +0100
commita2be43f5700460d3afdc194abc788690b79e66cd (patch)
tree005de26e549da0b20e1ec7bc5e293a6603cc958d /shared
parent647c2b7d0448e68d8c8ade52d9568e9b33f8638d (diff)
parent8059e050ef4e800c95851ac97abbb2330fe17882 (diff)
downloadPeerTube-a2be43f5700460d3afdc194abc788690b79e66cd.tar.gz
PeerTube-a2be43f5700460d3afdc194abc788690b79e66cd.tar.zst
PeerTube-a2be43f5700460d3afdc194abc788690b79e66cd.zip
Merge branch 'release/5.0.0' into develop
Diffstat (limited to 'shared')
-rw-r--r--shared/server-commands/videos/live-command.ts12
1 files changed, 10 insertions, 2 deletions
diff --git a/shared/server-commands/videos/live-command.ts b/shared/server-commands/videos/live-command.ts
index cc9502c6f..4541465ba 100644
--- a/shared/server-commands/videos/live-command.ts
+++ b/shared/server-commands/videos/live-command.ts
@@ -192,12 +192,20 @@ export class LiveCommand extends AbstractCommand {
192 playlistNumber: number 192 playlistNumber: number
193 segment: number 193 segment: number
194 objectStorage: boolean 194 objectStorage: boolean
195 objectStorageBaseUrl?: string
195 }) { 196 }) {
196 const { server, objectStorage, playlistNumber, segment, videoUUID } = options 197 const {
198 server,
199 objectStorage,
200 playlistNumber,
201 segment,
202 videoUUID,
203 objectStorageBaseUrl = ObjectStorageCommand.getMockPlaylistBaseUrl()
204 } = options
197 205
198 const segmentName = `${playlistNumber}-00000${segment}.ts` 206 const segmentName = `${playlistNumber}-00000${segment}.ts`
199 const baseUrl = objectStorage 207 const baseUrl = objectStorage
200 ? ObjectStorageCommand.getMockPlaylistBaseUrl() + 'hls' 208 ? join(objectStorageBaseUrl, 'hls')
201 : server.url + '/static/streaming-playlists/hls' 209 : server.url + '/static/streaming-playlists/hls'
202 210
203 let error = true 211 let error = true