From 0f11ec8dd32b50897c18588db948e96cf0fc2c70 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Tue, 1 Feb 2022 11:16:45 +0100
Subject: Prevent HLS transcoding after webtorrent transcoding
---
server/lib/job-queue/handlers/video-transcoding.ts | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
(limited to 'server/lib/job-queue')
diff --git a/server/lib/job-queue/handlers/video-transcoding.ts b/server/lib/job-queue/handlers/video-transcoding.ts
index 02902b0b8..5540b791d 100644
--- a/server/lib/job-queue/handlers/video-transcoding.ts
+++ b/server/lib/job-queue/handlers/video-transcoding.ts
@@ -10,7 +10,7 @@ import { pick } from '@shared/core-utils'
import {
HLSTranscodingPayload,
MergeAudioTranscodingPayload,
- NewResolutionTranscodingPayload,
+ NewWebTorrentResolutionTranscodingPayload,
OptimizeTranscodingPayload,
VideoResolution,
VideoTranscodingPayload
@@ -110,7 +110,7 @@ async function handleHLSJob (job: Job, payload: HLSTranscodingPayload, video: MV
async function handleNewWebTorrentResolutionJob (
job: Job,
- payload: NewResolutionTranscodingPayload,
+ payload: NewWebTorrentResolutionTranscodingPayload,
video: MVideoFullLight,
user: MUserId
) {
@@ -217,9 +217,12 @@ async function onVideoFirstWebTorrentTranscoding (
async function onNewWebTorrentFileResolution (
video: MVideo,
user: MUserId,
- payload: NewResolutionTranscodingPayload | MergeAudioTranscodingPayload
+ payload: NewWebTorrentResolutionTranscodingPayload | MergeAudioTranscodingPayload
) {
- await createHlsJobIfEnabled(user, { hasAudio: true, copyCodecs: true, isMaxQuality: false, ...payload })
+ if (payload.createHLSIfNeeded) {
+ await createHlsJobIfEnabled(user, { hasAudio: true, copyCodecs: true, isMaxQuality: false, ...payload })
+ }
+
await VideoJobInfoModel.decrease(video.uuid, 'pendingTranscode')
await retryTransactionWrapper(moveToNextState, video, payload.isNewVideo)
@@ -282,6 +285,7 @@ async function createLowerResolutionsJobs (options: {
resolution,
isPortraitMode,
hasAudio,
+ createHLSIfNeeded: true,
isNewVideo
}
--
cgit v1.2.3