diff options
| author | Chocobozzz <me@florianbigard.com> | 2021-10-12 13:50:48 +0200 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2021-10-12 13:50:48 +0200 |
| commit | 10ef089102f2225c5ec3ed426bc612e4f2bc8655 (patch) | |
| tree | a92171db9114792a363e360bfb645c13d9ea4234 /shared | |
| parent | c80e458afb63915163467fe9b3b147b3b4e4657d (diff) | |
| parent | 3c25d37aef66b125e8c66d38b04eb763f1b17bc6 (diff) | |
| download | PeerTube-10ef089102f2225c5ec3ed426bc612e4f2bc8655.tar.gz PeerTube-10ef089102f2225c5ec3ed426bc612e4f2bc8655.tar.zst PeerTube-10ef089102f2225c5ec3ed426bc612e4f2bc8655.zip | |
Merge branch 'release/3.4.0' into develop
Diffstat (limited to 'shared')
6 files changed, 6 insertions, 6 deletions
diff --git a/shared/core-utils/videos/bitrate.ts b/shared/core-utils/videos/bitrate.ts index 3d4e47906..a6712f8a4 100644 --- a/shared/core-utils/videos/bitrate.ts +++ b/shared/core-utils/videos/bitrate.ts | |||
| @@ -78,7 +78,7 @@ function calculateBitrate (options: { | |||
| 78 | 78 | ||
| 79 | for (const toTestResolution of resolutionsOrder) { | 79 | for (const toTestResolution of resolutionsOrder) { |
| 80 | if (toTestResolution <= resolution) { | 80 | if (toTestResolution <= resolution) { |
| 81 | return resolution * resolution * ratio * fps * bitPerPixel[toTestResolution] | 81 | return Math.floor(resolution * resolution * ratio * fps * bitPerPixel[toTestResolution]) |
| 82 | } | 82 | } |
| 83 | } | 83 | } |
| 84 | 84 | ||
diff --git a/shared/extra-utils/mock-servers/mock-instances-index.ts b/shared/extra-utils/mock-servers/mock-instances-index.ts index 2aabef9d2..5baec00de 100644 --- a/shared/extra-utils/mock-servers/mock-instances-index.ts +++ b/shared/extra-utils/mock-servers/mock-instances-index.ts | |||
| @@ -29,7 +29,7 @@ export class MockInstancesIndex { | |||
| 29 | }) | 29 | }) |
| 30 | }) | 30 | }) |
| 31 | 31 | ||
| 32 | const port = 42101 + randomInt(1, 100) | 32 | const port = 42000 + randomInt(1, 1000) |
| 33 | app.listen(port, () => res(port)) | 33 | app.listen(port, () => res(port)) |
| 34 | }) | 34 | }) |
| 35 | } | 35 | } |
diff --git a/shared/extra-utils/mock-servers/mock-joinpeertube-versions.ts b/shared/extra-utils/mock-servers/mock-joinpeertube-versions.ts index 5106fc66a..79be31f61 100644 --- a/shared/extra-utils/mock-servers/mock-joinpeertube-versions.ts +++ b/shared/extra-utils/mock-servers/mock-joinpeertube-versions.ts | |||
| @@ -22,7 +22,7 @@ export class MockJoinPeerTubeVersions { | |||
| 22 | }) | 22 | }) |
| 23 | }) | 23 | }) |
| 24 | 24 | ||
| 25 | const port = 42201 + randomInt(1, 100) | 25 | const port = 43000 + randomInt(1, 1000) |
| 26 | app.listen(port, () => res(port)) | 26 | app.listen(port, () => res(port)) |
| 27 | }) | 27 | }) |
| 28 | } | 28 | } |
diff --git a/shared/extra-utils/mock-servers/mock-object-storage.ts b/shared/extra-utils/mock-servers/mock-object-storage.ts index b6071b2f2..144f2819d 100644 --- a/shared/extra-utils/mock-servers/mock-object-storage.ts +++ b/shared/extra-utils/mock-servers/mock-object-storage.ts | |||
| @@ -32,7 +32,7 @@ export class MockObjectStorage { | |||
| 32 | ) | 32 | ) |
| 33 | }) | 33 | }) |
| 34 | 34 | ||
| 35 | const port = 42301 + randomInt(1, 100) | 35 | const port = 44000 + randomInt(1, 1000) |
| 36 | this.server = app.listen(port, () => res(port)) | 36 | this.server = app.listen(port, () => res(port)) |
| 37 | }) | 37 | }) |
| 38 | } | 38 | } |
diff --git a/shared/extra-utils/mock-servers/mock-plugin-blocklist.ts b/shared/extra-utils/mock-servers/mock-plugin-blocklist.ts index 6a71532b5..344d4bdbb 100644 --- a/shared/extra-utils/mock-servers/mock-plugin-blocklist.ts +++ b/shared/extra-utils/mock-servers/mock-plugin-blocklist.ts | |||
| @@ -23,7 +23,7 @@ export class MockBlocklist { | |||
| 23 | return res.json(this.body) | 23 | return res.json(this.body) |
| 24 | }) | 24 | }) |
| 25 | 25 | ||
| 26 | const port = 42201 + randomInt(1, 100) | 26 | const port = 45000 + randomInt(1, 1000) |
| 27 | this.server = app.listen(port, () => res(port)) | 27 | this.server = app.listen(port, () => res(port)) |
| 28 | }) | 28 | }) |
| 29 | } | 29 | } |
diff --git a/shared/extra-utils/mock-servers/mock-proxy.ts b/shared/extra-utils/mock-servers/mock-proxy.ts index f955d3f9e..8583250f3 100644 --- a/shared/extra-utils/mock-servers/mock-proxy.ts +++ b/shared/extra-utils/mock-servers/mock-proxy.ts | |||
| @@ -9,7 +9,7 @@ class MockProxy { | |||
| 9 | 9 | ||
| 10 | initialize () { | 10 | initialize () { |
| 11 | return new Promise<number>(res => { | 11 | return new Promise<number>(res => { |
| 12 | const port = 42501 + randomInt(1, 100) | 12 | const port = 46000 + randomInt(1, 1000) |
| 13 | 13 | ||
| 14 | this.server = proxy(createServer()) | 14 | this.server = proxy(createServer()) |
| 15 | this.server.listen(port, () => res(port)) | 15 | this.server.listen(port, () => res(port)) |