From fa2860ad464d3f92845dd076061671e57d53cbfc Mon Sep 17 00:00:00 2001 From: John Andrews Date: Wed, 31 Jan 2024 14:32:10 +1300 Subject: [PATCH] FF-1224 - fixed vaapi issues --- .../FfmpegBuilderNodes/FfmpegBuilderExecutor.cs | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/VideoNodes/FfmpegBuilderNodes/FfmpegBuilderExecutor.cs b/VideoNodes/FfmpegBuilderNodes/FfmpegBuilderExecutor.cs index dab175da..71988431 100644 --- a/VideoNodes/FfmpegBuilderNodes/FfmpegBuilderExecutor.cs +++ b/VideoNodes/FfmpegBuilderNodes/FfmpegBuilderExecutor.cs @@ -222,8 +222,14 @@ public class FfmpegBuilderExecutor: FfmpegBuilderNode if (video?.EncodingParameters?.Any() == true) { encodingParameters.Add("-c:v:" + video.Stream.TypeIndex); - encodingParameters.AddRange(video.EncodingParameters.Union(video.Filter ?? new ()).Select(x => - x.Replace("{index}", video.Stream.Index.ToString()))); + encodingParameters.AddRange(video.EncodingParameters); + if (video.Filter?.Any() == true) + { + encodingParameters.Add("-filter:v:" + video.Stream.TypeIndex); + encodingParameters.AddRange(video.Filter); + } + encodingParameters = encodingParameters.Select(x => + x.Replace("{index}", video.Stream.Index.ToString())).ToList(); } var decodingParameters = @@ -334,9 +340,12 @@ public class FfmpegBuilderExecutor: FfmpegBuilderNode var hw = hwOrig.Select(x => x.Replace("#FORMAT#", pixelFormat)).ToArray(); - if(VaapiAdjustments.IsUsingVaapi(hw)) + if (hw.Any(x => x.ToLowerInvariant().Contains("vaapi"))) + { + args.Logger?.ILog("VAAPI detected adjusting parameters for testing"); hw = new VaapiAdjustments().Run(args.Logger, hw.ToList()).ToArray(); - + } + args.AdditionalInfoRecorder("Testing", string.Join(" ", hw), new TimeSpan(0, 0, 10)); try