From 34aa42d821f8fbb811cc3577b57356b42c02d8fa Mon Sep 17 00:00:00 2001 From: John Andrews Date: Wed, 31 Jan 2024 10:06:39 +1300 Subject: [PATCH] FF-1224 - fixed vaapi issues --- VideoNodes/FfmpegBuilderNodes/FfmpegBuilderExecutor.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/VideoNodes/FfmpegBuilderNodes/FfmpegBuilderExecutor.cs b/VideoNodes/FfmpegBuilderNodes/FfmpegBuilderExecutor.cs index db7508aa..9169391a 100644 --- a/VideoNodes/FfmpegBuilderNodes/FfmpegBuilderExecutor.cs +++ b/VideoNodes/FfmpegBuilderNodes/FfmpegBuilderExecutor.cs @@ -221,7 +221,7 @@ public class FfmpegBuilderExecutor: FfmpegBuilderNode if (video?.EncodingParameters?.Any() == true) { encodingParameters.Add("-c:v:" + video.Stream.TypeIndex); - encodingParameters.AddRange(video.EncodingParameters.Select(x => + encodingParameters.AddRange(video.EncodingParameters.Union(video.Filter ?? new ()).Select(x => x.Replace("{index}", video.Stream.Index.ToString()))); } @@ -332,6 +332,8 @@ public class FfmpegBuilderExecutor: FfmpegBuilderNode var hw = hwOrig.Select(x => x.Replace("#FORMAT#", pixelFormat)).ToArray(); + + hw = EncoderAdjustments.EncoderAdjustment.Run(args.Logger, hw.ToList()).ToArray(); args.AdditionalInfoRecorder("Testing", string.Join(" ", hw), new TimeSpan(0, 0, 10)); @@ -531,6 +533,7 @@ public class FfmpegBuilderExecutor: FfmpegBuilderNode noQsv ? null : new [] { "-hwaccel", "qsv", "-hwaccel_output_format", "qsv" }, noQsv ? null : new [] { "-hwaccel", "qsv" }, noVaapi ? null : new [] { "-hwaccel", "vaapi" }, + noVaapi ? null : new [] { "-hwaccel", "vaapi", "-v" }, noVaapi ? null : new [] { "-hwaccel", "vaapi", "-hwaccel_output_format", "vaapi" }, noVulkan ? null : new [] { "-hwaccel", "vulkan", "-hwaccel_output_format", "vulkan" }, noDxva2 ? null : new [] { "-hwaccel", "dxva2" },