aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/lib/transcoding/shared
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2023-05-30 09:35:21 +0200
committerChocobozzz <me@florianbigard.com>2023-05-30 09:35:21 +0200
commit29c7319c8a42d5c4831d08a80f4d111d3a72f52c (patch)
tree476b180ea7f84fd4d55b12fb1c06285676e173fd /server/lib/transcoding/shared
parent89eda2aab005e6c8f548acc80471ce4bad039ecd (diff)
downloadPeerTube-29c7319c8a42d5c4831d08a80f4d111d3a72f52c.tar.gz
PeerTube-29c7319c8a42d5c4831d08a80f4d111d3a72f52c.tar.zst
PeerTube-29c7319c8a42d5c4831d08a80f4d111d3a72f52c.zip
Fix transcoding error
When transcoding.always_transcode_original_resolution is false
Diffstat (limited to 'server/lib/transcoding/shared')
-rw-r--r--server/lib/transcoding/shared/job-builders/transcoding-job-queue-builder.ts4
1 files changed, 2 insertions, 2 deletions
diff --git a/server/lib/transcoding/shared/job-builders/transcoding-job-queue-builder.ts b/server/lib/transcoding/shared/job-builders/transcoding-job-queue-builder.ts
index fa2ac70bf..4f802e2a6 100644
--- a/server/lib/transcoding/shared/job-builders/transcoding-job-queue-builder.ts
+++ b/server/lib/transcoding/shared/job-builders/transcoding-job-queue-builder.ts
@@ -18,7 +18,7 @@ import {
18} from '@shared/models' 18} from '@shared/models'
19import { getTranscodingJobPriority } from '../../transcoding-priority' 19import { getTranscodingJobPriority } from '../../transcoding-priority'
20import { canDoQuickTranscode } from '../../transcoding-quick-transcode' 20import { canDoQuickTranscode } from '../../transcoding-quick-transcode'
21import { computeResolutionsToTranscode } from '../../transcoding-resolutions' 21import { buildOriginalFileResolution, computeResolutionsToTranscode } from '../../transcoding-resolutions'
22import { AbstractJobBuilder } from './abstract-job-builder' 22import { AbstractJobBuilder } from './abstract-job-builder'
23 23
24export class TranscodingJobQueueBuilder extends AbstractJobBuilder { 24export class TranscodingJobQueueBuilder extends AbstractJobBuilder {
@@ -55,7 +55,7 @@ export class TranscodingJobQueueBuilder extends AbstractJobBuilder {
55 55
56 const maxResolution = await isAudioFile(videoFilePath, probe) 56 const maxResolution = await isAudioFile(videoFilePath, probe)
57 ? DEFAULT_AUDIO_RESOLUTION 57 ? DEFAULT_AUDIO_RESOLUTION
58 : resolution 58 : buildOriginalFileResolution(resolution)
59 59
60 if (CONFIG.TRANSCODING.HLS.ENABLED === true) { 60 if (CONFIG.TRANSCODING.HLS.ENABLED === true) {
61 nextTranscodingSequentialJobPayloads.push([ 61 nextTranscodingSequentialJobPayloads.push([