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 /server/helpers | |
| 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 'server/helpers')
| -rw-r--r-- | server/helpers/ffprobe-utils.ts | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/server/helpers/ffprobe-utils.ts b/server/helpers/ffprobe-utils.ts index 8381dee84..767f37f9c 100644 --- a/server/helpers/ffprobe-utils.ts +++ b/server/helpers/ffprobe-utils.ts | |||
| @@ -302,7 +302,10 @@ function computeFPS (fpsArg: number, resolution: VideoResolution) { | |||
| 302 | 302 | ||
| 303 | // Hard FPS limits | 303 | // Hard FPS limits |
| 304 | if (fps > VIDEO_TRANSCODING_FPS.MAX) fps = getClosestFramerateStandard(fps, 'HD_STANDARD') | 304 | if (fps > VIDEO_TRANSCODING_FPS.MAX) fps = getClosestFramerateStandard(fps, 'HD_STANDARD') |
| 305 | else if (fps < VIDEO_TRANSCODING_FPS.MIN) fps = VIDEO_TRANSCODING_FPS.MIN | 305 | |
| 306 | if (fps < VIDEO_TRANSCODING_FPS.MIN) { | ||
| 307 | throw new Error(`Cannot compute FPS because ${fps} is lower than our minimum value ${VIDEO_TRANSCODING_FPS.MIN}`) | ||
| 308 | } | ||
| 306 | 309 | ||
| 307 | return fps | 310 | return fps |
| 308 | } | 311 | } |