go-vod: add software transpose config

Signed-off-by: Varun Patil <[email protected]>
pulsejet · Apr 25, 2024 · 1d810df · 1d810df
1 parent 62d1110
commit 1d810df
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 2 deletions.
diff --git a/go-vod/transcoder/config.go b/go-vod/transcoder/config.go
@@ -58,6 +58,8 @@ type Config struct {
 
 	// Use transpose workaround for streaming (VA-API)
 	UseTranspose bool `json:"useTranspose"`
+	// Force tranpose in software
+	ForceSwTranspose bool `json:"forceSwTranspose"`
 
 	// Use GOP size workaround for streaming (NVENC)
 	UseGopSize bool `json:"useGopSize"`

diff --git a/go-vod/transcoder/stream.go b/go-vod/transcoder/stream.go
@@ -441,9 +441,9 @@ func (s *Stream) transcodeArgs(startAt float64, isHls bool) []string {
 
 			// Force rotation in software instead.
 			// For example, if we desire not to use transpose_vaapi for some reason.
-			forceSwTranspose := transposer != "transpose" && (false || transposer == "transpose_cuda")
+			forceSwTranspose := transposer != "transpose" && (s.c.ForceSwTranspose || transposer == "transpose_cuda")
 
-			// If we are forcing software, download the video and rotate it
+			// Use CPU transpose if forcing software
 			if forceSwTranspose {
 				transposer = "transpose"
 			}

diff --git a/lib/Service/BinExt.php b/lib/Service/BinExt.php
@@ -186,6 +186,7 @@ public static function getGoVodConfig(bool $local = false): array
             'nvencScale' => SystemConfig::get('memories.vod.nvenc.scale'),
 
             'useTranspose' => SystemConfig::get('memories.vod.use_transpose'),
+            'forceSwTranspose' => SystemConfig::get('memories.vod.use_transpose.force_sw'),
             'useGopSize' => SystemConfig::get('memories.vod.use_gop_size'),
         ];
 

diff --git a/lib/Settings/SystemConfig.php b/lib/Settings/SystemConfig.php
@@ -62,6 +62,7 @@ class SystemConfig
 
         // Extra streaming configuration
         'memories.vod.use_transpose' => false,
+        'memories.vod.use_transpose.force_sw' => false,
         'memories.vod.use_gop_size' => false,
 
         // Paths to ffmpeg and ffprobe binaries

diff --git a/src/components/admin/AdminTypes.ts b/src/components/admin/AdminTypes.ts
@@ -30,6 +30,7 @@ export type ISystemConfig = {
   'memories.vod.nvenc.scale': string;
 
   'memories.vod.use_transpose': boolean;
+  'memories.vod.use_transpose.force_sw': boolean;
   'memories.vod.use_gop_size': boolean;
 
   'memories.db.triggers.fcu': boolean;

diff --git a/src/components/admin/sections/VideoAccel.vue b/src/components/admin/sections/VideoAccel.vue
@@ -112,6 +112,12 @@
           'Due to a bug in certain hardware drivers, videos may appear in incorrect orientations when streaming. This can be resolved in some cases by rotating the video on the accelerator.',
         )
       }}
+      {{
+        t(
+          'memories',
+          'Some drivers (e.g. AMD and older Intel) do not support hardware accelerated rotation. You can attempt to force software-based transpose in this case.',
+        )
+      }}
       <br />
       <b>
         {{ t('memories', 'Try this option only if you have incorrectly oriented videos during playback.') }}
@@ -126,6 +132,15 @@
         {{ t('memories', 'Enable streaming transpose workaround') }}
       </NcCheckboxRadioSwitch>
 
+      <NcCheckboxRadioSwitch
+        :disabled="!enableTranscoding || !config['memories.vod.use_transpose']"
+        :checked.sync="config['memories.vod.use_transpose.force_sw']"
+        @update:checked="update('memories.vod.use_transpose.force_sw')"
+        type="switch"
+      >
+        {{ t('memories', 'Force transpose in software') }}
+      </NcCheckboxRadioSwitch>
+
       {{ t('memories', 'Some NVENC devices have issues with force_key_frames.') }}
       <br />
       <b>{{ t('memories', 'Try this option only if you use NVENC and have issues with video playback.') }}</b>