Chocobozzz/PeerTube
1
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2024-11-10 02:17:37 +03:00
Code Issues Projects Releases Wiki Activity

Fix audio merging when specifying a preview

Browse Source
This commit is contained in:
Chocobozzz 2019-10-18 11:44:01 +02:00
parent 2f26030dd2
commit eba06469b7
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
1 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
server/lib/video-transcoding.ts
View File

@ -1,7 +1,14 @@
import { HLS_STREAMING_PLAYLIST_DIRECTORY, P2P_MEDIA_LOADER_PEER_VERSION, WEBSERVER } from '../initializers/constants' import { HLS_STREAMING_PLAYLIST_DIRECTORY, P2P_MEDIA_LOADER_PEER_VERSION, WEBSERVER } from '../initializers/constants'
import { join } from 'path' import { basename, join } from 'path'
import { canDoQuickTranscode, getVideoFileFPS, transcode, TranscodeOptions, TranscodeOptionsType } from '../helpers/ffmpeg-utils' import {
import { ensureDir, move, remove, stat } from 'fs-extra' canDoQuickTranscode,
getDurationFromVideoFile,
getVideoFileFPS,
transcode,
TranscodeOptions,
TranscodeOptionsType
} from '../helpers/ffmpeg-utils'
import { copyFile, ensureDir, move, remove, stat } from 'fs-extra'
import { logger } from '../helpers/logger' import { logger } from '../helpers/logger'
import { VideoResolution } from '../../shared/models/videos' import { VideoResolution } from '../../shared/models/videos'
import { VideoFileModel } from '../models/video/video-file' import { VideoFileModel } from '../models/video/video-file'
@ -97,22 +104,37 @@ async function mergeAudioVideofile (video: MVideoWithFileThumbnail, resolution:
const audioInputPath = join(videosDirectory, video.getVideoFilename(video.getOriginalFile())) const audioInputPath = join(videosDirectory, video.getVideoFilename(video.getOriginalFile()))
const videoTranscodedPath = join(transcodeDirectory, video.id + '-transcoded' + newExtname) const videoTranscodedPath = join(transcodeDirectory, video.id + '-transcoded' + newExtname)
// If the user updates the video preview during transcoding
const previewPath = video.getPreview().getPath()
const tmpPreviewPath = join(CONFIG.STORAGE.TMP_DIR, basename(previewPath))
await copyFile(previewPath, tmpPreviewPath)
const transcodeOptions = { const transcodeOptions = {
type: 'merge-audio' as 'merge-audio', type: 'merge-audio' as 'merge-audio',
inputPath: video.getPreview().getPath(), inputPath: tmpPreviewPath,
outputPath: videoTranscodedPath, outputPath: videoTranscodedPath,
audioPath: audioInputPath, audioPath: audioInputPath,
resolution resolution
} }
try {
await transcode(transcodeOptions) await transcode(transcodeOptions)
await remove(audioInputPath) await remove(audioInputPath)
await remove(tmpPreviewPath)
} catch (err) {
await remove(tmpPreviewPath)
throw err
}
// Important to do this before getVideoFilename() to take in account the new file extension // Important to do this before getVideoFilename() to take in account the new file extension
inputVideoFile.extname = newExtname inputVideoFile.extname = newExtname
const videoOutputPath = video.getVideoFilePath(inputVideoFile) const videoOutputPath = video.getVideoFilePath(inputVideoFile)
// ffmpeg generated a new video file, so update the video duration
// See https://trac.ffmpeg.org/ticket/5456
video.duration = await getDurationFromVideoFile(videoTranscodedPath)
await video.save()
return onVideoFileTranscoding(video, inputVideoFile, videoTranscodedPath, videoOutputPath) return onVideoFileTranscoding(video, inputVideoFile, videoTranscodedPath, videoOutputPath)
} }