From: Chocobozzz <me@florianbigard.com>
Date: Wed, 17 Oct 2018 15:58:21 +0000 (+0200)
Subject: Oup's
X-Git-Tag: v1.1.0-alpha.2~23
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=28e51e831bd121f063600a597d7b02f8fd846de9;p=oweals%2Fpeertube.git

Oup's
---

diff --git a/server/helpers/ffmpeg-utils.ts b/server/helpers/ffmpeg-utils.ts
index a53a7bae4..037bf703a 100644
--- a/server/helpers/ffmpeg-utils.ts
+++ b/server/helpers/ffmpeg-utils.ts
@@ -118,13 +118,13 @@ function transcode (options: TranscodeOptions) {
   return new Promise<void>(async (res, rej) => {
     let fps = await getVideoFileFPS(options.inputPath)
     // On small/medium resolutions, limit FPS
-    // if (
-    //   options.resolution !== undefined &&
-    //   options.resolution < VIDEO_TRANSCODING_FPS.KEEP_ORIGIN_FPS_RESOLUTION_MIN &&
-    //   fps > VIDEO_TRANSCODING_FPS.AVERAGE
-    // ) {
-    //   fps = VIDEO_TRANSCODING_FPS.AVERAGE
-    // }
+    if (
+      options.resolution !== undefined &&
+      options.resolution < VIDEO_TRANSCODING_FPS.KEEP_ORIGIN_FPS_RESOLUTION_MIN &&
+      fps > VIDEO_TRANSCODING_FPS.AVERAGE
+    ) {
+      fps = VIDEO_TRANSCODING_FPS.AVERAGE
+    }
 
     let command = ffmpeg(options.inputPath, { niceness: FFMPEG_NICE.TRANSCODING })
                     .output(options.outputPath)