-import { Job } from 'bull'
-import { TranscodeOptionsType } from '@server/helpers/ffmpeg-utils'
-import { addTranscodingJob, getTranscodingJobPriority } from '@server/lib/video'
+import { Job } from 'bullmq'
+import { TranscodeVODOptionsType } from '@server/helpers/ffmpeg'
+import { Hooks } from '@server/lib/plugins/hooks'
+import { buildTranscodingJob, getTranscodingJobPriority } from '@server/lib/video'
import { VideoPathManager } from '@server/lib/video-path-manager'
import { moveToFailedTranscodingState, moveToNextState } from '@server/lib/video-state'
import { UserModel } from '@server/models/user/user'
MergeAudioTranscodingPayload,
NewWebTorrentResolutionTranscodingPayload,
OptimizeTranscodingPayload,
- VideoResolution,
VideoTranscodingPayload
} from '@shared/models'
import { retryTransactionWrapper } from '../../../helpers/database-utils'
-import { computeLowerResolutionsToTranscode } from '../../../helpers/ffprobe-utils'
+import { computeResolutionsToTranscode } from '../../../helpers/ffmpeg'
import { logger, loggerTagsFactory } from '../../../helpers/logger'
import { CONFIG } from '../../../initializers/config'
import { VideoModel } from '../../../models/video/video'
mergeAudioVideofile,
optimizeOriginalVideofile,
transcodeNewWebTorrentResolution
-} from '../../transcoding/video-transcoding'
+} from '../../transcoding/transcoding'
+import { JobQueue } from '../job-queue'
type HandlerFunction = (job: Job, payload: VideoTranscodingPayload, video: MVideoFullLight, user: MUser) => Promise<void>
async function processVideoTranscoding (job: Job) {
const payload = job.data as VideoTranscodingPayload
- logger.info('Processing transcoding job %d.', job.id, lTags(payload.videoUUID))
+ logger.info('Processing transcoding job %s.', job.id, lTags(payload.videoUUID))
- const video = await VideoModel.loadAndPopulateAccountAndServerAndTags(payload.videoUUID)
+ const video = await VideoModel.loadFull(payload.videoUUID)
// No video, maybe deleted?
if (!video) {
logger.info('Do not process job %d, video does not exist.', job.id, lTags(payload.videoUUID))
const videoOrStreamingPlaylist = videoFileInput.getVideoOrStreamingPlaylist()
- await VideoPathManager.Instance.makeAvailableVideoFile(videoFileInput.withVideoOrPlaylist(videoOrStreamingPlaylist), videoInputPath => {
- return generateHlsPlaylistResolution({
- video,
- videoInputPath,
- resolution: payload.resolution,
- copyCodecs: payload.copyCodecs,
- isPortraitMode: payload.isPortraitMode || false,
- job
+ const inputFileMutexReleaser = await VideoPathManager.Instance.lockFiles(video.uuid)
+
+ try {
+ await videoFileInput.getVideo().reload()
+
+ await VideoPathManager.Instance.makeAvailableVideoFile(videoFileInput.withVideoOrPlaylist(videoOrStreamingPlaylist), videoInputPath => {
+ return generateHlsPlaylistResolution({
+ video,
+ videoInputPath,
+ inputFileMutexReleaser,
+ resolution: payload.resolution,
+ copyCodecs: payload.copyCodecs,
+ job
+ })
})
- })
+ } finally {
+ inputFileMutexReleaser()
+ }
logger.info('HLS transcoding job for %s ended.', video.uuid, lTags(video.uuid))
) {
logger.info('Handling WebTorrent transcoding job for %s.', video.uuid, lTags(video.uuid))
- await transcodeNewWebTorrentResolution(video, payload.resolution, payload.isPortraitMode || false, job)
+ await transcodeNewWebTorrentResolution({ video, resolution: payload.resolution, job })
logger.info('WebTorrent transcoding job for %s ended.', video.uuid, lTags(video.uuid))
async function handleWebTorrentMergeAudioJob (job: Job, payload: MergeAudioTranscodingPayload, video: MVideoFullLight, user: MUserId) {
logger.info('Handling merge audio transcoding job for %s.', video.uuid, lTags(video.uuid))
- await mergeAudioVideofile(video, payload.resolution, job)
+ await mergeAudioVideofile({ video, resolution: payload.resolution, job })
logger.info('Merge audio transcoding job for %s ended.', video.uuid, lTags(video.uuid))
async function handleWebTorrentOptimizeJob (job: Job, payload: OptimizeTranscodingPayload, video: MVideoFullLight, user: MUserId) {
logger.info('Handling optimize transcoding job for %s.', video.uuid, lTags(video.uuid))
- const { transcodeType } = await optimizeOriginalVideofile(video, video.getMaxQualityFile(), job)
+ const { transcodeType } = await optimizeOriginalVideofile({ video, inputVideoFile: video.getMaxQualityFile(), job })
logger.info('Optimize transcoding job for %s ended.', video.uuid, lTags(video.uuid))
if (payload.isMaxQuality && payload.autoDeleteWebTorrentIfNeeded && CONFIG.TRANSCODING.WEBTORRENT.ENABLED === false) {
// Remove webtorrent files if not enabled
for (const file of video.VideoFiles) {
- await video.removeWebTorrentFileAndTorrent(file)
+ await video.removeWebTorrentFile(file)
await file.destroy()
}
video,
user,
videoFileResolution: payload.resolution,
- isPortraitMode: payload.isPortraitMode,
hasAudio: payload.hasAudio,
isNewVideo: payload.isNewVideo ?? true,
type: 'hls'
}
await VideoJobInfoModel.decrease(video.uuid, 'pendingTranscode')
- await retryTransactionWrapper(moveToNextState, video, payload.isNewVideo)
+ await retryTransactionWrapper(moveToNextState, { video, isNewVideo: payload.isNewVideo })
}
async function onVideoFirstWebTorrentTranscoding (
videoArg: MVideoWithFile,
payload: OptimizeTranscodingPayload | MergeAudioTranscodingPayload,
- transcodeType: TranscodeOptionsType,
+ transcodeType: TranscodeVODOptionsType,
user: MUserId
) {
- const { resolution, isPortraitMode, audioStream } = await videoArg.getMaxQualityFileInfo()
-
- // Maybe the video changed in database, refresh it
- const videoDatabase = await VideoModel.loadAndPopulateAccountAndServerAndTags(videoArg.uuid)
- // Video does not exist anymore
- if (!videoDatabase) return undefined
-
- // Generate HLS version of the original file
- const originalFileHLSPayload = {
- ...payload,
-
- isPortraitMode,
- hasAudio: !!audioStream,
- resolution: videoDatabase.getMaxQualityFile().resolution,
- // If we quick transcoded original file, force transcoding for HLS to avoid some weird playback issues
- copyCodecs: transcodeType !== 'quick-transcode',
- isMaxQuality: true
- }
- const hasHls = await createHlsJobIfEnabled(user, originalFileHLSPayload)
- const hasNewResolutions = await createLowerResolutionsJobs({
- video: videoDatabase,
- user,
- videoFileResolution: resolution,
- hasAudio: !!audioStream,
- isPortraitMode,
- type: 'webtorrent',
- isNewVideo: payload.isNewVideo ?? true
- })
-
- await VideoJobInfoModel.decrease(videoDatabase.uuid, 'pendingTranscode')
-
- // Move to next state if there are no other resolutions to generate
- if (!hasHls && !hasNewResolutions) {
- await retryTransactionWrapper(moveToNextState, videoDatabase, payload.isNewVideo)
+ const mutexReleaser = await VideoPathManager.Instance.lockFiles(videoArg.uuid)
+
+ try {
+ // Maybe the video changed in database, refresh it
+ const videoDatabase = await VideoModel.loadFull(videoArg.uuid)
+ // Video does not exist anymore
+ if (!videoDatabase) return undefined
+
+ const { resolution, audioStream } = await videoDatabase.probeMaxQualityFile()
+
+ // Generate HLS version of the original file
+ const originalFileHLSPayload = {
+ ...payload,
+
+ hasAudio: !!audioStream,
+ resolution: videoDatabase.getMaxQualityFile().resolution,
+ // If we quick transcoded original file, force transcoding for HLS to avoid some weird playback issues
+ copyCodecs: transcodeType !== 'quick-transcode',
+ isMaxQuality: true
+ }
+ const hasHls = await createHlsJobIfEnabled(user, originalFileHLSPayload)
+ const hasNewResolutions = await createLowerResolutionsJobs({
+ video: videoDatabase,
+ user,
+ videoFileResolution: resolution,
+ hasAudio: !!audioStream,
+ type: 'webtorrent',
+ isNewVideo: payload.isNewVideo ?? true
+ })
+
+ await VideoJobInfoModel.decrease(videoDatabase.uuid, 'pendingTranscode')
+
+ // Move to next state if there are no other resolutions to generate
+ if (!hasHls && !hasNewResolutions) {
+ await retryTransactionWrapper(moveToNextState, { video: videoDatabase, isNewVideo: payload.isNewVideo })
+ }
+ } finally {
+ mutexReleaser()
}
}
await VideoJobInfoModel.decrease(video.uuid, 'pendingTranscode')
- await retryTransactionWrapper(moveToNextState, video, payload.isNewVideo)
+ await retryTransactionWrapper(moveToNextState, { video, isNewVideo: payload.isNewVideo })
}
// ---------------------------------------------------------------------------
videoUUID: string
resolution: number
hasAudio: boolean
- isPortraitMode?: boolean
copyCodecs: boolean
isMaxQuality: boolean
isNewVideo?: boolean
type: 'new-resolution-to-hls',
autoDeleteWebTorrentIfNeeded: true,
- ...pick(payload, [ 'videoUUID', 'resolution', 'isPortraitMode', 'copyCodecs', 'isMaxQuality', 'isNewVideo', 'hasAudio' ])
+ ...pick(payload, [ 'videoUUID', 'resolution', 'copyCodecs', 'isMaxQuality', 'isNewVideo', 'hasAudio' ])
}
- await addTranscodingJob(hlsTranscodingPayload, jobOptions)
+ await JobQueue.Instance.createJob(await buildTranscodingJob(hlsTranscodingPayload, jobOptions))
return true
}
video: MVideoFullLight
user: MUserId
videoFileResolution: number
- isPortraitMode: boolean
hasAudio: boolean
isNewVideo: boolean
type: 'hls' | 'webtorrent'
}) {
- const { video, user, videoFileResolution, isPortraitMode, isNewVideo, hasAudio, type } = options
+ const { video, user, videoFileResolution, isNewVideo, hasAudio, type } = options
// Create transcoding jobs if there are enabled resolutions
- const resolutionsEnabled = computeLowerResolutionsToTranscode(videoFileResolution, 'vod')
+ const resolutionsEnabled = await Hooks.wrapObject(
+ computeResolutionsToTranscode({ input: videoFileResolution, type: 'vod', includeInput: false, strictLower: true, hasAudio }),
+ 'filter:transcoding.auto.resolutions-to-transcode.result',
+ options
+ )
+
const resolutionCreated: string[] = []
for (const resolution of resolutionsEnabled) {
- if (resolution === VideoResolution.H_NOVIDEO && hasAudio === false) continue
-
let dataInput: VideoTranscodingPayload
if (CONFIG.TRANSCODING.WEBTORRENT.ENABLED && type === 'webtorrent') {
type: 'new-resolution-to-webtorrent',
videoUUID: video.uuid,
resolution,
- isPortraitMode,
hasAudio,
createHLSIfNeeded: true,
isNewVideo
type: 'new-resolution-to-hls',
videoUUID: video.uuid,
resolution,
- isPortraitMode,
hasAudio,
copyCodecs: false,
isMaxQuality: false,
priority: await getTranscodingJobPriority(user)
}
- await addTranscodingJob(dataInput, jobOptions)
+ await JobQueue.Instance.createJob(await buildTranscodingJob(dataInput, jobOptions))
}
if (resolutionCreated.length === 0) {
projects / github / Chocobozzz / PeerTube.git / blobdiff