import * as Bull from 'bull'
import { TranscodeOptionsType } from '@server/helpers/ffmpeg-utils'
-import { getTranscodingJobPriority, publishAndFederateIfNeeded } from '@server/lib/video'
-import { getVideoFilePath } from '@server/lib/video-paths'
+import { addTranscodingJob, getTranscodingJobPriority } from '@server/lib/video'
+import { VideoPathManager } from '@server/lib/video-path-manager'
+import { moveToNextState } from '@server/lib/video-state'
import { UserModel } from '@server/models/user/user'
-import { MUser, MUserId, MVideoFullLight, MVideoUUID, MVideoWithFile } from '@server/types/models'
+import { VideoJobInfoModel } from '@server/models/video/video-job-info'
+import { MUser, MUserId, MVideo, MVideoFullLight, MVideoWithFile } from '@server/types/models'
import {
HLSTranscodingPayload,
MergeAudioTranscodingPayload,
import { logger } from '../../../helpers/logger'
import { CONFIG } from '../../../initializers/config'
import { VideoModel } from '../../../models/video/video'
-import { federateVideoIfNeeded } from '../../activitypub/videos'
-import { Notifier } from '../../notifier'
import {
generateHlsPlaylistResolution,
mergeAudioVideofile,
optimizeOriginalVideofile,
transcodeNewWebTorrentResolution
} from '../../transcoding/video-transcoding'
-import { JobQueue } from '../job-queue'
-type HandlerFunction = (job: Bull.Job, payload: VideoTranscodingPayload, video: MVideoFullLight, user: MUser) => Promise<any>
+type HandlerFunction = (job: Bull.Job, payload: VideoTranscodingPayload, video: MVideoFullLight, user: MUser) => Promise<void>
-const handlers: { [ id: string ]: HandlerFunction } = {
- // Deprecated, introduced in 3.1
- 'hls': handleHLSJob,
+const handlers: { [ id in VideoTranscodingPayload['type'] ]: HandlerFunction } = {
'new-resolution-to-hls': handleHLSJob,
-
- // Deprecated, introduced in 3.1
- 'new-resolution': handleNewWebTorrentResolutionJob,
'new-resolution-to-webtorrent': handleNewWebTorrentResolutionJob,
-
- // Deprecated, introduced in 3.1
- 'merge-audio': handleWebTorrentMergeAudioJob,
'merge-audio-to-webtorrent': handleWebTorrentMergeAudioJob,
-
- // Deprecated, introduced in 3.1
- 'optimize': handleWebTorrentOptimizeJob,
'optimize-to-webtorrent': handleWebTorrentOptimizeJob
}
: video.getMaxQualityFile()
const videoOrStreamingPlaylist = videoFileInput.getVideoOrStreamingPlaylist()
- const videoInputPath = getVideoFilePath(videoOrStreamingPlaylist, videoFileInput)
- await generateHlsPlaylistResolution({
- video,
- videoInputPath,
- resolution: payload.resolution,
- copyCodecs: payload.copyCodecs,
- isPortraitMode: payload.isPortraitMode || false,
- job
+ await VideoPathManager.Instance.makeAvailableVideoFile(videoOrStreamingPlaylist, videoFileInput, videoInputPath => {
+ return generateHlsPlaylistResolution({
+ video,
+ videoInputPath,
+ resolution: payload.resolution,
+ copyCodecs: payload.copyCodecs,
+ isPortraitMode: payload.isPortraitMode || false,
+ job
+ })
})
await retryTransactionWrapper(onHlsPlaylistGeneration, video, user, payload)
}
async function handleWebTorrentOptimizeJob (job: Bull.Job, payload: OptimizeTranscodingPayload, video: MVideoFullLight, user: MUserId) {
- const transcodeType = await optimizeOriginalVideofile(video, video.getMaxQualityFile(), job)
+ const { transcodeType } = await optimizeOriginalVideofile(video, video.getMaxQualityFile(), job)
await retryTransactionWrapper(onVideoFileOptimizer, video, payload, transcodeType, user)
}
video.VideoFiles = []
// Create HLS new resolution jobs
- await createLowerResolutionsJobs(video, user, payload.resolution, payload.isPortraitMode, 'hls')
+ await createLowerResolutionsJobs({
+ video,
+ user,
+ videoFileResolution: payload.resolution,
+ isPortraitMode: payload.isPortraitMode,
+ isNewVideo: payload.isNewVideo ?? true,
+ type: 'hls'
+ })
}
- return publishAndFederateIfNeeded(video)
+ await VideoJobInfoModel.decrease(video.uuid, 'pendingTranscode')
+ await moveToNextState(video, payload.isNewVideo)
}
async function onVideoFileOptimizer (
if (videoArg === undefined) return undefined
// Outside the transaction (IO on disk)
- const { videoFileResolution, isPortraitMode } = await videoArg.getMaxQualityResolution()
+ const { resolution, isPortraitMode } = await videoArg.getMaxQualityResolution()
// Maybe the video changed in database, refresh it
const videoDatabase = await VideoModel.loadAndPopulateAccountAndServerAndTags(videoArg.uuid)
// Video does not exist anymore
if (!videoDatabase) return undefined
- let videoPublished = false
-
// Generate HLS version of the original file
- const originalFileHLSPayload = Object.assign({}, payload, {
+ const originalFileHLSPayload = {
+ ...payload,
+
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',
isMaxQuality: true
- })
+ }
const hasHls = await createHlsJobIfEnabled(user, originalFileHLSPayload)
+ const hasNewResolutions = await createLowerResolutionsJobs({
+ video: videoDatabase,
+ user,
+ videoFileResolution: resolution,
+ isPortraitMode,
+ type: 'webtorrent',
+ isNewVideo: payload.isNewVideo ?? true
+ })
- const hasNewResolutions = await createLowerResolutionsJobs(videoDatabase, user, videoFileResolution, isPortraitMode, 'webtorrent')
+ await VideoJobInfoModel.decrease(videoDatabase.uuid, 'pendingTranscode')
+ // Move to next state if there are no other resolutions to generate
if (!hasHls && !hasNewResolutions) {
- // No transcoding to do, it's now published
- videoPublished = await videoDatabase.publishIfNeededAndSave(undefined)
+ await moveToNextState(videoDatabase, payload.isNewVideo)
}
-
- await federateVideoIfNeeded(videoDatabase, payload.isNewVideo)
-
- if (payload.isNewVideo) Notifier.Instance.notifyOnNewVideoIfNeeded(videoDatabase)
- if (videoPublished) Notifier.Instance.notifyOnVideoPublishedAfterTranscoding(videoDatabase)
}
async function onNewWebTorrentFileResolution (
- video: MVideoUUID,
+ video: MVideo,
user: MUserId,
payload: NewResolutionTranscodingPayload | MergeAudioTranscodingPayload
) {
- await publishAndFederateIfNeeded(video)
-
- await createHlsJobIfEnabled(user, Object.assign({}, payload, { copyCodecs: true, isMaxQuality: false }))
-}
+ await createHlsJobIfEnabled(user, { ...payload, copyCodecs: true, isMaxQuality: false })
+ await VideoJobInfoModel.decrease(video.uuid, 'pendingTranscode')
-// ---------------------------------------------------------------------------
-
-export {
- processVideoTranscoding,
- onNewWebTorrentFileResolution
+ await moveToNextState(video, payload.isNewVideo)
}
-// ---------------------------------------------------------------------------
-
async function createHlsJobIfEnabled (user: MUserId, payload: {
videoUUID: string
resolution: number
isPortraitMode?: boolean
copyCodecs: boolean
isMaxQuality: boolean
+ isNewVideo?: boolean
}) {
- if (!payload || CONFIG.TRANSCODING.HLS.ENABLED !== true) return false
+ if (!payload || CONFIG.TRANSCODING.ENABLED !== true || CONFIG.TRANSCODING.HLS.ENABLED !== true) return false
const jobOptions = {
priority: await getTranscodingJobPriority(user)
resolution: payload.resolution,
isPortraitMode: payload.isPortraitMode,
copyCodecs: payload.copyCodecs,
- isMaxQuality: payload.isMaxQuality
+ isMaxQuality: payload.isMaxQuality,
+ isNewVideo: payload.isNewVideo
}
- JobQueue.Instance.createJob({ type: 'video-transcoding', payload: hlsTranscodingPayload }, jobOptions)
+ await addTranscodingJob(hlsTranscodingPayload, jobOptions)
return true
}
-async function createLowerResolutionsJobs (
- video: MVideoFullLight,
- user: MUserId,
- videoFileResolution: number,
- isPortraitMode: boolean,
+// ---------------------------------------------------------------------------
+
+export {
+ processVideoTranscoding,
+ createHlsJobIfEnabled,
+ onNewWebTorrentFileResolution
+}
+
+// ---------------------------------------------------------------------------
+
+async function createLowerResolutionsJobs (options: {
+ video: MVideoFullLight
+ user: MUserId
+ videoFileResolution: number
+ isPortraitMode: boolean
+ isNewVideo: boolean
type: 'hls' | 'webtorrent'
-) {
+}) {
+ const { video, user, videoFileResolution, isPortraitMode, isNewVideo, type } = options
+
// Create transcoding jobs if there are enabled resolutions
const resolutionsEnabled = computeResolutionsToTranscode(videoFileResolution, 'vod')
const resolutionCreated: number[] = []
type: 'new-resolution-to-webtorrent',
videoUUID: video.uuid,
resolution,
- isPortraitMode
+ isPortraitMode,
+ isNewVideo
}
}
resolution,
isPortraitMode,
copyCodecs: false,
- isMaxQuality: false
+ isMaxQuality: false,
+ isNewVideo
}
}
priority: await getTranscodingJobPriority(user)
}
- JobQueue.Instance.createJob({ type: 'video-transcoding', payload: dataInput }, jobOptions)
+ await addTranscodingJob(dataInput, jobOptions)
}
if (resolutionCreated.length === 0) {
projects / github / Chocobozzz / PeerTube.git / blobdiff