aboutsummaryrefslogtreecommitdiffhomepage
path: root/server
diff options
context:
space:
mode:
authorRigel Kent <sendmemail@rigelk.eu>2018-07-27 12:50:39 +0200
committerChocobozzz <me@florianbigard.com>2018-08-01 10:57:13 +0200
commit19ca8ca93975d99c16ab94c1526a34be74f63b95 (patch)
treed59987be8091ad266992f5ab60b032a8e3f65ee9 /server
parent80bc88c1330c5cf6f5da0ec9252f905e30037f59 (diff)
downloadPeerTube-19ca8ca93975d99c16ab94c1526a34be74f63b95.tar.gz
PeerTube-19ca8ca93975d99c16ab94c1526a34be74f63b95.tar.zst
PeerTube-19ca8ca93975d99c16ab94c1526a34be74f63b95.zip
fixing tests to deal with new transcoding parameters
Diffstat (limited to 'server')
-rw-r--r--server/helpers/ffmpeg-utils.ts3
-rw-r--r--server/tests/api/videos/multiple-servers.ts16
2 files changed, 9 insertions, 10 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) {
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 () {
209 files: [ 209 files: [
210 { 210 {
211 resolution: 240, 211 resolution: 240,
212 size: 100000 212 size: 280000
213 }, 213 },
214 { 214 {
215 resolution: 360, 215 resolution: 360,
216 size: 180000 216 size: 370000
217 }, 217 },
218 { 218 {
219 resolution: 480, 219 resolution: 480,
220 size: 280000 220 size: 470000
221 }, 221 },
222 { 222 {
223 resolution: 720, 223 resolution: 720,
224 size: 630000 224 size: 740000
225 } 225 }
226 ], 226 ],
227 thumbnailfile: 'thumbnail', 227 thumbnailfile: 'thumbnail',
@@ -975,19 +975,19 @@ describe('Test multiple servers', function () {
975 files: [ 975 files: [
976 { 976 {
977 resolution: 720, 977 resolution: 720,
978 size: 31000 978 size: 36000
979 }, 979 },
980 { 980 {
981 resolution: 480, 981 resolution: 480,
982 size: 16000 982 size: 21000
983 }, 983 },
984 { 984 {
985 resolution: 360, 985 resolution: 360,
986 size: 12000 986 size: 17000
987 }, 987 },
988 { 988 {
989 resolution: 240, 989 resolution: 240,
990 size: 10000 990 size: 13000
991 } 991 }
992 ] 992 ]
993 } 993 }