-import * as Bull from 'bull'
+import { Job } from 'bull'
import { TranscodeOptionsType } from '@server/helpers/ffmpeg-utils'
import { addTranscodingJob, getTranscodingJobPriority } from '@server/lib/video'
import { VideoPathManager } from '@server/lib/video-path-manager'
-import { moveToNextState } from '@server/lib/video-state'
+import { moveToFailedTranscodingState, moveToNextState } from '@server/lib/video-state'
import { UserModel } from '@server/models/user/user'
import { VideoJobInfoModel } from '@server/models/video/video-job-info'
import { MUser, MUserId, MVideo, MVideoFullLight, MVideoWithFile } from '@server/types/models'
+import { pick } from '@shared/core-utils'
import {
HLSTranscodingPayload,
MergeAudioTranscodingPayload,
NewResolutionTranscodingPayload,
OptimizeTranscodingPayload,
+ VideoResolution,
VideoTranscodingPayload
-} from '../../../../shared'
+} from '@shared/models'
import { retryTransactionWrapper } from '../../../helpers/database-utils'
-import { computeResolutionsToTranscode } from '../../../helpers/ffprobe-utils'
-import { logger } from '../../../helpers/logger'
+import { computeLowerResolutionsToTranscode } from '../../../helpers/ffprobe-utils'
+import { logger, loggerTagsFactory } from '../../../helpers/logger'
import { CONFIG } from '../../../initializers/config'
import { VideoModel } from '../../../models/video/video'
import {
transcodeNewWebTorrentResolution
} from '../../transcoding/video-transcoding'
-type HandlerFunction = (job: Bull.Job, payload: VideoTranscodingPayload, video: MVideoFullLight, user: MUser) => Promise<void>
+type HandlerFunction = (job: Job, payload: VideoTranscodingPayload, video: MVideoFullLight, user: MUser) => Promise<void>
const handlers: { [ id in VideoTranscodingPayload['type'] ]: HandlerFunction } = {
'new-resolution-to-hls': handleHLSJob,
'optimize-to-webtorrent': handleWebTorrentOptimizeJob
}
-async function processVideoTranscoding (job: Bull.Job) {
+const lTags = loggerTagsFactory('transcoding')
+
+async function processVideoTranscoding (job: Job) {
const payload = job.data as VideoTranscodingPayload
- logger.info('Processing video file in job %d.', job.id)
+ logger.info('Processing transcoding job %d.', job.id, lTags(payload.videoUUID))
const video = await VideoModel.loadAndPopulateAccountAndServerAndTags(payload.videoUUID)
// No video, maybe deleted?
if (!video) {
- logger.info('Do not process job %d, video does not exist.', job.id)
+ logger.info('Do not process job %d, video does not exist.', job.id, lTags(payload.videoUUID))
return undefined
}
const handler = handlers[payload.type]
if (!handler) {
+ await moveToFailedTranscodingState(video)
+ await VideoJobInfoModel.decrease(video.uuid, 'pendingTranscode')
+
throw new Error('Cannot find transcoding handler for ' + payload.type)
}
- await handler(job, payload, video, user)
+ try {
+ await handler(job, payload, video, user)
+ } catch (error) {
+ await moveToFailedTranscodingState(video)
+
+ await VideoJobInfoModel.decrease(video.uuid, 'pendingTranscode')
+
+ throw error
+ }
return video
}
+// ---------------------------------------------------------------------------
+
+export {
+ processVideoTranscoding
+}
+
// ---------------------------------------------------------------------------
// Job handlers
// ---------------------------------------------------------------------------
-async function handleHLSJob (job: Bull.Job, payload: HLSTranscodingPayload, video: MVideoFullLight, user: MUser) {
+async function handleHLSJob (job: Job, payload: HLSTranscodingPayload, video: MVideoFullLight, user: MUser) {
+ logger.info('Handling HLS transcoding job for %s.', video.uuid, lTags(video.uuid))
+
const videoFileInput = payload.copyCodecs
? video.getWebTorrentFile(payload.resolution)
: video.getMaxQualityFile()
const videoOrStreamingPlaylist = videoFileInput.getVideoOrStreamingPlaylist()
- await VideoPathManager.Instance.makeAvailableVideoFile(videoOrStreamingPlaylist, videoFileInput, videoInputPath => {
+ await VideoPathManager.Instance.makeAvailableVideoFile(videoFileInput.withVideoOrPlaylist(videoOrStreamingPlaylist), videoInputPath => {
return generateHlsPlaylistResolution({
video,
videoInputPath,
})
})
- await retryTransactionWrapper(onHlsPlaylistGeneration, video, user, payload)
+ logger.info('HLS transcoding job for %s ended.', video.uuid, lTags(video.uuid))
+
+ await onHlsPlaylistGeneration(video, user, payload)
}
async function handleNewWebTorrentResolutionJob (
- job: Bull.Job,
+ job: Job,
payload: NewResolutionTranscodingPayload,
video: MVideoFullLight,
user: MUserId
) {
+ logger.info('Handling WebTorrent transcoding job for %s.', video.uuid, lTags(video.uuid))
+
await transcodeNewWebTorrentResolution(video, payload.resolution, payload.isPortraitMode || false, job)
- await retryTransactionWrapper(onNewWebTorrentFileResolution, video, user, payload)
+ logger.info('WebTorrent transcoding job for %s ended.', video.uuid, lTags(video.uuid))
+
+ await onNewWebTorrentFileResolution(video, user, payload)
}
-async function handleWebTorrentMergeAudioJob (job: Bull.Job, payload: MergeAudioTranscodingPayload, video: MVideoFullLight, user: MUserId) {
+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 retryTransactionWrapper(onVideoFileOptimizer, video, payload, 'video', user)
+ logger.info('Merge audio transcoding job for %s ended.', video.uuid, lTags(video.uuid))
+
+ await onVideoFirstWebTorrentTranscoding(video, payload, 'video', user)
}
-async function handleWebTorrentOptimizeJob (job: Bull.Job, payload: OptimizeTranscodingPayload, video: MVideoFullLight, user: MUserId) {
+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)
- await retryTransactionWrapper(onVideoFileOptimizer, video, payload, transcodeType, user)
+ logger.info('Optimize transcoding job for %s ended.', video.uuid, lTags(video.uuid))
+
+ await onVideoFirstWebTorrentTranscoding(video, payload, transcodeType, user)
}
// ---------------------------------------------------------------------------
async function onHlsPlaylistGeneration (video: MVideoFullLight, user: MUser, payload: HLSTranscodingPayload) {
- if (video === undefined) return undefined
-
- if (payload.isMaxQuality && CONFIG.TRANSCODING.WEBTORRENT.ENABLED === false) {
+ if (payload.isMaxQuality && payload.autoDeleteWebTorrentIfNeeded && CONFIG.TRANSCODING.WEBTORRENT.ENABLED === false) {
// Remove webtorrent files if not enabled
for (const file of video.VideoFiles) {
- await video.removeFileAndTorrent(file)
+ await video.removeWebTorrentFileAndTorrent(file)
await file.destroy()
}
user,
videoFileResolution: payload.resolution,
isPortraitMode: payload.isPortraitMode,
+ hasAudio: payload.hasAudio,
isNewVideo: payload.isNewVideo ?? true,
type: 'hls'
})
}
await VideoJobInfoModel.decrease(video.uuid, 'pendingTranscode')
- await moveToNextState(video, payload.isNewVideo)
+ await retryTransactionWrapper(moveToNextState, video, payload.isNewVideo)
}
-async function onVideoFileOptimizer (
+async function onVideoFirstWebTorrentTranscoding (
videoArg: MVideoWithFile,
payload: OptimizeTranscodingPayload | MergeAudioTranscodingPayload,
transcodeType: TranscodeOptionsType,
user: MUserId
) {
- if (videoArg === undefined) return undefined
-
- // Outside the transaction (IO on disk)
- const { resolution, isPortraitMode } = await videoArg.getMaxQualityResolution()
+ const { resolution, isPortraitMode, audioStream } = await videoArg.getMaxQualityFileInfo()
// Maybe the video changed in database, refresh it
const videoDatabase = await VideoModel.loadAndPopulateAccountAndServerAndTags(videoArg.uuid)
...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',
video: videoDatabase,
user,
videoFileResolution: resolution,
+ hasAudio: !!audioStream,
isPortraitMode,
type: 'webtorrent',
isNewVideo: payload.isNewVideo ?? true
// Move to next state if there are no other resolutions to generate
if (!hasHls && !hasNewResolutions) {
- await moveToNextState(videoDatabase, payload.isNewVideo)
+ await retryTransactionWrapper(moveToNextState, videoDatabase, payload.isNewVideo)
}
}
user: MUserId,
payload: NewResolutionTranscodingPayload | MergeAudioTranscodingPayload
) {
- await createHlsJobIfEnabled(user, { ...payload, copyCodecs: true, isMaxQuality: false })
+ await createHlsJobIfEnabled(user, { hasAudio: true, copyCodecs: true, isMaxQuality: false, ...payload })
await VideoJobInfoModel.decrease(video.uuid, 'pendingTranscode')
- await moveToNextState(video, payload.isNewVideo)
+ await retryTransactionWrapper(moveToNextState, video, payload.isNewVideo)
}
+// ---------------------------------------------------------------------------
+
async function createHlsJobIfEnabled (user: MUserId, payload: {
videoUUID: string
resolution: number
+ hasAudio: boolean
isPortraitMode?: boolean
copyCodecs: boolean
isMaxQuality: boolean
const hlsTranscodingPayload: HLSTranscodingPayload = {
type: 'new-resolution-to-hls',
- videoUUID: payload.videoUUID,
- resolution: payload.resolution,
- isPortraitMode: payload.isPortraitMode,
- copyCodecs: payload.copyCodecs,
- isMaxQuality: payload.isMaxQuality,
- isNewVideo: payload.isNewVideo
+ autoDeleteWebTorrentIfNeeded: true,
+
+ ...pick(payload, [ 'videoUUID', 'resolution', 'isPortraitMode', 'copyCodecs', 'isMaxQuality', 'isNewVideo', 'hasAudio' ])
}
await addTranscodingJob(hlsTranscodingPayload, jobOptions)
return true
}
-// ---------------------------------------------------------------------------
-
-export {
- processVideoTranscoding,
- createHlsJobIfEnabled,
- onNewWebTorrentFileResolution
-}
-
-// ---------------------------------------------------------------------------
-
async function createLowerResolutionsJobs (options: {
video: MVideoFullLight
user: MUserId
videoFileResolution: number
isPortraitMode: boolean
+ hasAudio: boolean
isNewVideo: boolean
type: 'hls' | 'webtorrent'
}) {
- const { video, user, videoFileResolution, isPortraitMode, isNewVideo, type } = options
+ const { video, user, videoFileResolution, isPortraitMode, isNewVideo, hasAudio, type } = options
// Create transcoding jobs if there are enabled resolutions
- const resolutionsEnabled = computeResolutionsToTranscode(videoFileResolution, 'vod')
- const resolutionCreated: number[] = []
+ const resolutionsEnabled = computeLowerResolutionsToTranscode(videoFileResolution, 'vod')
+ 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') {
videoUUID: video.uuid,
resolution,
isPortraitMode,
+ hasAudio,
isNewVideo
}
+
+ resolutionCreated.push('webtorrent-' + resolution)
}
if (CONFIG.TRANSCODING.HLS.ENABLED && type === 'hls') {
videoUUID: video.uuid,
resolution,
isPortraitMode,
+ hasAudio,
copyCodecs: false,
isMaxQuality: false,
+ autoDeleteWebTorrentIfNeeded: true,
isNewVideo
}
+
+ resolutionCreated.push('hls-' + resolution)
}
if (!dataInput) continue
- resolutionCreated.push(resolution)
-
const jobOptions = {
priority: await getTranscodingJobPriority(user)
}
}
if (resolutionCreated.length === 0) {
- logger.info('No transcoding jobs created for video %s (no resolutions).', video.uuid)
+ logger.info('No transcoding jobs created for video %s (no resolutions).', video.uuid, lTags(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 }
+ { resolutionCreated, ...lTags(video.uuid) }
)
return true
projects / github / Chocobozzz / PeerTube.git / blobdiff