// Job handlers
// ---------------------------------------------------------------------------
-async function handleHLSJob (job: Bull.Job, payload: HLSTranscodingPayload, video: MVideoFullLight) {
+async function handleHLSJob (job: Bull.Job, payload: HLSTranscodingPayload, video: MVideoFullLight, user: MUser) {
const videoFileInput = payload.copyCodecs
? video.getWebTorrentFile(payload.resolution)
: video.getMaxQualityFile()
job
})
- await retryTransactionWrapper(onHlsPlaylistGeneration, video, payload.resolution)
+ await retryTransactionWrapper(onHlsPlaylistGeneration, video, user, payload)
}
async function handleNewWebTorrentResolutionJob (
async function handleWebTorrentMergeAudioJob (job: Bull.Job, payload: MergeAudioTranscodingPayload, video: MVideoFullLight, user: MUserId) {
await mergeAudioVideofile(video, payload.resolution, job)
- await retryTransactionWrapper(onNewWebTorrentFileResolution, video, user, payload)
+ await retryTransactionWrapper(onVideoFileOptimizer, video, payload, 'video', user)
}
async function handleWebTorrentOptimizeJob (job: Bull.Job, payload: OptimizeTranscodingPayload, video: MVideoFullLight, user: MUserId) {
// ---------------------------------------------------------------------------
-async function onHlsPlaylistGeneration (video: MVideoFullLight, resolution: number) {
+async function onHlsPlaylistGeneration (video: MVideoFullLight, user: MUser, payload: HLSTranscodingPayload) {
if (video === undefined) return undefined
- const maxQualityFile = video.getMaxQualityFile()
-
- // We generated the max quality HLS playlist, we don't need the webtorrent files anymore if the admin disabled it
- if (CONFIG.TRANSCODING.WEBTORRENT.ENABLED === false && video.hasWebTorrentFiles() && maxQualityFile.resolution === resolution) {
+ if (payload.isMaxQuality && CONFIG.TRANSCODING.WEBTORRENT.ENABLED === false) {
+ // Remove webtorrent files if not enabled
for (const file of video.VideoFiles) {
await video.removeFile(file)
+ await video.removeTorrent(file)
await file.destroy()
}
video.VideoFiles = []
+
+ // Create HLS new resolution jobs
+ await createLowerResolutionsJobs(video, user, payload.resolution, payload.isPortraitMode, 'hls')
}
return publishAndFederateIfNeeded(video)
async function onVideoFileOptimizer (
videoArg: MVideoWithFile,
- payload: OptimizeTranscodingPayload,
+ payload: OptimizeTranscodingPayload | MergeAudioTranscodingPayload,
transcodeType: TranscodeOptionsType,
user: MUserId
) {
isPortraitMode,
resolution: videoDatabase.getMaxQualityFile().resolution,
// If we quick transcoded original file, force transcoding for HLS to avoid some weird playback issues
- copyCodecs: transcodeType !== 'quick-transcode'
+ copyCodecs: transcodeType !== 'quick-transcode',
+ isMaxQuality: true
})
await createHlsJobIfEnabled(user, originalFileHLSPayload)
- const hasNewResolutions = createLowerResolutionsJobs(videoDatabase, user, videoFileResolution, isPortraitMode)
+ const hasNewResolutions = await createLowerResolutionsJobs(videoDatabase, user, videoFileResolution, isPortraitMode, 'webtorrent')
if (!hasNewResolutions) {
// No transcoding to do, it's now published
async function onNewWebTorrentFileResolution (
video: MVideoUUID,
user: MUserId,
- payload?: NewResolutionTranscodingPayload | MergeAudioTranscodingPayload
+ payload: NewResolutionTranscodingPayload | MergeAudioTranscodingPayload
) {
await publishAndFederateIfNeeded(video)
- await createHlsJobIfEnabled(user, Object.assign({}, payload, { copyCodecs: true }))
+ await createHlsJobIfEnabled(user, Object.assign({}, payload, { copyCodecs: true, isMaxQuality: false }))
}
// ---------------------------------------------------------------------------
resolution: number
isPortraitMode?: boolean
copyCodecs: boolean
+ isMaxQuality: boolean
}) {
if (!payload || CONFIG.TRANSCODING.HLS.ENABLED !== true) return
videoUUID: payload.videoUUID,
resolution: payload.resolution,
isPortraitMode: payload.isPortraitMode,
- copyCodecs: payload.copyCodecs
+ copyCodecs: payload.copyCodecs,
+ isMaxQuality: payload.isMaxQuality
}
return JobQueue.Instance.createJobWithPromise({ type: 'video-transcoding', payload: hlsTranscodingPayload }, jobOptions)
video: MVideoFullLight,
user: MUserId,
videoFileResolution: number,
- isPortraitMode: boolean
+ isPortraitMode: boolean,
+ type: 'hls' | 'webtorrent'
) {
// Create transcoding jobs if there are enabled resolutions
const resolutionsEnabled = computeResolutionsToTranscode(videoFileResolution, 'vod')
for (const resolution of resolutionsEnabled) {
let dataInput: VideoTranscodingPayload
- if (CONFIG.TRANSCODING.WEBTORRENT.ENABLED) {
+ if (CONFIG.TRANSCODING.WEBTORRENT.ENABLED && type === 'webtorrent') {
// WebTorrent will create subsequent HLS job
dataInput = {
type: 'new-resolution-to-webtorrent',
resolution,
isPortraitMode
}
- } else if (CONFIG.TRANSCODING.HLS.ENABLED) {
+ }
+
+ if (CONFIG.TRANSCODING.HLS.ENABLED && type === 'hls') {
dataInput = {
type: 'new-resolution-to-hls',
videoUUID: video.uuid,
resolution,
isPortraitMode,
- copyCodecs: false
+ copyCodecs: false,
+ isMaxQuality: false
}
}