aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/lib/video-transcoding.ts
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2020-12-04 15:29:18 +0100
committerChocobozzz <me@florianbigard.com>2020-12-04 15:38:32 +0100
commite772bdf14c46701552491dc337a21325c34e1ec2 (patch)
treece50d56a3433306beeb8c4c0cd711636bac242ee /server/lib/video-transcoding.ts
parent3851e732c4b1da0bc0c40a46ed5a89d93cdc5389 (diff)
downloadPeerTube-e772bdf14c46701552491dc337a21325c34e1ec2.tar.gz
PeerTube-e772bdf14c46701552491dc337a21325c34e1ec2.tar.zst
PeerTube-e772bdf14c46701552491dc337a21325c34e1ec2.zip
Load video in permanent live after last one ended
Diffstat (limited to 'server/lib/video-transcoding.ts')
-rw-r--r--server/lib/video-transcoding.ts9
1 files changed, 7 insertions, 2 deletions
diff --git a/server/lib/video-transcoding.ts b/server/lib/video-transcoding.ts
index 44ecf4cc9..e7108bd5a 100644
--- a/server/lib/video-transcoding.ts
+++ b/server/lib/video-transcoding.ts
@@ -169,13 +169,15 @@ async function generateHlsPlaylistFromTS (options: {
169 concatenatedTsFilePath: string 169 concatenatedTsFilePath: string
170 resolution: VideoResolution 170 resolution: VideoResolution
171 isPortraitMode: boolean 171 isPortraitMode: boolean
172 isAAC: boolean
172}) { 173}) {
173 return generateHlsPlaylistCommon({ 174 return generateHlsPlaylistCommon({
174 video: options.video, 175 video: options.video,
175 resolution: options.resolution, 176 resolution: options.resolution,
176 isPortraitMode: options.isPortraitMode, 177 isPortraitMode: options.isPortraitMode,
177 inputPath: options.concatenatedTsFilePath, 178 inputPath: options.concatenatedTsFilePath,
178 type: 'hls-from-ts' as 'hls-from-ts' 179 type: 'hls-from-ts' as 'hls-from-ts',
180 isAAC: options.isAAC
179 }) 181 })
180} 182}
181 183
@@ -234,9 +236,10 @@ async function generateHlsPlaylistCommon (options: {
234 inputPath: string 236 inputPath: string
235 resolution: VideoResolution 237 resolution: VideoResolution
236 copyCodecs?: boolean 238 copyCodecs?: boolean
239 isAAC?: boolean
237 isPortraitMode: boolean 240 isPortraitMode: boolean
238}) { 241}) {
239 const { type, video, inputPath, resolution, copyCodecs, isPortraitMode } = options 242 const { type, video, inputPath, resolution, copyCodecs, isPortraitMode, isAAC } = options
240 243
241 const baseHlsDirectory = join(HLS_STREAMING_PLAYLIST_DIRECTORY, video.uuid) 244 const baseHlsDirectory = join(HLS_STREAMING_PLAYLIST_DIRECTORY, video.uuid)
242 await ensureDir(join(HLS_STREAMING_PLAYLIST_DIRECTORY, video.uuid)) 245 await ensureDir(join(HLS_STREAMING_PLAYLIST_DIRECTORY, video.uuid))
@@ -257,6 +260,8 @@ async function generateHlsPlaylistCommon (options: {
257 copyCodecs, 260 copyCodecs,
258 isPortraitMode, 261 isPortraitMode,
259 262
263 isAAC,
264
260 hlsPlaylist: { 265 hlsPlaylist: {
261 videoFilename 266 videoFilename
262 } 267 }