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

Support progress for ffmpeg tasks

Browse source
This commit is contained in:
Chocobozzz 2021-01-21 14:42:43 +01:00
parent d44cdcd766
commit 3b01f4c0ac
No known key found for this signature in database
GPG key ID: 583A612D890159BE
8 changed files with 71 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

20
server/helpers/ffmpeg-utils.ts
View file

@ -1,3 +1,4 @@
import { Job } from 'bull'
import * as ffmpeg from 'fluent-ffmpeg'
import { readFile, remove, writeFile } from 'fs-extra'
import { dirname, join } from 'path'
@ -124,6 +125,8 @@ interface BaseTranscodeOptions {
resolution: VideoResolution
isPortraitMode?: boolean
job?: Job
}
interface HLSTranscodeOptions extends BaseTranscodeOptions {
@ -188,7 +191,7 @@ async function transcode (options: TranscodeOptions) {
command = await builders[options.type](command, options)
await runCommand(command)
await runCommand(command, options.job)
await fixHLSPlaylistIfNeeded(options)
}
@ -611,11 +614,9 @@ function getFFmpeg (input: string, type: 'live' | 'vod') {
return command
}
async function runCommand (command: ffmpeg.FfmpegCommand, onEnd?: Function) {
async function runCommand (command: ffmpeg.FfmpegCommand, job?: Job) {
return new Promise<void>((res, rej) => {
command.on('error', (err, stdout, stderr) => {
if (onEnd) onEnd()
logger.error('Error in transcoding job.', { stdout, stderr })
rej(err)
})
@ -623,11 +624,18 @@ async function runCommand (command: ffmpeg.FfmpegCommand, onEnd?: Function) {
command.on('end', (stdout, stderr) => {
logger.debug('FFmpeg command ended.', { stdout, stderr })
if (onEnd) onEnd()
res()
})
if (job) {
command.on('progress', progress => {
if (!progress.percent) return
job.progress(Math.round(progress.percent))
.catch(err => logger.warn('Cannot set ffmpeg job progress.', { err }))
})
}
command.run()
})
}