From 1576dd026e471340491923835a4e154e0479f326 Mon Sep 17 00:00:00 2001 From: Jason Dove Date: Sun, 22 May 2022 18:43:24 -0500 Subject: [PATCH] enable qsv accel for vaapi docker images (#817) --- CHANGELOG.md | 3 +++ .../Health/Checks/FFmpegVersionHealthCheck.cs | 3 ++- docker/vaapi/ffmpeg.Dockerfile | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f86db4f25..83bb6af37 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ### Fixed - Additional fix for duplicate `Other Videos` entries; trash may need to be emptied one last time after upgrading +### Added +- Enable QSV hardware acceleration for vaapi docker images + ## [0.5.8-beta] - 2022-05-20 ### Fixed - Fix error display with `HLS Segmenter` and `MPEG-TS` streaming modes diff --git a/ErsatzTV.Infrastructure/Health/Checks/FFmpegVersionHealthCheck.cs b/ErsatzTV.Infrastructure/Health/Checks/FFmpegVersionHealthCheck.cs index 19a9331ad..b01eb5cf0 100644 --- a/ErsatzTV.Infrastructure/Health/Checks/FFmpegVersionHealthCheck.cs +++ b/ErsatzTV.Infrastructure/Health/Checks/FFmpegVersionHealthCheck.cs @@ -9,6 +9,7 @@ namespace ErsatzTV.Infrastructure.Health.Checks; public class FFmpegVersionHealthCheck : BaseHealthCheck, IFFmpegVersionHealthCheck { private const string BundledVersion = "N-106635-g83e1a1de88"; + private const string BundledVersionVaapi = "N-106957-g27cffd16aa"; private readonly IConfigElementRepository _configElementRepository; public FFmpegVersionHealthCheck(IConfigElementRepository configElementRepository) => @@ -74,7 +75,7 @@ public class FFmpegVersionHealthCheck : BaseHealthCheck, IFFmpegVersionHealthChe return FailResult($"{app} version {version} is too old; please install 5.0!"); } - if (!version.StartsWith("5.0") && version != BundledVersion) + if (!version.StartsWith("5.0") && version != BundledVersion && version != BundledVersionVaapi) { return WarningResult( $"{app} version {version} is unexpected and may have problems; please install 5.0!"); diff --git a/docker/vaapi/ffmpeg.Dockerfile b/docker/vaapi/ffmpeg.Dockerfile index f01d9d7eb..8618fd122 100644 --- a/docker/vaapi/ffmpeg.Dockerfile +++ b/docker/vaapi/ffmpeg.Dockerfile @@ -10,6 +10,7 @@ RUN apt-get update && DEBIAN_FRONTEND="noninteractive" apt-get install -y libicu autoconf \ libtool \ libdrm-dev \ + libmfx-dev \ git \ pkg-config \ build-essential \