From 93bb7a05315e0330ffce1c0e01a1cfda6f79e0c0 Mon Sep 17 00:00:00 2001 From: Jason Dove <1695733+jasongdove@users.noreply.github.com> Date: Wed, 13 Aug 2025 17:03:52 -0500 Subject: [PATCH] skip unused hwaccel with amf (#2315) --- ...celerationOption.cs => Dxva2HardwareAccelerationOption.cs} | 4 ++-- ErsatzTV.FFmpeg/Pipeline/AmfPipelineBuilder.cs | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) rename ErsatzTV.FFmpeg/GlobalOption/HardwareAcceleration/{AmfHardwareAccelerationOption.cs => Dxva2HardwareAccelerationOption.cs} (62%) diff --git a/ErsatzTV.FFmpeg/GlobalOption/HardwareAcceleration/AmfHardwareAccelerationOption.cs b/ErsatzTV.FFmpeg/GlobalOption/HardwareAcceleration/Dxva2HardwareAccelerationOption.cs similarity index 62% rename from ErsatzTV.FFmpeg/GlobalOption/HardwareAcceleration/AmfHardwareAccelerationOption.cs rename to ErsatzTV.FFmpeg/GlobalOption/HardwareAcceleration/Dxva2HardwareAccelerationOption.cs index e8a2aa464..fbb88891d 100644 --- a/ErsatzTV.FFmpeg/GlobalOption/HardwareAcceleration/AmfHardwareAccelerationOption.cs +++ b/ErsatzTV.FFmpeg/GlobalOption/HardwareAcceleration/Dxva2HardwareAccelerationOption.cs @@ -1,8 +1,8 @@ namespace ErsatzTV.FFmpeg.GlobalOption.HardwareAcceleration; -public class AmfHardwareAccelerationOption : GlobalOption +public class Dxva2HardwareAccelerationOption : GlobalOption { - public override string[] GlobalOptions => new[] { "-hwaccel", "dxva2" }; + public override string[] GlobalOptions => ["-hwaccel", "dxva2"]; public override FrameState NextState(FrameState currentState) => currentState with { diff --git a/ErsatzTV.FFmpeg/Pipeline/AmfPipelineBuilder.cs b/ErsatzTV.FFmpeg/Pipeline/AmfPipelineBuilder.cs index b8ba10976..ca6273333 100644 --- a/ErsatzTV.FFmpeg/Pipeline/AmfPipelineBuilder.cs +++ b/ErsatzTV.FFmpeg/Pipeline/AmfPipelineBuilder.cs @@ -3,7 +3,6 @@ using ErsatzTV.FFmpeg.Encoder; using ErsatzTV.FFmpeg.Encoder.Amf; using ErsatzTV.FFmpeg.Filter; using ErsatzTV.FFmpeg.Format; -using ErsatzTV.FFmpeg.GlobalOption.HardwareAcceleration; using ErsatzTV.FFmpeg.OutputOption; using Microsoft.Extensions.Logging; @@ -60,8 +59,6 @@ public class AmfPipelineBuilder : SoftwarePipelineBuilder desiredState.VideoProfile, desiredState.PixelFormat); - pipelineSteps.Add(new AmfHardwareAccelerationOption()); - // disable hw accel if decoder/encoder isn't supported return ffmpegState with {