Browse Source

skip unused hwaccel with amf (#2315)

pull/2317/head
Jason Dove 12 months ago committed by GitHub
parent
commit
93bb7a0531
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 4
      ErsatzTV.FFmpeg/GlobalOption/HardwareAcceleration/Dxva2HardwareAccelerationOption.cs
  2. 3
      ErsatzTV.FFmpeg/Pipeline/AmfPipelineBuilder.cs

4
ErsatzTV.FFmpeg/GlobalOption/HardwareAcceleration/AmfHardwareAccelerationOption.cs → ErsatzTV.FFmpeg/GlobalOption/HardwareAcceleration/Dxva2HardwareAccelerationOption.cs

@ -1,8 +1,8 @@ @@ -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
{

3
ErsatzTV.FFmpeg/Pipeline/AmfPipelineBuilder.cs

@ -3,7 +3,6 @@ using ErsatzTV.FFmpeg.Encoder; @@ -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 @@ -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
{

Loading…
Cancel
Save