diff options
Diffstat (limited to 'server/lib/job-queue/handlers/video-import.ts')
-rw-r--r-- | server/lib/job-queue/handlers/video-import.ts | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/server/lib/job-queue/handlers/video-import.ts b/server/lib/job-queue/handlers/video-import.ts index 4d361c7b9..2a063282c 100644 --- a/server/lib/job-queue/handlers/video-import.ts +++ b/server/lib/job-queue/handlers/video-import.ts | |||
@@ -7,15 +7,16 @@ import { isPostImportVideoAccepted } from '@server/lib/moderation' | |||
7 | import { generateWebTorrentVideoFilename } from '@server/lib/paths' | 7 | import { generateWebTorrentVideoFilename } from '@server/lib/paths' |
8 | import { Hooks } from '@server/lib/plugins/hooks' | 8 | import { Hooks } from '@server/lib/plugins/hooks' |
9 | import { ServerConfigManager } from '@server/lib/server-config-manager' | 9 | import { ServerConfigManager } from '@server/lib/server-config-manager' |
10 | import { createOptimizeOrMergeAudioJobs } from '@server/lib/transcoding/create-transcoding-job' | ||
10 | import { isAbleToUploadVideo } from '@server/lib/user' | 11 | import { isAbleToUploadVideo } from '@server/lib/user' |
11 | import { buildMoveToObjectStorageJob, buildOptimizeOrMergeAudioJob } from '@server/lib/video' | 12 | import { buildMoveToObjectStorageJob } from '@server/lib/video' |
12 | import { VideoPathManager } from '@server/lib/video-path-manager' | 13 | import { VideoPathManager } from '@server/lib/video-path-manager' |
13 | import { buildNextVideoState } from '@server/lib/video-state' | 14 | import { buildNextVideoState } from '@server/lib/video-state' |
14 | import { ThumbnailModel } from '@server/models/video/thumbnail' | 15 | import { ThumbnailModel } from '@server/models/video/thumbnail' |
15 | import { MUserId, MVideoFile, MVideoFullLight } from '@server/types/models' | 16 | import { MUserId, MVideoFile, MVideoFullLight } from '@server/types/models' |
16 | import { MVideoImport, MVideoImportDefault, MVideoImportDefaultFiles, MVideoImportVideo } from '@server/types/models/video/video-import' | 17 | import { MVideoImport, MVideoImportDefault, MVideoImportDefaultFiles, MVideoImportVideo } from '@server/types/models/video/video-import' |
17 | import { getLowercaseExtension } from '@shared/core-utils' | 18 | import { getLowercaseExtension } from '@shared/core-utils' |
18 | import { isAudioFile } from '@shared/extra-utils' | 19 | import { ffprobePromise, getVideoStreamDimensionsInfo, getVideoStreamDuration, getVideoStreamFPS, isAudioFile } from '@shared/ffmpeg' |
19 | import { | 20 | import { |
20 | ThumbnailType, | 21 | ThumbnailType, |
21 | VideoImportPayload, | 22 | VideoImportPayload, |
@@ -28,7 +29,6 @@ import { | |||
28 | VideoResolution, | 29 | VideoResolution, |
29 | VideoState | 30 | VideoState |
30 | } from '@shared/models' | 31 | } from '@shared/models' |
31 | import { ffprobePromise, getVideoStreamDimensionsInfo, getVideoStreamDuration, getVideoStreamFPS } from '../../../helpers/ffmpeg' | ||
32 | import { logger } from '../../../helpers/logger' | 32 | import { logger } from '../../../helpers/logger' |
33 | import { getSecureTorrentName } from '../../../helpers/utils' | 33 | import { getSecureTorrentName } from '../../../helpers/utils' |
34 | import { createTorrentAndSetInfoHash, downloadWebTorrentVideo } from '../../../helpers/webtorrent' | 34 | import { createTorrentAndSetInfoHash, downloadWebTorrentVideo } from '../../../helpers/webtorrent' |
@@ -137,7 +137,7 @@ async function processFile (downloader: () => Promise<string>, videoImport: MVid | |||
137 | 137 | ||
138 | const { resolution } = await isAudioFile(tempVideoPath, probe) | 138 | const { resolution } = await isAudioFile(tempVideoPath, probe) |
139 | ? { resolution: VideoResolution.H_NOVIDEO } | 139 | ? { resolution: VideoResolution.H_NOVIDEO } |
140 | : await getVideoStreamDimensionsInfo(tempVideoPath) | 140 | : await getVideoStreamDimensionsInfo(tempVideoPath, probe) |
141 | 141 | ||
142 | const fps = await getVideoStreamFPS(tempVideoPath, probe) | 142 | const fps = await getVideoStreamFPS(tempVideoPath, probe) |
143 | const duration = await getVideoStreamDuration(tempVideoPath, probe) | 143 | const duration = await getVideoStreamDuration(tempVideoPath, probe) |
@@ -313,9 +313,7 @@ async function afterImportSuccess (options: { | |||
313 | } | 313 | } |
314 | 314 | ||
315 | if (video.state === VideoState.TO_TRANSCODE) { // Create transcoding jobs? | 315 | if (video.state === VideoState.TO_TRANSCODE) { // Create transcoding jobs? |
316 | await JobQueue.Instance.createJob( | 316 | await createOptimizeOrMergeAudioJobs({ video, videoFile, isNewVideo: true, user }) |
317 | await buildOptimizeOrMergeAudioJob({ video, videoFile, user }) | ||
318 | ) | ||
319 | } | 317 | } |
320 | } | 318 | } |
321 | 319 | ||