Browse Source

fix vainfo device syntax

pull/1949/head
Jason Dove 8 months ago
parent
commit
d597723ddc
No known key found for this signature in database
  1. 12
      ErsatzTV.FFmpeg/Capabilities/HardwareCapabilitiesFactory.cs
  2. 2
      ErsatzTV/Pages/FFmpegEditor.razor

12
ErsatzTV.FFmpeg/Capabilities/HardwareCapabilitiesFactory.cs

@ -172,19 +172,19 @@ public class HardwareCapabilitiesFactory : IHardwareCapabilitiesFactory
var lines = new List<string>(); var lines = new List<string>();
string arguments = display == "drm"
? $"--display drm --device {vaapiDevice} -a"
: $"--display {display} -a";
await Cli.Wrap("vainfo") await Cli.Wrap("vainfo")
.WithArguments($"--display {display} --device {vaapiDevice} -a") .WithArguments(arguments)
.WithEnvironmentVariables(envVars) .WithEnvironmentVariables(envVars)
.WithValidation(CommandResultValidation.None) .WithValidation(CommandResultValidation.None)
.WithStandardOutputPipe(PipeTarget.ToDelegate(lines.Add)) .WithStandardOutputPipe(PipeTarget.ToDelegate(lines.Add))
.WithStandardErrorPipe(PipeTarget.ToDelegate(lines.Add)) .WithStandardErrorPipe(PipeTarget.ToDelegate(lines.Add))
.ExecuteAsync(); .ExecuteAsync();
var mergedOutput = string.Join(System.Environment.NewLine, lines); return string.Join(System.Environment.NewLine, lines);
return mergedOutput.Contains("trying display", StringComparison.OrdinalIgnoreCase)
? mergedOutput
: string.Empty;
} }
public async Task<List<string>> GetVaapiDisplays() public async Task<List<string>> GetVaapiDisplays()

2
ErsatzTV/Pages/FFmpegEditor.razor

@ -133,7 +133,7 @@
</MudElement> </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"> <MudElement HtmlTag="div" Class="mt-3">
<MudSelect Disabled="@(_model.HardwareAcceleration != HardwareAccelerationKind.Vaapi && _model.HardwareAcceleration != HardwareAccelerationKind.Qsv)" <MudSelect Disabled="@(_model.HardwareAcceleration != HardwareAccelerationKind.Vaapi && _model.HardwareAcceleration != HardwareAccelerationKind.Qsv)"

Loading…
Cancel
Save