NewResolutionTranscodingPayload,
OptimizeTranscodingPayload,
VideoTranscodingPayload
-} from '../../../../shared'
+} from '@shared/models'
import { retryTransactionWrapper } from '../../../helpers/database-utils'
import { computeLowerResolutionsToTranscode } from '../../../helpers/ffprobe-utils'
import { logger, loggerTagsFactory } from '../../../helpers/logger'
if (!handler) {
await moveToFailedTranscodingState(video)
+ await VideoJobInfoModel.decrease(video.uuid, 'pendingTranscode')
throw new Error('Cannot find transcoding handler for ' + payload.type)
}
} catch (error) {
await moveToFailedTranscodingState(video)
+ await VideoJobInfoModel.decrease(video.uuid, 'pendingTranscode')
+
throw error
}
return video
}
+// ---------------------------------------------------------------------------
+
+export {
+ processVideoTranscoding
+}
+
// ---------------------------------------------------------------------------
// Job handlers
// ---------------------------------------------------------------------------
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)
}
// ---------------------------------------------------------------------------
}
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
return true
}
-// ---------------------------------------------------------------------------
-
-export {
- processVideoTranscoding,
- createHlsJobIfEnabled,
- onNewWebTorrentFileResolution
-}
-
-// ---------------------------------------------------------------------------
-
async function createLowerResolutionsJobs (options: {
video: MVideoFullLight
user: MUserId