import { TranscodeOptionsType } from '@server/helpers/ffmpeg-utils'
import { addTranscodingJob, getTranscodingJobPriority } from '@server/lib/video'
import { VideoPathManager } from '@server/lib/video-path-manager'
-import { moveToFailedState, 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'
NewResolutionTranscodingPayload,
OptimizeTranscodingPayload,
VideoTranscodingPayload
-} from '../../../../shared'
+} from '@shared/models'
import { retryTransactionWrapper } from '../../../helpers/database-utils'
-import { computeResolutionsToTranscode } from '../../../helpers/ffprobe-utils'
+import { computeLowerResolutionsToTranscode } from '../../../helpers/ffprobe-utils'
import { logger, loggerTagsFactory } from '../../../helpers/logger'
import { CONFIG } from '../../../initializers/config'
import { VideoModel } from '../../../models/video/video'
const handler = handlers[payload.type]
if (!handler) {
- await moveToFailedState(video)
+ await moveToFailedTranscodingState(video)
+ await VideoJobInfoModel.decrease(video.uuid, 'pendingTranscode')
+
throw new Error('Cannot find transcoding handler for ' + payload.type)
}
try {
await handler(job, payload, video, user)
} catch (error) {
- await moveToFailedState(video)
+ await moveToFailedTranscodingState(video)
+
+ await VideoJobInfoModel.decrease(video.uuid, 'pendingTranscode')
throw error
}
return video
}
+// ---------------------------------------------------------------------------
+
+export {
+ processVideoTranscoding
+}
+
// ---------------------------------------------------------------------------
// Job handlers
// ---------------------------------------------------------------------------
const videoOrStreamingPlaylist = videoFileInput.getVideoOrStreamingPlaylist()
- await VideoPathManager.Instance.makeAvailableVideoFile(videoOrStreamingPlaylist, videoFileInput, videoInputPath => {
+ await VideoPathManager.Instance.makeAvailableVideoFile(videoFileInput.withVideoOrPlaylist(videoOrStreamingPlaylist), videoInputPath => {
return generateHlsPlaylistResolution({
video,
videoInputPath,
logger.info('HLS transcoding job for %s ended.', video.uuid, lTags(video.uuid))
- await retryTransactionWrapper(onHlsPlaylistGeneration, video, user, payload)
+ await onHlsPlaylistGeneration(video, user, payload)
}
async function handleNewWebTorrentResolutionJob (
logger.info('WebTorrent transcoding job for %s ended.', video.uuid, lTags(video.uuid))
- await retryTransactionWrapper(onNewWebTorrentFileResolution, video, user, payload)
+ await onNewWebTorrentFileResolution(video, user, payload)
}
async function handleWebTorrentMergeAudioJob (job: Job, payload: MergeAudioTranscodingPayload, video: MVideoFullLight, user: MUserId) {
logger.info('Merge audio transcoding job for %s ended.', video.uuid, lTags(video.uuid))
- await retryTransactionWrapper(onVideoFileOptimizer, video, payload, 'video', user)
+ await onVideoFirstWebTorrentTranscoding(video, payload, 'video', user)
}
async function handleWebTorrentOptimizeJob (job: Job, payload: OptimizeTranscodingPayload, video: MVideoFullLight, user: MUserId) {
logger.info('Optimize transcoding job for %s ended.', video.uuid, lTags(video.uuid))
- await retryTransactionWrapper(onVideoFileOptimizer, video, payload, transcodeType, user)
+ await onVideoFirstWebTorrentTranscoding(video, payload, transcodeType, user)
}
// ---------------------------------------------------------------------------
async function onHlsPlaylistGeneration (video: MVideoFullLight, user: MUser, payload: HLSTranscodingPayload) {
- 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()
}
}
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,
// 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)
}
}
await createHlsJobIfEnabled(user, { ...payload, copyCodecs: true, isMaxQuality: false })
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
isPortraitMode: payload.isPortraitMode,
copyCodecs: payload.copyCodecs,
isMaxQuality: payload.isMaxQuality,
+ autoDeleteWebTorrentIfNeeded: true,
isNewVideo: payload.isNewVideo
}
return true
}
-// ---------------------------------------------------------------------------
-
-export {
- processVideoTranscoding,
- createHlsJobIfEnabled,
- onNewWebTorrentFileResolution
-}
-
-// ---------------------------------------------------------------------------
-
async function createLowerResolutionsJobs (options: {
video: MVideoFullLight
user: MUserId
const { video, user, videoFileResolution, isPortraitMode, isNewVideo, type } = options
// Create transcoding jobs if there are enabled resolutions
- const resolutionsEnabled = computeResolutionsToTranscode(videoFileResolution, 'vod')
+ const resolutionsEnabled = computeLowerResolutionsToTranscode(videoFileResolution, 'vod')
const resolutionCreated: string[] = []
for (const resolution of resolutionsEnabled) {
isPortraitMode,
copyCodecs: false,
isMaxQuality: false,
+ autoDeleteWebTorrentIfNeeded: true,
isNewVideo
}