import * as Bull from 'bull'
-import { move, readdir, remove } from 'fs-extra'
+import { pathExists, readdir, remove } from 'fs-extra'
import { join } from 'path'
-import { hlsPlaylistToFragmentedMP4 } from '@server/helpers/ffmpeg-utils'
-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 { buildConcatenatedName, cleanupLive, LiveSegmentShaStore } from '@server/lib/live'
import { generateVideoMiniature } from '@server/lib/thumbnail'
+import { generateHlsPlaylistResolutionFromTS } from '@server/lib/transcoding/video-transcoding'
import { publishAndFederateIfNeeded } from '@server/lib/video'
-import { getHLSDirectory } from '@server/lib/video-paths'
-import { generateHlsPlaylist } from '@server/lib/video-transcoding'
+import { generateHLSMasterPlaylistFilename, generateHlsSha256SegmentsFilename, getHLSDirectory } from '@server/lib/video-paths'
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 { VIDEO_LIVE } from '@server/initializers/constants'
async function processVideoLiveEnding (job: Bull.Job) {
const payload = job.data as VideoLiveEndingPayload
return
}
+ LiveSegmentShaStore.Instance.cleanupShaSegments(video.uuid)
+
if (live.saveReplay !== true) {
return cleanupLive(video, streamingPlaylist)
}
- return saveLive(video, live)
+ return saveLive(video, live, streamingPlaylist)
}
// ---------------------------------------------------------------------------
// ---------------------------------------------------------------------------
-async function saveLive (video: MVideo, live: MVideoLive) {
+async function saveLive (video: MVideo, live: MVideoLive, streamingPlaylist: MStreamingPlaylist) {
const hlsDirectory = getHLSDirectory(video, false)
const replayDirectory = join(hlsDirectory, VIDEO_LIVE.REPLAY_DIRECTORY)
const rootFiles = await readdir(hlsDirectory)
- const playlistFiles: string[] = []
-
- for (const file of rootFiles) {
- if (file.endsWith('.m3u8') !== true) continue
-
- await move(join(hlsDirectory, file), join(replayDirectory, file))
-
- if (file !== 'master.m3u8') {
- playlistFiles.push(file)
- }
- }
-
- const replayFiles = await readdir(replayDirectory)
-
- const resolutions: number[] = []
- let duration: number
-
- for (const playlistFile of playlistFiles) {
- const playlistPath = join(replayDirectory, playlistFile)
- const { videoFileResolution } = await getVideoFileResolution(playlistPath)
-
- // Put the final mp4 in the hls directory, and not in the replay directory
- const mp4TmpPath = buildMP4TmpPath(hlsDirectory, videoFileResolution)
-
- // Playlist name is for example 3.m3u8
- // Segments names are 3-0.ts 3-1.ts etc
- const shouldStartWith = playlistFile.replace(/\.m3u8$/, '') + '-'
-
- const segmentFiles = replayFiles.filter(f => f.startsWith(shouldStartWith) && f.endsWith('.ts'))
- await hlsPlaylistToFragmentedMP4(replayDirectory, segmentFiles, mp4TmpPath)
-
- if (!duration) {
- duration = await getDurationFromVideoFile(mp4TmpPath)
- }
-
- resolutions.push(videoFileResolution)
- }
+ const playlistFiles = rootFiles.filter(file => {
+ return file.endsWith('.m3u8') && file !== streamingPlaylist.playlistFilename
+ })
await cleanupLiveFiles(hlsDirectory)
// Reinit views
video.views = 0
video.state = VideoState.TO_TRANSCODE
- video.duration = duration
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)
+
+ // Reset playlist
hlsPlaylist.VideoFiles = []
+ hlsPlaylist.playlistFilename = generateHLSMasterPlaylistFilename()
+ hlsPlaylist.segmentsSha256Filename = generateHlsSha256SegmentsFilename()
+ await hlsPlaylist.save()
+
+ let durationDone = false
+
+ for (const playlistFile of playlistFiles) {
+ const concatenatedTsFile = buildConcatenatedName(playlistFile)
+ const concatenatedTsFilePath = join(replayDirectory, concatenatedTsFile)
+
+ const probe = await ffprobePromise(concatenatedTsFilePath)
+ const { audioStream } = await getAudioStream(concatenatedTsFilePath, probe)
- for (const resolution of resolutions) {
- const videoInputPath = buildMP4TmpPath(hlsDirectory, resolution)
- const { isPortraitMode } = await getVideoFileResolution(videoInputPath)
+ const { videoFileResolution, isPortraitMode } = await getVideoFileResolution(concatenatedTsFilePath, probe)
- await generateHlsPlaylist({
+ const outputPath = await generateHlsPlaylistResolutionFromTS({
video: videoWithFiles,
- videoInputPath,
- resolution: resolution,
- copyCodecs: true,
- isPortraitMode
+ concatenatedTsFilePath,
+ resolution: videoFileResolution,
+ isPortraitMode,
+ isAAC: audioStream?.codec_name === 'aac'
})
- await remove(videoInputPath)
+ if (!durationDone) {
+ videoWithFiles.duration = await getDurationFromVideoFile(outputPath)
+ await videoWithFiles.save()
+
+ durationDone = true
+ }
}
+ await remove(replayDirectory)
+
// 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(video, true)
-}
-
-async function cleanupLive (video: MVideo, streamingPlaylist: MStreamingPlaylist) {
- const hlsDirectory = getHLSDirectory(video)
-
- await remove(hlsDirectory)
-
- streamingPlaylist.destroy()
- .catch(err => logger.error('Cannot remove live streaming playlist.', { err }))
+ await publishAndFederateIfNeeded(videoWithFiles, true)
}
async function cleanupLiveFiles (hlsDirectory: string) {
+ if (!await pathExists(hlsDirectory)) return
+
const files = await readdir(hlsDirectory)
for (const filename of files) {
filename.endsWith('.m3u8') ||
filename.endsWith('.mpd') ||
filename.endsWith('.m4s') ||
- filename.endsWith('.tmp') ||
- filename === VIDEO_LIVE.REPLAY_DIRECTORY
+ filename.endsWith('.tmp')
) {
const p = join(hlsDirectory, filename)
}
}
}
-
-function buildMP4TmpPath (basePath: string, resolution: number) {
- return join(basePath, resolution + '-tmp.mp4')
-}
projects / github / Chocobozzz / PeerTube.git / blobdiff