From 884d2c39ae23b44d0d037aaff0f66ad9ae0807ba Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 26 Nov 2020 11:29:50 +0100 Subject: Fix live FPS limit --- server/tests/api/live/live.ts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'server/tests/api/live') diff --git a/server/tests/api/live/live.ts b/server/tests/api/live/live.ts index 0786db554..4f84882ff 100644 --- a/server/tests/api/live/live.ts +++ b/server/tests/api/live/live.ts @@ -416,7 +416,7 @@ describe('Test live', function () { await waitJobs(servers) const bitrateLimits = { - 720: 3000 * 1000, + 720: 4000 * 1000, // 60FPS 360: 1100 * 1000, 240: 600 * 1000 } @@ -436,9 +436,14 @@ describe('Test live', function () { const file = hlsPlaylist.files.find(f => f.resolution.id === resolution) expect(file).to.exist - expect(file.fps).to.be.approximately(30, 5) expect(file.size).to.be.greaterThan(1) + if (resolution >= 720) { + expect(file.fps).to.be.approximately(60, 2) + } else { + expect(file.fps).to.be.approximately(30, 2) + } + const filename = `${video.uuid}-${resolution}-fragmented.mp4` const segmentPath = buildServerDirectory(servers[0], join('streaming-playlists', 'hls', video.uuid, filename)) -- cgit v1.2.3