From 3b01f4c0ac764ecb70efaadfd939ca868c28769c Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 21 Jan 2021 14:42:43 +0100 Subject: Support progress for ffmpeg tasks --- server/lib/job-queue/handlers/video-transcoding.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'server/lib/job-queue/handlers') diff --git a/server/lib/job-queue/handlers/video-transcoding.ts b/server/lib/job-queue/handlers/video-transcoding.ts index 20f8c3f50..083cec11a 100644 --- a/server/lib/job-queue/handlers/video-transcoding.ts +++ b/server/lib/job-queue/handlers/video-transcoding.ts @@ -44,20 +44,21 @@ async function processVideoTranscoding (job: Bull.Job) { videoInputPath, resolution: payload.resolution, copyCodecs: payload.copyCodecs, - isPortraitMode: payload.isPortraitMode || false + isPortraitMode: payload.isPortraitMode || false, + job }) await retryTransactionWrapper(onHlsPlaylistGenerationSuccess, video) } else if (payload.type === 'new-resolution') { - await transcodeNewResolution(video, payload.resolution, payload.isPortraitMode || false) + await transcodeNewResolution(video, payload.resolution, payload.isPortraitMode || false, job) await retryTransactionWrapper(publishNewResolutionIfNeeded, video, payload) } else if (payload.type === 'merge-audio') { - await mergeAudioVideofile(video, payload.resolution) + await mergeAudioVideofile(video, payload.resolution, job) await retryTransactionWrapper(publishNewResolutionIfNeeded, video, payload) } else { - const transcodeType = await optimizeOriginalVideofile(video) + const transcodeType = await optimizeOriginalVideofile(video, video.getMaxQualityFile(), job) await retryTransactionWrapper(onVideoFileOptimizerSuccess, video, payload, transcodeType) } -- cgit v1.2.3