From 2351f87528be0714c0bb89391f2e5e30bf83db2a Mon Sep 17 00:00:00 2001 From: John Andrews Date: Wed, 31 Jan 2024 01:26:59 +1300 Subject: [PATCH] removing vaapi from output format for first decoder test --- .../FfmpegBuilderNodes/EncoderAdjustments/VaapiAdjustments.cs | 4 ++-- VideoNodes/FfmpegBuilderNodes/FfmpegBuilderExecutor.cs | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/VideoNodes/FfmpegBuilderNodes/EncoderAdjustments/VaapiAdjustments.cs b/VideoNodes/FfmpegBuilderNodes/EncoderAdjustments/VaapiAdjustments.cs index 795fc100..ccb50ec0 100644 --- a/VideoNodes/FfmpegBuilderNodes/EncoderAdjustments/VaapiAdjustments.cs +++ b/VideoNodes/FfmpegBuilderNodes/EncoderAdjustments/VaapiAdjustments.cs @@ -22,7 +22,7 @@ public class VaapiAdjustments : IEncoderAdjustment /// the adjusted arguments public List Run(ILogger logger, List args) { - logger.ILog("Original VAAPI parameters: \n" + string.Join("\n", args)); + //logger.ILog("Original VAAPI parameters: \n" + string.Join("\n", args)); int iIndex = args.IndexOf("-i"); if (iIndex >= 0 && VaapiHelper.VaapiLinux) { @@ -115,7 +115,7 @@ public class VaapiAdjustments : IEncoderAdjustment // if(filterV0 > 0 && filterV0 < args.Count - 1 && args[filterV0 + 1].StartsWith("-")) // args.RemoveAt(filterV0); - logger.ILog("Updated VAAPI parameters: \n" + string.Join("\n", args)); + //logger.ILog("Updated VAAPI parameters: \n" + string.Join("\n", args)); return args; } } \ No newline at end of file diff --git a/VideoNodes/FfmpegBuilderNodes/FfmpegBuilderExecutor.cs b/VideoNodes/FfmpegBuilderNodes/FfmpegBuilderExecutor.cs index 695b44aa..db7508aa 100644 --- a/VideoNodes/FfmpegBuilderNodes/FfmpegBuilderExecutor.cs +++ b/VideoNodes/FfmpegBuilderNodes/FfmpegBuilderExecutor.cs @@ -447,6 +447,7 @@ public class FfmpegBuilderExecutor: FfmpegBuilderNode //noQsv ? null : new [] { "-hwaccel", "qsv", "-hwaccel_output_format", "p010le" }, noQsv ? null : new [] { "-hwaccel", "qsv", "-hwaccel_output_format", "qsv" }, noQsv ? null : new [] { "-hwaccel", "qsv" }, + noVaapi ? null : new [] { "-hwaccel", "vaapi" }, noVaapi ? null : new [] { "-hwaccel", "vaapi", "-hwaccel_output_format", "vaapi" }, noVulkan ? null : new [] { "-hwaccel", "vulkan", "-hwaccel_output_format", "vulkan" }, noDxva2 ? null : new [] { "-hwaccel", "dxva2" }, @@ -487,6 +488,7 @@ public class FfmpegBuilderExecutor: FfmpegBuilderNode noQsv ? null : new [] { "-hwaccel", "qsv", "-hwaccel_output_format", "#FORMAT#" }, noQsv ? null : new [] { "-hwaccel", "qsv", "-hwaccel_output_format", "qsv" }, noQsv ? null : new [] { "-hwaccel", "qsv" }, + noVaapi ? null : new [] { "-hwaccel", "vaapi" }, noVaapi ? null : new [] { "-hwaccel", "vaapi", "-hwaccel_output_format", "vaapi" }, noVulkan ? null : new [] { "-hwaccel", "vulkan", "-hwaccel_output_format", "vulkan" }, noDxva2 ? null : new [] { "-hwaccel", "dxva2" }, @@ -528,6 +530,7 @@ public class FfmpegBuilderExecutor: FfmpegBuilderNode //noQsv ? null : new [] { "-hwaccel", "qsv", "-hwaccel_output_format", "p010le" }, noQsv ? null : new [] { "-hwaccel", "qsv", "-hwaccel_output_format", "qsv" }, noQsv ? null : new [] { "-hwaccel", "qsv" }, + noVaapi ? null : new [] { "-hwaccel", "vaapi" }, noVaapi ? null : new [] { "-hwaccel", "vaapi", "-hwaccel_output_format", "vaapi" }, noVulkan ? null : new [] { "-hwaccel", "vulkan", "-hwaccel_output_format", "vulkan" }, noDxva2 ? null : new [] { "-hwaccel", "dxva2" },