From 047d58fbf7b1fc82e46a1e89b25e06ab7441ea5d Mon Sep 17 00:00:00 2001 From: John Andrews Date: Mon, 29 Jan 2024 02:43:23 +1300 Subject: [PATCH] fixing pixel format issue --- .../FfmpegBuilderVideoEncode/FfmpegBuilderVideoEncode.cs | 8 ++++---- .../Video/FfmpegBuilderVideoEncode/h26x.cs | 6 +----- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/VideoNodes/FfmpegBuilderNodes/Video/FfmpegBuilderVideoEncode/FfmpegBuilderVideoEncode.cs b/VideoNodes/FfmpegBuilderNodes/Video/FfmpegBuilderVideoEncode/FfmpegBuilderVideoEncode.cs index bc0c93fc..f4c3dac1 100644 --- a/VideoNodes/FfmpegBuilderNodes/Video/FfmpegBuilderVideoEncode/FfmpegBuilderVideoEncode.cs +++ b/VideoNodes/FfmpegBuilderNodes/Video/FfmpegBuilderVideoEncode/FfmpegBuilderVideoEncode.cs @@ -246,7 +246,7 @@ public partial class FfmpegBuilderVideoEncode:FfmpegBuilderNode else if (encoder == ENCODER_NVIDIA) parameters.AddRange(H26x_Nvidia(false, quality, speed, out non10BitFilters)); else if (encoder == ENCODER_QSV) - parameters.AddRange(H26x_Qsv(false, quality, 0, speed, out non10BitFilters)); + parameters.AddRange(H26x_Qsv(false, quality, 0, speed)); else if (encoder == ENCODER_AMF) parameters.AddRange(H26x_Amd(false, quality, speed)); else if (encoder == ENCODER_VAAPI) @@ -257,7 +257,7 @@ public partial class FfmpegBuilderVideoEncode:FfmpegBuilderNode parameters.AddRange(H26x_Nvidia(false, quality, speed, out non10BitFilters)); else if (CanUseHardwareEncoding.CanProcess_Qsv_H264(args)) { - parameters.AddRange(H26x_Qsv(false, quality, 0, speed, out non10BitFilters)); + parameters.AddRange(H26x_Qsv(false, quality, 0, speed)); encoder = ENCODER_QSV; } else if (CanUseHardwareEncoding.CanProcess_Amd_H264(args)) @@ -291,7 +291,7 @@ public partial class FfmpegBuilderVideoEncode:FfmpegBuilderNode parameters.AddRange(H26x_Nvidia(true, quality, speed, out non10BitFilters)); else if (encoder == ENCODER_QSV) { - parameters.AddRange(H26x_Qsv(true, quality, fps, speed, out non10BitFilters)); + parameters.AddRange(H26x_Qsv(true, quality, fps, speed)); qsv = true; } else if (encoder == ENCODER_AMF) @@ -305,7 +305,7 @@ public partial class FfmpegBuilderVideoEncode:FfmpegBuilderNode parameters.AddRange(H26x_Nvidia(true, quality, speed, out non10BitFilters)); else if (CanUseHardwareEncoding.CanProcess_Qsv_Hevc(args)) { - parameters.AddRange(H26x_Qsv(true, quality, fps, speed, out non10BitFilters)); + parameters.AddRange(H26x_Qsv(true, quality, fps, speed)); qsv = true; } else if (CanUseHardwareEncoding.CanProcess_Amd_Hevc(args)) diff --git a/VideoNodes/FfmpegBuilderNodes/Video/FfmpegBuilderVideoEncode/h26x.cs b/VideoNodes/FfmpegBuilderNodes/Video/FfmpegBuilderVideoEncode/h26x.cs index 368e3369..4a69079b 100644 --- a/VideoNodes/FfmpegBuilderNodes/Video/FfmpegBuilderVideoEncode/h26x.cs +++ b/VideoNodes/FfmpegBuilderNodes/Video/FfmpegBuilderVideoEncode/h26x.cs @@ -36,12 +36,8 @@ public partial class FfmpegBuilderVideoEncode }; } - private static IEnumerable H26x_Qsv(bool h265, int quality, float fps, string speed, out string[] non10BitFilters) + private static IEnumerable H26x_Qsv(bool h265, int quality, float fps, string speed) { - if (h265 == false) - non10BitFilters = new[] { "-pix_fmt:v:{index}", "nv12" }; - else - non10BitFilters = null; //hevc_qsv -load_plugin hevc_hw -pix_fmt p010le -profile:v main10 -global_quality 21 -g 24 -look_ahead 1 -look_ahead_depth 60 var parameters = new List(); if (h265)