From d597723ddc529f5aba9ad4821956dc360ef76d29 Mon Sep 17 00:00:00 2001
From: Jason Dove <1695733+jasongdove@users.noreply.github.com>
Date: Mon, 25 Nov 2024 14:03:05 -0600
Subject: [PATCH] fix vainfo device syntax

---
 .../Capabilities/HardwareCapabilitiesFactory.cs      | 12 ++++++------
 ErsatzTV/Pages/FFmpegEditor.razor                    |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ErsatzTV.FFmpeg/Capabilities/HardwareCapabilitiesFactory.cs b/ErsatzTV.FFmpeg/Capabilities/HardwareCapabilitiesFactory.cs
index 5c4d5f74..e5ca2709 100644
--- a/ErsatzTV.FFmpeg/Capabilities/HardwareCapabilitiesFactory.cs
+++ b/ErsatzTV.FFmpeg/Capabilities/HardwareCapabilitiesFactory.cs
@@ -172,19 +172,19 @@ public class HardwareCapabilitiesFactory : IHardwareCapabilitiesFactory
 
         var lines = new List<string>();
 
+        string arguments = display == "drm"
+            ? $"--display drm --device {vaapiDevice} -a"
+            : $"--display {display} -a";
+
         await Cli.Wrap("vainfo")
-            .WithArguments($"--display {display} --device {vaapiDevice} -a")
+            .WithArguments(arguments)
             .WithEnvironmentVariables(envVars)
             .WithValidation(CommandResultValidation.None)
             .WithStandardOutputPipe(PipeTarget.ToDelegate(lines.Add))
             .WithStandardErrorPipe(PipeTarget.ToDelegate(lines.Add))
             .ExecuteAsync();
 
-        var mergedOutput = string.Join(System.Environment.NewLine, lines);
-
-        return mergedOutput.Contains("trying display", StringComparison.OrdinalIgnoreCase)
-            ? mergedOutput
-            : string.Empty;
+        return string.Join(System.Environment.NewLine, lines);
     }
 
     public async Task<List<string>> GetVaapiDisplays()
diff --git a/ErsatzTV/Pages/FFmpegEditor.razor b/ErsatzTV/Pages/FFmpegEditor.razor
index 3b5213a0..2dcd809e 100644
--- a/ErsatzTV/Pages/FFmpegEditor.razor
+++ b/ErsatzTV/Pages/FFmpegEditor.razor
@@ -133,7 +133,7 @@
                                             </MudElement>
                                         }
 
-                                        @if (_model.HardwareAcceleration is HardwareAccelerationKind.Vaapi or HardwareAccelerationKind.Qsv)
+                                        @if ((_model.HardwareAcceleration is HardwareAccelerationKind.Vaapi && _model.VaapiDisplay == "drm") || _model.HardwareAcceleration is HardwareAccelerationKind.Qsv)
                                         {
                                             <MudElement HtmlTag="div" Class="mt-3">
                                                 <MudSelect Disabled="@(_model.HardwareAcceleration != HardwareAccelerationKind.Vaapi && _model.HardwareAcceleration != HardwareAccelerationKind.Qsv)"