From 257384ea9b35743fda9e2de8a25bbefd99e96593 Mon Sep 17 00:00:00 2001 From: Jason Dove Date: Wed, 5 Jan 2022 08:29:52 -0600 Subject: [PATCH] fix health checks (#556) * update bundled ffmpeg version in health check * recognize qsv acceleration on linux * update changelog --- CHANGELOG.md | 1 + .../Health/Checks/FFmpegVersionHealthCheck.cs | 2 +- .../Health/Checks/HardwareAccelerationHealthCheck.cs | 6 +----- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3cdb323ba..5abcbf7e4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ### Fixed - Fix bundled ffmpeg version in base docker image (NOT nvidia or vaapi) which prevented playback since v0.3.0-alpha - Use software decoding for mpeg4 content when VAAPI acceleration is enabled +- Fix hardware acceleration health check to recognize QSV on non-Windows platforms ### Changed - Treat `setsar` as a hardware filter, avoiding unneeded `hwdownload` and `hwupload` steps when padding isn't required diff --git a/ErsatzTV.Infrastructure/Health/Checks/FFmpegVersionHealthCheck.cs b/ErsatzTV.Infrastructure/Health/Checks/FFmpegVersionHealthCheck.cs index 074c71913..d02dc2d80 100644 --- a/ErsatzTV.Infrastructure/Health/Checks/FFmpegVersionHealthCheck.cs +++ b/ErsatzTV.Infrastructure/Health/Checks/FFmpegVersionHealthCheck.cs @@ -11,7 +11,7 @@ namespace ErsatzTV.Infrastructure.Health.Checks { public class FFmpegVersionHealthCheck : BaseHealthCheck, IFFmpegVersionHealthCheck { - private const string BundledVersion = "N-104321-ga742ba60f1"; + private const string BundledVersion = "N-105153-g8abc192236"; private readonly IConfigElementRepository _configElementRepository; public FFmpegVersionHealthCheck(IConfigElementRepository configElementRepository) diff --git a/ErsatzTV.Infrastructure/Health/Checks/HardwareAccelerationHealthCheck.cs b/ErsatzTV.Infrastructure/Health/Checks/HardwareAccelerationHealthCheck.cs index 768168f23..ff4479dcc 100644 --- a/ErsatzTV.Infrastructure/Health/Checks/HardwareAccelerationHealthCheck.cs +++ b/ErsatzTV.Infrastructure/Health/Checks/HardwareAccelerationHealthCheck.cs @@ -113,11 +113,7 @@ namespace ErsatzTV.Infrastructure.Health.Checks result.Add(HardwareAccelerationKind.Nvenc); break; case "qsv": - // qsv is only supported on windows - if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) - { - result.Add(HardwareAccelerationKind.Qsv); - } + result.Add(HardwareAccelerationKind.Qsv); break; } }