diff options
| author | Rigel Kent <sendmemail@rigelk.eu> | 2018-07-27 12:50:39 +0200 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2018-08-01 10:57:13 +0200 |
| commit | 19ca8ca93975d99c16ab94c1526a34be74f63b95 (patch) | |
| tree | d59987be8091ad266992f5ab60b032a8e3f65ee9 /server/helpers/ffmpeg-utils.ts | |
| parent | 80bc88c1330c5cf6f5da0ec9252f905e30037f59 (diff) | |
| download | PeerTube-19ca8ca93975d99c16ab94c1526a34be74f63b95.tar.gz PeerTube-19ca8ca93975d99c16ab94c1526a34be74f63b95.tar.zst PeerTube-19ca8ca93975d99c16ab94c1526a34be74f63b95.zip | |
fixing tests to deal with new transcoding parameters
Diffstat (limited to 'server/helpers/ffmpeg-utils.ts')
| -rw-r--r-- | server/helpers/ffmpeg-utils.ts | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/server/helpers/ffmpeg-utils.ts b/server/helpers/ffmpeg-utils.ts index ab187aa59..f0e2c0af5 100644 --- a/server/helpers/ffmpeg-utils.ts +++ b/server/helpers/ffmpeg-utils.ts | |||
| @@ -87,8 +87,7 @@ function transcode (options: TranscodeOptions) { | |||
| 87 | let command = ffmpeg(options.inputPath, { 'niceness': FFMPEG_NICE.TRANSCODING }) | 87 | let command = ffmpeg(options.inputPath, { 'niceness': FFMPEG_NICE.TRANSCODING }) |
| 88 | .output(options.outputPath) | 88 | .output(options.outputPath) |
| 89 | .outputOption('-threads ' + CONFIG.TRANSCODING.THREADS) | 89 | .outputOption('-threads ' + CONFIG.TRANSCODING.THREADS) |
| 90 | .renice(5) // we don't want to make the system unrepsonsive | 90 | .preset(standard) |
| 91 | .preset(standard) | ||
| 92 | 91 | ||
| 93 | let fps = await getVideoFileFPS(options.inputPath) | 92 | let fps = await getVideoFileFPS(options.inputPath) |
| 94 | if (options.resolution !== undefined) { | 93 | if (options.resolution !== undefined) { |