From a42e20917bad88badc15c39ac58588b449d75f52 Mon Sep 17 00:00:00 2001 From: John Andrews Date: Sat, 18 Jun 2022 09:47:12 +1200 Subject: [PATCH] fixing can use hardware encoding node in legacy nodes --- ...eEncoding.cs => CanUseHardwareEncodingChecker.cs} | 2 +- VideoLegacyNodes/VideoNodes/EncodingNode.cs | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) rename VideoLegacyNodes/LogicalNodes/{CanUseHardwareEncoding.cs => CanUseHardwareEncodingChecker.cs} (99%) diff --git a/VideoLegacyNodes/LogicalNodes/CanUseHardwareEncoding.cs b/VideoLegacyNodes/LogicalNodes/CanUseHardwareEncodingChecker.cs similarity index 99% rename from VideoLegacyNodes/LogicalNodes/CanUseHardwareEncoding.cs rename to VideoLegacyNodes/LogicalNodes/CanUseHardwareEncodingChecker.cs index ea7b8df5..e83d9aad 100644 --- a/VideoLegacyNodes/LogicalNodes/CanUseHardwareEncoding.cs +++ b/VideoLegacyNodes/LogicalNodes/CanUseHardwareEncodingChecker.cs @@ -1,6 +1,6 @@ namespace FileFlows.VideoNodes; -class CanUseHardwareEncoding +class CanUseHardwareEncodingChecker { public enum HardwareEncoder { diff --git a/VideoLegacyNodes/VideoNodes/EncodingNode.cs b/VideoLegacyNodes/VideoNodes/EncodingNode.cs index 9fd48e6c..58382c96 100644 --- a/VideoLegacyNodes/VideoNodes/EncodingNode.cs +++ b/VideoLegacyNodes/VideoNodes/EncodingNode.cs @@ -88,7 +88,7 @@ namespace FileFlows.VideoNodes // try find best hevc encoder foreach(string vidparam in new [] { "hevc_nvenc -preset hq", "hevc_qsv -global_quality 28 -load_plugin hevc_hw", "hevc_amf", "hevc_vaapi" }) { - bool canProcess = CanUseHardwareEncoding.CanProcess(Args, ffmpeg, vidparam); + bool canProcess = CanUseHardwareEncodingChecker.CanProcess(Args, ffmpeg, vidparam); if (canProcess) return vidparam; } @@ -99,7 +99,7 @@ namespace FileFlows.VideoNodes // try find best hevc encoder foreach (string vidparam in new[] { "h264_nvenc", "h264_qsv", "h264_amf", "h264_vaapi" }) { - bool canProcess = CanUseHardwareEncoding.CanProcess(Args, ffmpeg, vidparam); + bool canProcess = CanUseHardwareEncodingChecker.CanProcess(Args, ffmpeg, vidparam); if (canProcess) return vidparam; } @@ -109,7 +109,7 @@ namespace FileFlows.VideoNodes if (vidparams.ToLower().Contains("hevc_nvenc")) { // nvidia h265 encoding, check can - bool canProcess = CanUseHardwareEncoding.CanProcess(Args, ffmpeg, vidparams); + bool canProcess = CanUseHardwareEncodingChecker.CanProcess(Args, ffmpeg, vidparams); if (canProcess == false) { // change to cpu encoding @@ -121,7 +121,7 @@ namespace FileFlows.VideoNodes else if (vidparams.ToLower().Contains("h264_nvenc")) { // nvidia h264 encoding, check can - bool canProcess = CanUseHardwareEncoding.CanProcess(Args, ffmpeg, vidparams); + bool canProcess = CanUseHardwareEncodingChecker.CanProcess(Args, ffmpeg, vidparams); if (canProcess == false) { // change to cpu encoding @@ -133,7 +133,7 @@ namespace FileFlows.VideoNodes else if (vidparams.ToLower().Contains("hevc_qsv")) { // nvidia h265 encoding, check can - bool canProcess = CanUseHardwareEncoding.CanProcess(Args, ffmpeg, vidparams); + bool canProcess = CanUseHardwareEncodingChecker.CanProcess(Args, ffmpeg, vidparams); if (canProcess == false) { // change to cpu encoding @@ -145,7 +145,7 @@ namespace FileFlows.VideoNodes else if (vidparams.ToLower().Contains("h264_qsv")) { // nvidia h264 encoding, check can - bool canProcess = CanUseHardwareEncoding.CanProcess(Args, ffmpeg, vidparams); + bool canProcess = CanUseHardwareEncodingChecker.CanProcess(Args, ffmpeg, vidparams); if (canProcess == false) { // change to cpu encoding