X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Fjob-queue%2Fhandlers%2Fvideo-transcoding.ts;h=8d659daa6f1ce60d754072564c6e2c3e506158d0;hb=7d9ba5c08999c6482f0bc5e0c09c6f55b7724090;hp=0f6b3f753071d63cae69dbfa3efc6b344935ae12;hpb=24516aa26a6753517b379cf7b5104c1a24eccad6;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/lib/job-queue/handlers/video-transcoding.ts b/server/lib/job-queue/handlers/video-transcoding.ts index 0f6b3f753..8d659daa6 100644 --- a/server/lib/job-queue/handlers/video-transcoding.ts +++ b/server/lib/job-queue/handlers/video-transcoding.ts @@ -1,8 +1,9 @@ import * as Bull from 'bull' import { TranscodeOptionsType } from '@server/helpers/ffmpeg-utils' -import { publishAndFederateIfNeeded } from '@server/lib/video' +import { getTranscodingJobPriority, publishAndFederateIfNeeded } from '@server/lib/video' import { getVideoFilePath } from '@server/lib/video-paths' -import { MVideoFullLight, MVideoUUID, MVideoWithFile } from '@server/types/models' +import { UserModel } from '@server/models/user/user' +import { MUser, MUserId, MVideoFullLight, MVideoUUID, MVideoWithFile } from '@server/types/models' import { HLSTranscodingPayload, MergeAudioTranscodingPayload, @@ -23,10 +24,12 @@ import { mergeAudioVideofile, optimizeOriginalVideofile, transcodeNewWebTorrentResolution -} from '../../video-transcoding' +} from '../../transcoding/video-transcoding' import { JobQueue } from '../job-queue' -const handlers: { [ id: string ]: (job: Bull.Job, payload: VideoTranscodingPayload, video: MVideoFullLight) => Promise } = { +type HandlerFunction = (job: Bull.Job, payload: VideoTranscodingPayload, video: MVideoFullLight, user: MUser) => Promise + +const handlers: { [ id: string ]: HandlerFunction } = { // Deprecated, introduced in 3.1 'hls': handleHLSJob, 'new-resolution-to-hls': handleHLSJob, @@ -55,13 +58,15 @@ async function processVideoTranscoding (job: Bull.Job) { return undefined } + const user = await UserModel.loadByChannelActorId(video.VideoChannel.actorId) + const handler = handlers[payload.type] if (!handler) { throw new Error('Cannot find transcoding handler for ' + payload.type) } - await handler(job, payload, video) + await handler(job, payload, video, user) return video } @@ -70,7 +75,7 @@ async function processVideoTranscoding (job: Bull.Job) { // 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() @@ -87,40 +92,49 @@ async function handleHLSJob (job: Bull.Job, payload: HLSTranscodingPayload, vide job }) - await retryTransactionWrapper(onHlsPlaylistGeneration, video) + await retryTransactionWrapper(onHlsPlaylistGeneration, video, user, payload) } -async function handleNewWebTorrentResolutionJob (job: Bull.Job, payload: NewResolutionTranscodingPayload, video: MVideoFullLight) { +async function handleNewWebTorrentResolutionJob ( + job: Bull.Job, + payload: NewResolutionTranscodingPayload, + video: MVideoFullLight, + user: MUserId +) { await transcodeNewWebTorrentResolution(video, payload.resolution, payload.isPortraitMode || false, job) - await retryTransactionWrapper(onNewWebTorrentFileResolution, video, payload) + await retryTransactionWrapper(onNewWebTorrentFileResolution, video, user, payload) } -async function handleWebTorrentMergeAudioJob (job: Bull.Job, payload: MergeAudioTranscodingPayload, video: MVideoFullLight) { +async function handleWebTorrentMergeAudioJob (job: Bull.Job, payload: MergeAudioTranscodingPayload, video: MVideoFullLight, user: MUserId) { await mergeAudioVideofile(video, payload.resolution, job) - await retryTransactionWrapper(onNewWebTorrentFileResolution, video, payload) + await retryTransactionWrapper(onVideoFileOptimizer, video, payload, 'video', user) } -async function handleWebTorrentOptimizeJob (job: Bull.Job, payload: OptimizeTranscodingPayload, video: MVideoFullLight) { +async function handleWebTorrentOptimizeJob (job: Bull.Job, payload: OptimizeTranscodingPayload, video: MVideoFullLight, user: MUserId) { const transcodeType = await optimizeOriginalVideofile(video, video.getMaxQualityFile(), job) - await retryTransactionWrapper(onVideoFileOptimizer, video, payload, transcodeType) + await retryTransactionWrapper(onVideoFileOptimizer, video, payload, transcodeType, user) } // --------------------------------------------------------------------------- -async function onHlsPlaylistGeneration (video: MVideoFullLight) { +async function onHlsPlaylistGeneration (video: MVideoFullLight, user: MUser, payload: HLSTranscodingPayload) { if (video === undefined) return undefined - // We generated the HLS playlist, we don't need the webtorrent files anymore if the admin disabled it - if (CONFIG.TRANSCODING.WEBTORRENT.ENABLED === false) { + 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 file.removeTorrent() await file.destroy() } video.VideoFiles = [] + + // Create HLS new resolution jobs + await createLowerResolutionsJobs(video, user, payload.resolution, payload.isPortraitMode, 'hls') } return publishAndFederateIfNeeded(video) @@ -128,8 +142,9 @@ async function onHlsPlaylistGeneration (video: MVideoFullLight) { async function onVideoFileOptimizer ( videoArg: MVideoWithFile, - payload: OptimizeTranscodingPayload, - transcodeType: TranscodeOptionsType + payload: OptimizeTranscodingPayload | MergeAudioTranscodingPayload, + transcodeType: TranscodeOptionsType, + user: MUserId ) { if (videoArg === undefined) return undefined @@ -142,13 +157,6 @@ async function onVideoFileOptimizer ( // Video does not exist anymore if (!videoDatabase) return undefined - // 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.', videoDatabase.uuid, videoFileResolution, - { resolutions: resolutionsEnabled } - ) - let videoPublished = false // Generate HLS version of the original file @@ -156,13 +164,14 @@ async function onVideoFileOptimizer ( 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 }) - createHlsJobIfEnabled(originalFileHLSPayload) + const hasHls = await createHlsJobIfEnabled(user, originalFileHLSPayload) - const hasNewResolutions = createLowerResolutionsJobs(videoDatabase, videoFileResolution, isPortraitMode) + 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) } @@ -178,11 +187,12 @@ async function onVideoFileOptimizer ( async function onNewWebTorrentFileResolution ( video: MVideoUUID, - payload?: NewResolutionTranscodingPayload | MergeAudioTranscodingPayload + user: MUserId, + payload: NewResolutionTranscodingPayload | MergeAudioTranscodingPayload ) { await publishAndFederateIfNeeded(video) - createHlsJobIfEnabled(Object.assign({}, payload, { copyCodecs: true })) + await createHlsJobIfEnabled(user, Object.assign({}, payload, { copyCodecs: true, isMaxQuality: false })) } // --------------------------------------------------------------------------- @@ -194,39 +204,48 @@ export { // --------------------------------------------------------------------------- -function createHlsJobIfEnabled (payload: { videoUUID: string, resolution: number, isPortraitMode?: boolean, copyCodecs: boolean }) { - // Generate HLS playlist? - if (payload && CONFIG.TRANSCODING.HLS.ENABLED) { - const hlsTranscodingPayload: HLSTranscodingPayload = { - type: 'new-resolution-to-hls', - videoUUID: payload.videoUUID, - resolution: payload.resolution, - isPortraitMode: payload.isPortraitMode, - copyCodecs: payload.copyCodecs - } +async function createHlsJobIfEnabled (user: MUserId, payload: { + videoUUID: string + resolution: number + isPortraitMode?: boolean + copyCodecs: boolean + isMaxQuality: boolean +}) { + if (!payload || CONFIG.TRANSCODING.HLS.ENABLED !== true) return false + + const jobOptions = { + priority: await getTranscodingJobPriority(user) + } - return JobQueue.Instance.createJob({ type: 'video-transcoding', payload: hlsTranscodingPayload }) + const hlsTranscodingPayload: HLSTranscodingPayload = { + type: 'new-resolution-to-hls', + videoUUID: payload.videoUUID, + resolution: payload.resolution, + isPortraitMode: payload.isPortraitMode, + copyCodecs: payload.copyCodecs, + isMaxQuality: payload.isMaxQuality } + + JobQueue.Instance.createJob({ type: 'video-transcoding', payload: hlsTranscodingPayload }, jobOptions) + + return true } -function createLowerResolutionsJobs (video: MVideoFullLight, videoFileResolution: number, isPortraitMode: boolean) { +async function createLowerResolutionsJobs ( + video: MVideoFullLight, + user: MUserId, + videoFileResolution: number, + isPortraitMode: boolean, + type: 'hls' | 'webtorrent' +) { // 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 (CONFIG.TRANSCODING.WEBTORRENT.ENABLED) { + if (CONFIG.TRANSCODING.WEBTORRENT.ENABLED && type === 'webtorrent') { // WebTorrent will create subsequent HLS job dataInput = { type: 'new-resolution-to-webtorrent', @@ -234,20 +253,40 @@ function createLowerResolutionsJobs (video: MVideoFullLight, videoFileResolution 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 } } - JobQueue.Instance.createJob({ type: 'video-transcoding', payload: dataInput }) + if (!dataInput) continue + + resolutionCreated.push(resolution) + + const jobOptions = { + priority: await getTranscodingJobPriority(user) + } + + JobQueue.Instance.createJob({ type: 'video-transcoding', payload: dataInput }, jobOptions) + } + + if (resolutionCreated.length === 0) { + logger.info('No transcoding jobs created for video %s (no resolutions).', video.uuid) + + return false } - logger.info('Transcoding jobs created for uuid %s.', video.uuid, { resolutionsEnabled }) + logger.info( + 'New resolutions %s transcoding jobs created for video %s and origin file resolution of %d.', type, video.uuid, videoFileResolution, + { resolutionCreated } + ) return true }