Down-integrate a few ffmpeg changes from dizque

chrisbenincasa · Apr 3, 2024 · bf3b076 · bf3b076
1 parent 67f2d14
commit bf3b076
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/server/src/ffmpeg.ts b/server/src/ffmpeg.ts
@@ -668,21 +668,25 @@ export class FFMPEG extends (events.EventEmitter as new () => TypedEventEmitter<
         `-sc_threshold`,
         `1000000000`,
       );
-      if (stillImage) {
+      if (stillImage && this.opts.videoEncoder.toLowerCase().includes('nv')) {
         ffmpegArgs.push('-tune', 'stillimage');
       }
     }
     ffmpegArgs.push('-map', currentAudio, `-flags`, `cgop+ilme`);
     if (transcodeVideo && this.audioOnly !== true) {
       // add the video encoder flags
       ffmpegArgs.push(
-        `-b:v`,
-        `${this.opts.videoBitrate}k`,
+        '-crf',
+        '22',
         `-maxrate:v`,
         `${this.opts.videoBitrate}k`,
         `-bufsize:v`,
         `${this.opts.videoBufferSize}k`,
       );
+
+      if (this.opts.videoEncoder.toLowerCase() === 'mpeg2video') {
+        ffmpegArgs.push('-qscale:v', '1', '-b:v', `${this.opts.videoBitrate}k`);
+      }
     }
     if (transcodeAudio) {
       // add the audio encoder flags