Browse Source

fix decode capability ordering

pull/2654/head
Jason Dove 8 months ago
parent
commit
c405346354
No known key found for this signature in database
  1. 20
      ErsatzTV.FFmpeg/Pipeline/VaapiPipelineBuilder.cs

20
ErsatzTV.FFmpeg/Pipeline/VaapiPipelineBuilder.cs

@ -85,16 +85,6 @@ public class VaapiPipelineBuilder : SoftwarePipelineBuilder @@ -85,16 +85,6 @@ public class VaapiPipelineBuilder : SoftwarePipelineBuilder
throw new NotSupportedException("AV1 output is only supported with HLS Segmenter (fmp4)");
}
foreach (string vaapiDevice in ffmpegState.VaapiDevice)
{
pipelineSteps.Add(new VaapiHardwareAccelerationOption(vaapiDevice, decodeCapability));
foreach (string driverName in ffmpegState.VaapiDriver)
{
pipelineSteps.Add(new LibvaDriverNameVariable(driverName));
}
}
// use software decoding with an extensive pipeline
if (context is { HasSubtitleOverlay: true, HasWatermark: true })
{
@ -111,6 +101,16 @@ public class VaapiPipelineBuilder : SoftwarePipelineBuilder @@ -111,6 +101,16 @@ public class VaapiPipelineBuilder : SoftwarePipelineBuilder
}
}
foreach (string vaapiDevice in ffmpegState.VaapiDevice)
{
pipelineSteps.Add(new VaapiHardwareAccelerationOption(vaapiDevice, decodeCapability));
foreach (string driverName in ffmpegState.VaapiDriver)
{
pipelineSteps.Add(new LibvaDriverNameVariable(driverName));
}
}
// disable auto scaling when using hw encoding
if (encodeCapability is FFmpegCapability.Hardware)
{

Loading…
Cancel
Save