From 2fbd5e25dd465f9d1169ec013ed6cc8e95b2b21a Mon Sep 17 00:00:00 2001 From: libertysoft3 Date: Sun, 12 May 2019 22:26:56 -0700 Subject: [PATCH] transcode in STORAGE.TMP_DIR for s3fs compatibility (#147) --- server/lib/video-transcoding.ts | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/server/lib/video-transcoding.ts b/server/lib/video-transcoding.ts index 8e906a1eb..d6b6b251a 100644 --- a/server/lib/video-transcoding.ts +++ b/server/lib/video-transcoding.ts @@ -16,11 +16,12 @@ import { CONFIG } from '../initializers/config' */ async function optimizeVideofile (video: VideoModel, inputVideoFileArg?: VideoFileModel) { const videosDirectory = CONFIG.STORAGE.VIDEOS_DIR + const transcodeDirectory = CONFIG.STORAGE.TMP_DIR const newExtname = '.mp4' const inputVideoFile = inputVideoFileArg ? inputVideoFileArg : video.getOriginalFile() const videoInputPath = join(videosDirectory, video.getVideoFilename(inputVideoFile)) - const videoTranscodedPath = join(videosDirectory, video.id + '-transcoded' + newExtname) + const videoTranscodedPath = join(transcodeDirectory, video.id + '-transcoded' + newExtname) const doQuickTranscode = await(canDoQuickTranscode(videoInputPath)) @@ -40,10 +41,11 @@ async function optimizeVideofile (video: VideoModel, inputVideoFileArg?: VideoFi // Important to do this before getVideoFilename() to take in account the new file extension inputVideoFile.set('extname', newExtname) + const stats = await stat(videoTranscodedPath) + const fps = await getVideoFileFPS(videoTranscodedPath) + const videoOutputPath = video.getVideoFilePath(inputVideoFile) await move(videoTranscodedPath, videoOutputPath) - const stats = await stat(videoOutputPath) - const fps = await getVideoFileFPS(videoOutputPath) inputVideoFile.set('size', stats.size) inputVideoFile.set('fps', fps) @@ -63,6 +65,7 @@ async function optimizeVideofile (video: VideoModel, inputVideoFileArg?: VideoFi */ async function transcodeOriginalVideofile (video: VideoModel, resolution: VideoResolution, isPortrait: boolean) { const videosDirectory = CONFIG.STORAGE.VIDEOS_DIR + const transcodeDirectory = CONFIG.STORAGE.TMP_DIR const extname = '.mp4' // We are sure it's x264 in mp4 because optimizeOriginalVideofile was already executed @@ -75,18 +78,21 @@ async function transcodeOriginalVideofile (video: VideoModel, resolution: VideoR videoId: video.id }) const videoOutputPath = join(CONFIG.STORAGE.VIDEOS_DIR, video.getVideoFilename(newVideoFile)) + const videoTranscodedPath = join(transcodeDirectory, video.getVideoFilename(newVideoFile)) const transcodeOptions = { inputPath: videoInputPath, - outputPath: videoOutputPath, + outputPath: videoTranscodedPath, resolution, isPortraitMode: isPortrait } await transcode(transcodeOptions) - const stats = await stat(videoOutputPath) - const fps = await getVideoFileFPS(videoOutputPath) + const stats = await stat(videoTranscodedPath) + const fps = await getVideoFileFPS(videoTranscodedPath) + + await move(videoTranscodedPath, videoOutputPath) newVideoFile.set('size', stats.size) newVideoFile.set('fps', fps)