From 4a54a93941d1c095bf249331df799c51e39c3774 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 3 Dec 2020 09:38:24 +0100 Subject: [PATCH] Fix live invalid save replay duration --- server/helpers/ffprobe-utils.ts | 2 +- server/lib/job-queue/handlers/video-live-ending.ts | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/server/helpers/ffprobe-utils.ts b/server/helpers/ffprobe-utils.ts index 1cf397767..4dea6283c 100644 --- a/server/helpers/ffprobe-utils.ts +++ b/server/helpers/ffprobe-utils.ts @@ -164,7 +164,7 @@ async function getVideoFileBitrate (path: string, existingProbe?: ffmpeg.Ffprobe async function getDurationFromVideoFile (path: string, existingProbe?: ffmpeg.FfprobeData) { const metadata = await getMetadataFromFile(path, existingProbe) - return Math.floor(metadata.format.duration) + return Math.round(metadata.format.duration) } async function getVideoStreamFromFile (path: string, existingProbe?: ffmpeg.FfprobeData) { diff --git a/server/lib/job-queue/handlers/video-live-ending.ts b/server/lib/job-queue/handlers/video-live-ending.ts index 55bee0b83..d3c84ce75 100644 --- a/server/lib/job-queue/handlers/video-live-ending.ts +++ b/server/lib/job-queue/handlers/video-live-ending.ts @@ -89,7 +89,7 @@ async function saveLive (video: MVideo, live: MVideoLive) { hlsPlaylist.VideoFiles = [] const replayFiles = await readdir(replayDirectory) - let duration: number + let durationDone: boolean for (const playlistFile of playlistFiles) { const playlistPath = join(replayDirectory, playlistFile) @@ -109,9 +109,11 @@ async function saveLive (video: MVideo, live: MVideoLive) { isPortraitMode }) - if (!duration) { + if (!durationDone) { videoWithFiles.duration = await getDurationFromVideoFile(outputPath) await videoWithFiles.save() + + durationDone = true } } @@ -126,7 +128,7 @@ async function saveLive (video: MVideo, live: MVideoLive) { await generateVideoMiniature(videoWithFiles, videoWithFiles.getMaxQualityFile(), ThumbnailType.PREVIEW) } - await publishAndFederateIfNeeded(video, true) + await publishAndFederateIfNeeded(videoWithFiles, true) } async function cleanupLive (video: MVideo, streamingPlaylist: MStreamingPlaylist) {