From e4fc3697acb27c4192cbbb63eb94272a6cf7ce32 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 9 Sep 2022 09:21:42 +0200 Subject: Fix saved live master playlist bandwidth --- server/lib/job-queue/handlers/video-live-ending.ts | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'server/lib/job-queue/handlers') diff --git a/server/lib/job-queue/handlers/video-live-ending.ts b/server/lib/job-queue/handlers/video-live-ending.ts index 79002258c..8a3ee09a2 100644 --- a/server/lib/job-queue/handlers/video-live-ending.ts +++ b/server/lib/job-queue/handlers/video-live-ending.ts @@ -1,7 +1,7 @@ import { Job } from 'bullmq' import { readdir, remove } from 'fs-extra' import { join } from 'path' -import { ffprobePromise, getAudioStream, getVideoStreamDimensionsInfo, getVideoStreamDuration } from '@server/helpers/ffmpeg' +import { ffprobePromise, getAudioStream, getVideoStreamDimensionsInfo } from '@server/helpers/ffmpeg' import { getLocalVideoActivityPubUrl } from '@server/lib/activitypub/url' import { federateVideoIfNeeded } from '@server/lib/activitypub/videos' import { cleanupPermanentLive, cleanupTMPLiveFiles, cleanupUnsavedNormalLive } from '@server/lib/live' @@ -203,8 +203,6 @@ async function assignReplayFilesToVideo (options: { }) { const { video, replayDirectory } = options - let durationDone = false - const concatenatedTsFiles = await readdir(replayDirectory) for (const concatenatedTsFile of concatenatedTsFiles) { @@ -212,22 +210,14 @@ async function assignReplayFilesToVideo (options: { const probe = await ffprobePromise(concatenatedTsFilePath) const { audioStream } = await getAudioStream(concatenatedTsFilePath, probe) - const { resolution } = await getVideoStreamDimensionsInfo(concatenatedTsFilePath, probe) - const { resolutionPlaylistPath: outputPath } = await generateHlsPlaylistResolutionFromTS({ + await generateHlsPlaylistResolutionFromTS({ video, concatenatedTsFilePath, resolution, isAAC: audioStream?.codec_name === 'aac' }) - - if (!durationDone) { - video.duration = await getVideoStreamDuration(outputPath) - await video.save() - - durationDone = true - } } return video -- cgit v1.2.3