]> git.immae.eu Git - github/Chocobozzz/PeerTube.git/commitdiff
fixing tests to deal with new transcoding parameters
authorRigel Kent <sendmemail@rigelk.eu>
Fri, 27 Jul 2018 10:50:39 +0000 (12:50 +0200)
committerChocobozzz <me@florianbigard.com>
Wed, 1 Aug 2018 08:57:13 +0000 (10:57 +0200)
server/helpers/ffmpeg-utils.ts
server/tests/api/videos/multiple-servers.ts

index ab187aa59319625ad19ecc14c649807688a48aeb..f0e2c0af5764caff5d29746476aef246e009d922 100644 (file)
@@ -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) {
index 4681deb47d62ebc543390d0288046b44dc0bd9a0..516dc5aba2ab2436af7a01cbbae279b23a4da85b 100644 (file)
@@ -209,19 +209,19 @@ describe('Test multiple servers', function () {
           files: [
             {
               resolution: 240,
-              size: 100000
+              size: 280000
             },
             {
               resolution: 360,
-              size: 180000
+              size: 370000
             },
             {
               resolution: 480,
-              size: 280000
+              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
             }
           ]
         }