Merge remote-tracking branch 'origin/feature/gpu-encoding' into featu…

…re/gpu-encoding
cybex-gmbh · Aug 22, 2024 · 2c7c0f7 · 2c7c0f7
2 parents 3180598 + c339c58
commit 2c7c0f7
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/app/Enums/Encoder.php b/app/Enums/Encoder.php
@@ -11,18 +11,19 @@ enum Encoder: string
 
     public function getAdditionalParameters(bool $forMp4Fallback = false): array
     {
-        $enumParameters = match ($this) {
-            Encoder::NVIDIA_H264 => ['-c:v', 'h264_nvenc'],
-            Encoder::NVIDIA_HEVC => ['-c:v', 'hevc_nvenc'],
-            default => [],
-        };
         $configuredParameters = config(sprintf('encoder.%s', $this->value), []);
 
         if ($forMp4Fallback) {
             $enumParameters = match ($this) {
                 Encoder::NVIDIA_H264, Encoder::NVIDIA_HEVC => ['-c:v', 'h264_nvenc', '-b:v', env('TRANSMORPHER_VIDEO_ENCODER_BITRATE', '6000k')],
                 default => ['-b:v', env('TRANSMORPHER_VIDEO_ENCODER_BITRATE', '6000k')],
             };
+        } else {
+            $enumParameters = match ($this) {
+                Encoder::NVIDIA_H264 => ['-c:v', 'h264_nvenc'],
+                Encoder::NVIDIA_HEVC => ['-c:v', 'hevc_nvenc'],
+                default => [],
+            };
         }
 
         return array_merge($enumParameters, $configuredParameters);