From 93673fce039ab5720fc5b67436d1cd9de6b74106 Mon Sep 17 00:00:00 2001 From: Jason Dove Date: Thu, 15 Dec 2022 19:32:48 -0600 Subject: [PATCH] add more logging to vaapi capabilities detection (#1059) --- .../Capabilities/HardwareCapabilitiesFactory.cs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/ErsatzTV.FFmpeg/Capabilities/HardwareCapabilitiesFactory.cs b/ErsatzTV.FFmpeg/Capabilities/HardwareCapabilitiesFactory.cs index c3749455b..08eb6b9dd 100644 --- a/ErsatzTV.FFmpeg/Capabilities/HardwareCapabilitiesFactory.cs +++ b/ErsatzTV.FFmpeg/Capabilities/HardwareCapabilitiesFactory.cs @@ -57,7 +57,8 @@ public class HardwareCapabilitiesFactory : IHardwareCapabilitiesFactory string device = vaapiDevice.IfNone(string.Empty); var cacheKey = string.Format(VaapiCacheKeyFormat, driver, device); - if (_memoryCache.TryGetValue(cacheKey, out List profileEntrypoints)) + if (_memoryCache.TryGetValue(cacheKey, out List? profileEntrypoints) && + profileEntrypoints is not null) { return new VaapiHardwareCapabilities(profileEntrypoints, _logger); } @@ -111,9 +112,12 @@ public class HardwareCapabilitiesFactory : IHardwareCapabilitiesFactory return new VaapiHardwareCapabilities(profileEntrypoints, _logger); } } - catch + catch (Exception ex) { - // ignored + _logger.LogWarning( + ex, + "Error detecting VAAPI capabilities; some hardware accelerated features will be unavailable"); + return new NoHardwareCapabilities(); } _logger.LogWarning(