diff options
author | Chocobozzz <me@florianbigard.com> | 2022-02-11 10:51:33 +0100 |
---|---|---|
committer | Chocobozzz <chocobozzz@cpy.re> | 2022-02-28 10:42:19 +0100 |
commit | c729caf6cc34630877a0e5a1bda1719384cd0c8a (patch) | |
tree | 1d2e13722e518c73d2c9e6f0969615e29d51cf8c /server/lib/job-queue/handlers/video-import.ts | |
parent | a24bf4dc659cebb65d887862bf21d7a35e9ec791 (diff) | |
download | PeerTube-c729caf6cc34630877a0e5a1bda1719384cd0c8a.tar.gz PeerTube-c729caf6cc34630877a0e5a1bda1719384cd0c8a.tar.zst PeerTube-c729caf6cc34630877a0e5a1bda1719384cd0c8a.zip |
Add basic video editor support
Diffstat (limited to 'server/lib/job-queue/handlers/video-import.ts')
-rw-r--r-- | server/lib/job-queue/handlers/video-import.ts | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/server/lib/job-queue/handlers/video-import.ts b/server/lib/job-queue/handlers/video-import.ts index b6e05d8f5..b3ca28c2f 100644 --- a/server/lib/job-queue/handlers/video-import.ts +++ b/server/lib/job-queue/handlers/video-import.ts | |||
@@ -25,7 +25,7 @@ import { | |||
25 | VideoResolution, | 25 | VideoResolution, |
26 | VideoState | 26 | VideoState |
27 | } from '@shared/models' | 27 | } from '@shared/models' |
28 | import { ffprobePromise, getDurationFromVideoFile, getVideoFileFPS, getVideoFileResolution } from '../../../helpers/ffprobe-utils' | 28 | import { ffprobePromise, getVideoStreamDuration, getVideoStreamFPS, getVideoStreamDimensionsInfo } from '../../../helpers/ffmpeg' |
29 | import { logger } from '../../../helpers/logger' | 29 | import { logger } from '../../../helpers/logger' |
30 | import { getSecureTorrentName } from '../../../helpers/utils' | 30 | import { getSecureTorrentName } from '../../../helpers/utils' |
31 | import { createTorrentAndSetInfoHash, downloadWebTorrentVideo } from '../../../helpers/webtorrent' | 31 | import { createTorrentAndSetInfoHash, downloadWebTorrentVideo } from '../../../helpers/webtorrent' |
@@ -121,10 +121,10 @@ async function processFile (downloader: () => Promise<string>, videoImport: MVid | |||
121 | 121 | ||
122 | const { resolution } = await isAudioFile(tempVideoPath, probe) | 122 | const { resolution } = await isAudioFile(tempVideoPath, probe) |
123 | ? { resolution: VideoResolution.H_NOVIDEO } | 123 | ? { resolution: VideoResolution.H_NOVIDEO } |
124 | : await getVideoFileResolution(tempVideoPath) | 124 | : await getVideoStreamDimensionsInfo(tempVideoPath) |
125 | 125 | ||
126 | const fps = await getVideoFileFPS(tempVideoPath, probe) | 126 | const fps = await getVideoStreamFPS(tempVideoPath, probe) |
127 | const duration = await getDurationFromVideoFile(tempVideoPath, probe) | 127 | const duration = await getVideoStreamDuration(tempVideoPath, probe) |
128 | 128 | ||
129 | // Prepare video file object for creation in database | 129 | // Prepare video file object for creation in database |
130 | const fileExt = getLowercaseExtension(tempVideoPath) | 130 | const fileExt = getLowercaseExtension(tempVideoPath) |