From f7bb2bb5a753b3f1a37301dcff2d58e434ecd3af Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 12 Oct 2021 10:37:25 +0200 Subject: [PATCH] Don't use min FPS, throw instead Avoir creating a big output from a very low FPS input file --- server/helpers/ffprobe-utils.ts | 5 ++++- server/initializers/constants.ts | 2 +- 2 files changed, 5 insertions(+), 2 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) { // Hard FPS limits if (fps > VIDEO_TRANSCODING_FPS.MAX) fps = getClosestFramerateStandard(fps, 'HD_STANDARD') - else if (fps < VIDEO_TRANSCODING_FPS.MIN) fps = VIDEO_TRANSCODING_FPS.MIN + + if (fps < VIDEO_TRANSCODING_FPS.MIN) { + throw new Error(`Cannot compute FPS because ${fps} is lower than our minimum value ${VIDEO_TRANSCODING_FPS.MIN}`) + } return fps } diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts index 2fa0aa7bf..facd3b721 100644 --- a/server/initializers/constants.ts +++ b/server/initializers/constants.ts @@ -346,7 +346,7 @@ const VIEW_LIFETIME = { let CONTACT_FORM_LIFETIME = 60000 * 60 // 1 hour const VIDEO_TRANSCODING_FPS: VideoTranscodingFPS = { - MIN: 10, + MIN: 1, STANDARD: [ 24, 25, 30 ], HD_STANDARD: [ 50, 60 ], AVERAGE: 30, -- 2.41.0