From 19ca8ca93975d99c16ab94c1526a34be74f63b95 Mon Sep 17 00:00:00 2001 From: Rigel Kent Date: Fri, 27 Jul 2018 12:50:39 +0200 Subject: [PATCH] fixing tests to deal with new transcoding parameters --- server/helpers/ffmpeg-utils.ts | 3 +-- server/tests/api/videos/multiple-servers.ts | 26 ++++++++++----------- 2 files changed, 14 insertions(+), 15 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) { let command = ffmpeg(options.inputPath, { 'niceness': FFMPEG_NICE.TRANSCODING }) .output(options.outputPath) .outputOption('-threads ' + CONFIG.TRANSCODING.THREADS) - .renice(5) // we don't want to make the system unrepsonsive - .preset(standard) + .preset(standard) let fps = await getVideoFileFPS(options.inputPath) if (options.resolution !== undefined) { diff --git a/server/tests/api/videos/multiple-servers.ts b/server/tests/api/videos/multiple-servers.ts index 4681deb47..516dc5aba 100644 --- a/server/tests/api/videos/multiple-servers.ts +++ b/server/tests/api/videos/multiple-servers.ts @@ -209,19 +209,19 @@ describe('Test multiple servers', function () { files: [ { resolution: 240, - size: 100000 - }, - { - resolution: 360, - size: 180000 - }, - { - resolution: 480, size: 280000 }, + { + resolution: 360, + size: 370000 + }, + { + resolution: 480, + size: 470000 + }, { resolution: 720, - size: 630000 + size: 740000 } ], thumbnailfile: 'thumbnail', @@ -975,19 +975,19 @@ describe('Test multiple servers', function () { files: [ { resolution: 720, - size: 31000 + size: 36000 }, { resolution: 480, - size: 16000 + size: 21000 }, { resolution: 360, - size: 12000 + size: 17000 }, { resolution: 240, - size: 10000 + size: 13000 } ] }