import * as Bull from 'bull'
-import { copy, pathExists, readdir, remove } from 'fs-extra'
+import { pathExists, readdir, remove } from 'fs-extra'
import { join } from 'path'
-import { getDurationFromVideoFile, getVideoFileResolution } from '@server/helpers/ffprobe-utils'
+import { ffprobePromise, getAudioStream, getDurationFromVideoFile, getVideoFileResolution } from '@server/helpers/ffprobe-utils'
import { VIDEO_LIVE } from '@server/initializers/constants'
+import { LiveManager } from '@server/lib/live-manager'
import { generateVideoMiniature } from '@server/lib/thumbnail'
import { publishAndFederateIfNeeded } from '@server/lib/video'
import { getHLSDirectory } from '@server/lib/video-paths'
-import { generateHlsPlaylistFromTS } from '@server/lib/video-transcoding'
+import { generateHlsPlaylistResolutionFromTS } from '@server/lib/video-transcoding'
import { VideoModel } from '@server/models/video/video'
import { VideoFileModel } from '@server/models/video/video-file'
import { VideoLiveModel } from '@server/models/video/video-live'
import { MStreamingPlaylist, MVideo, MVideoLive } from '@server/types/models'
import { ThumbnailType, VideoLiveEndingPayload, VideoState } from '@shared/models'
import { logger } from '../../../helpers/logger'
-import { LiveManager } from '@server/lib/live-manager'
async function processVideoLiveEnding (job: Bull.Job) {
const payload = job.data as VideoLiveEndingPayload
const rootFiles = await readdir(hlsDirectory)
- const playlistFiles: string[] = []
-
- for (const file of rootFiles) {
- // Move remaining files in the replay directory
- if (file.endsWith('.ts') || file.endsWith('.m3u8')) {
- await copy(join(hlsDirectory, file), join(replayDirectory, file))
- }
-
- if (file.endsWith('.m3u8') && file !== 'master.m3u8') {
- playlistFiles.push(file)
- }
- }
+ const playlistFiles = rootFiles.filter(file => {
+ return file.endsWith('.m3u8') && file !== 'master.m3u8'
+ })
await cleanupLiveFiles(hlsDirectory)
await video.save()
// Remove old HLS playlist video files
- const videoWithFiles = await VideoModel.loadWithFiles(video.id)
+ const videoWithFiles = await VideoModel.loadAndPopulateAccountAndServerAndTags(video.id)
const hlsPlaylist = videoWithFiles.getHLSPlaylist()
await VideoFileModel.removeHLSFilesOfVideoId(hlsPlaylist.id)
hlsPlaylist.VideoFiles = []
- const replayFiles = await readdir(replayDirectory)
- let durationDone: boolean
+ let durationDone = false
for (const playlistFile of playlistFiles) {
- const playlistPath = join(replayDirectory, playlistFile)
- const { videoFileResolution, isPortraitMode } = await getVideoFileResolution(playlistPath)
+ const concatenatedTsFile = LiveManager.Instance.buildConcatenatedName(playlistFile)
+ const concatenatedTsFilePath = join(replayDirectory, concatenatedTsFile)
- // Playlist name is for example 3.m3u8
- // Segments names are 3-0.ts 3-1.ts etc
- const shouldStartWith = playlistFile.replace(/\.m3u8$/, '') + '-'
+ const probe = await ffprobePromise(concatenatedTsFilePath)
+ const { audioStream } = await getAudioStream(concatenatedTsFilePath, probe)
- const segmentFiles = replayFiles.filter(f => f.startsWith(shouldStartWith) && f.endsWith('.ts'))
+ const { videoFileResolution, isPortraitMode } = await getVideoFileResolution(concatenatedTsFilePath, probe)
- const outputPath = await generateHlsPlaylistFromTS({
+ const outputPath = await generateHlsPlaylistResolutionFromTS({
video: videoWithFiles,
- replayDirectory,
- segmentFiles,
+ concatenatedTsFilePath,
resolution: videoFileResolution,
- isPortraitMode
+ isPortraitMode,
+ isAAC: audioStream?.codec_name === 'aac'
})
if (!durationDone) {
// Regenerate the thumbnail & preview?
if (videoWithFiles.getMiniature().automaticallyGenerated === true) {
- await generateVideoMiniature(videoWithFiles, videoWithFiles.getMaxQualityFile(), ThumbnailType.MINIATURE)
+ await generateVideoMiniature({
+ video: videoWithFiles,
+ videoFile: videoWithFiles.getMaxQualityFile(),
+ type: ThumbnailType.MINIATURE
+ })
}
if (videoWithFiles.getPreview().automaticallyGenerated === true) {
- await generateVideoMiniature(videoWithFiles, videoWithFiles.getMaxQualityFile(), ThumbnailType.PREVIEW)
+ await generateVideoMiniature({
+ video: videoWithFiles,
+ videoFile: videoWithFiles.getMaxQualityFile(),
+ type: ThumbnailType.PREVIEW
+ })
}
await publishAndFederateIfNeeded(videoWithFiles, true)