import * as Bull from 'bull'
import { TranscodeOptionsType } from '@server/helpers/ffmpeg-utils'
-import { JOB_PRIORITY } from '@server/initializers/constants'
-import { getJobTranscodingPriorityMalus, publishAndFederateIfNeeded } from '@server/lib/video'
+import { getTranscodingJobPriority, publishAndFederateIfNeeded } from '@server/lib/video'
import { getVideoFilePath } from '@server/lib/video-paths'
+import { UserModel } from '@server/models/user/user'
import { MUser, MUserId, MVideoFullLight, MVideoUUID, MVideoWithFile } from '@server/types/models'
import {
HLSTranscodingPayload,
mergeAudioVideofile,
optimizeOriginalVideofile,
transcodeNewWebTorrentResolution
-} from '../../video-transcoding'
+} from '../../transcoding/video-transcoding'
import { JobQueue } from '../job-queue'
-import { UserModel } from '@server/models/account/user'
type HandlerFunction = (job: Bull.Job, payload: VideoTranscodingPayload, video: MVideoFullLight, user: MUser) => Promise<any>
copyCodecs: transcodeType !== 'quick-transcode',
isMaxQuality: true
})
- await createHlsJobIfEnabled(user, originalFileHLSPayload)
+ const hasHls = await createHlsJobIfEnabled(user, originalFileHLSPayload)
const hasNewResolutions = await createLowerResolutionsJobs(videoDatabase, user, videoFileResolution, isPortraitMode, 'webtorrent')
- if (!hasNewResolutions) {
+ if (!hasHls && !hasNewResolutions) {
// No transcoding to do, it's now published
videoPublished = await videoDatabase.publishIfNeededAndSave(t)
}
copyCodecs: boolean
isMaxQuality: boolean
}) {
- if (!payload || CONFIG.TRANSCODING.HLS.ENABLED !== true) return
+ if (!payload || CONFIG.TRANSCODING.HLS.ENABLED !== true) return false
const jobOptions = {
- priority: JOB_PRIORITY.TRANSCODING.NEW_RESOLUTION + await getJobTranscodingPriorityMalus(user)
+ priority: await getTranscodingJobPriority(user)
}
const hlsTranscodingPayload: HLSTranscodingPayload = {
isMaxQuality: payload.isMaxQuality
}
- return JobQueue.Instance.createJobWithPromise({ type: 'video-transcoding', payload: hlsTranscodingPayload }, jobOptions)
+ JobQueue.Instance.createJob({ type: 'video-transcoding', payload: hlsTranscodingPayload }, jobOptions)
+
+ return true
}
async function createLowerResolutionsJobs (
) {
// Create transcoding jobs if there are enabled resolutions
const resolutionsEnabled = computeResolutionsToTranscode(videoFileResolution, 'vod')
- logger.info(
- 'Resolutions computed for video %s and origin file resolution of %d.', video.uuid, videoFileResolution,
- { resolutions: resolutionsEnabled }
- )
-
- if (resolutionsEnabled.length === 0) {
- logger.info('No transcoding jobs created for video %s (no resolutions).', video.uuid)
-
- return false
- }
+ const resolutionCreated: number[] = []
for (const resolution of resolutionsEnabled) {
let dataInput: VideoTranscodingPayload
}
}
+ if (!dataInput) continue
+
+ resolutionCreated.push(resolution)
+
const jobOptions = {
- priority: JOB_PRIORITY.TRANSCODING.NEW_RESOLUTION + await getJobTranscodingPriorityMalus(user)
+ priority: await getTranscodingJobPriority(user)
}
JobQueue.Instance.createJob({ type: 'video-transcoding', payload: dataInput }, jobOptions)
}
- logger.info('Transcoding jobs created for uuid %s.', video.uuid, { resolutionsEnabled })
+ if (resolutionCreated.length === 0) {
+ logger.info('No transcoding jobs created for video %s (no resolutions).', video.uuid)
+
+ return false
+ }
+
+ logger.info(
+ 'New resolutions %s transcoding jobs created for video %s and origin file resolution of %d.', type, video.uuid, videoFileResolution,
+ { resolutionCreated }
+ )
return true
}