From 8d95b19b1d8c0bba0e5e32743cd5bd96b92f4b4e Mon Sep 17 00:00:00 2001 From: Jason Dove <1695733+jasongdove@users.noreply.github.com> Date: Mon, 25 Nov 2024 14:07:39 -0600 Subject: [PATCH] update logging --- .../HardwareCapabilitiesFactory.cs | 24 +++++++++++++------ ErsatzTV/Pages/FFmpegEditor.razor | 16 ++++++------- 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/ErsatzTV.FFmpeg/Capabilities/HardwareCapabilitiesFactory.cs b/ErsatzTV.FFmpeg/Capabilities/HardwareCapabilitiesFactory.cs index e5ca2709..2c09ddb1 100644 --- a/ErsatzTV.FFmpeg/Capabilities/HardwareCapabilitiesFactory.cs +++ b/ErsatzTV.FFmpeg/Capabilities/HardwareCapabilitiesFactory.cs @@ -326,12 +326,22 @@ public class HardwareCapabilitiesFactory : IHardwareCapabilitiesFactory if (profileEntrypoints is not null && profileEntrypoints.Count != 0) { - _logger.LogDebug( - "Detected {Count} VAAPI profile entrypoints for using {Display} {Driver} {Device}", - profileEntrypoints.Count, - display, - driver, - device); + if (display == "drm") + { + _logger.LogDebug( + "Detected {Count} VAAPI profile entrypoints using {Driver} {Device}", + profileEntrypoints.Count, + driver, + device); + } + else + { + _logger.LogDebug( + "Detected {Count} VAAPI profile entrypoints using {Display} {Driver}", + profileEntrypoints.Count, + display, + driver); + } _memoryCache.Set(cacheKey, profileEntrypoints); return new VaapiHardwareCapabilities(profileEntrypoints, _logger); } @@ -394,7 +404,7 @@ public class HardwareCapabilitiesFactory : IHardwareCapabilitiesFactory if (profileEntrypoints is not null && profileEntrypoints.Count != 0) { _logger.LogDebug( - "Detected {Count} VAAPI profile entrypoints for using QSV device {Device}", + "Detected {Count} VAAPI profile entrypoints using QSV device {Device}", profileEntrypoints.Count, device); diff --git a/ErsatzTV/Pages/FFmpegEditor.razor b/ErsatzTV/Pages/FFmpegEditor.razor index 2dcd809e..693fefa5 100644 --- a/ErsatzTV/Pages/FFmpegEditor.razor +++ b/ErsatzTV/Pages/FFmpegEditor.razor @@ -110,12 +110,10 @@ @if (_model.HardwareAcceleration == HardwareAccelerationKind.Vaapi) { - - @foreach (string display in _vaapiDisplays) + + @foreach (VaapiDriver driver in Enum.GetValues()) { - @display + @driver } @@ -124,10 +122,12 @@ @if (_model.HardwareAcceleration == HardwareAccelerationKind.Vaapi) { - - @foreach (VaapiDriver driver in Enum.GetValues()) + + @foreach (string display in _vaapiDisplays) { - @driver + @display }