interesting
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove unnecessary transcoding job error

This commit is contained in:
Chocobozzz 2021-03-03 10:23:05 +01:00
parent dcd75f786c
commit cd2c3dcdc4
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/print-transcode-command.ts
View File

@ -48,5 +48,5 @@ async function run (path: string, cmd: any) {
exit() exit()
}) })
await runCommand(command) await runCommand({ command })
} }

17
server/helpers/ffmpeg-utils.ts
View File

@ -69,7 +69,7 @@ function convertWebPToJPG (path: string, destination: string): Promise<void> {
const command = ffmpeg(path, { niceness: FFMPEG_NICE.THUMBNAIL }) const command = ffmpeg(path, { niceness: FFMPEG_NICE.THUMBNAIL })
.output(destination) .output(destination)
return runCommand(command) return runCommand({ command, silent: true })
} }
function processGIF ( function processGIF (
@ -82,7 +82,7 @@ function processGIF (
.size(`${newSize.width}x${newSize.height}`) .size(`${newSize.width}x${newSize.height}`)
.output(destination) .output(destination)
return runCommand(command) return runCommand({ command })
} }
async function generateImageFromVideoFile (fromPath: string, folder: string, imageName: string, size: { width: number, height: number }) { async function generateImageFromVideoFile (fromPath: string, folder: string, imageName: string, size: { width: number, height: number }) {
@ -201,7 +201,7 @@ async function transcode (options: TranscodeOptions) {
command = await builders[options.type](command, options) command = await builders[options.type](command, options)
await runCommand(command, options.job) await runCommand({ command, job: options.job })
await fixHLSPlaylistIfNeeded(options) await fixHLSPlaylistIfNeeded(options)
} }
@ -649,10 +649,17 @@ function getFFmpeg (input: string, type: 'live' | 'vod') {
return command return command
} }
async function runCommand (command: ffmpeg.FfmpegCommand, job?: Job) { async function runCommand (options: {
command: ffmpeg.FfmpegCommand
silent?: boolean // false
job?: Job
}) {
const { command, silent = false, job } = options
return new Promise<void>((res, rej) => { return new Promise<void>((res, rej) => {
command.on('error', (err, stdout, stderr) => { command.on('error', (err, stdout, stderr) => {
logger.error('Error in transcoding job.', { stdout, stderr }) if (silent !== true) logger.error('Error in ffmpeg.', { stdout, stderr })
rej(err) rej(err)
}) })