fixing tests to deal with new transcoding parameters

pull/901/head
Rigel Kent 2018-07-27 12:50:39 +02:00 committed by Chocobozzz
parent 80bc88c133
commit 19ca8ca939
2 changed files with 14 additions and 15 deletions

View File

@ -87,8 +87,7 @@ function transcode (options: TranscodeOptions) {
let command = ffmpeg(options.inputPath, { 'niceness': FFMPEG_NICE.TRANSCODING }) let command = ffmpeg(options.inputPath, { 'niceness': FFMPEG_NICE.TRANSCODING })
.output(options.outputPath) .output(options.outputPath)
.outputOption('-threads ' + CONFIG.TRANSCODING.THREADS) .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) let fps = await getVideoFileFPS(options.inputPath)
if (options.resolution !== undefined) { if (options.resolution !== undefined) {

View File

@ -209,19 +209,19 @@ describe('Test multiple servers', function () {
files: [ files: [
{ {
resolution: 240, resolution: 240,
size: 100000
},
{
resolution: 360,
size: 180000
},
{
resolution: 480,
size: 280000 size: 280000
}, },
{
resolution: 360,
size: 370000
},
{
resolution: 480,
size: 470000
},
{ {
resolution: 720, resolution: 720,
size: 630000 size: 740000
} }
], ],
thumbnailfile: 'thumbnail', thumbnailfile: 'thumbnail',
@ -975,19 +975,19 @@ describe('Test multiple servers', function () {
files: [ files: [
{ {
resolution: 720, resolution: 720,
size: 31000 size: 36000
}, },
{ {
resolution: 480, resolution: 480,
size: 16000 size: 21000
}, },
{ {
resolution: 360, resolution: 360,
size: 12000 size: 17000
}, },
{ {
resolution: 240, resolution: 240,
size: 10000 size: 13000
} }
] ]
} }