FF-1227 - tweaking hw check to use ss instead of -vframes

This commit is contained in:
John Andrews
2024-01-28 15:11:10 +13:00
parent cb46f28dfd
commit f43078da2e
2 changed files with 9 additions and 12 deletions

View File

@@ -293,14 +293,15 @@ public class FfmpegBuilderExecutor: FfmpegBuilderNode
"-frames:v", "10",
//"-ss", "1",
// instead of file output to null
"-f", "null", "-",
//testFile
//"-f", "null", "-",
testFile
});
var result = args.Execute(new ExecuteArgs
{
Command = ffmpeg,
ArgumentList = arguments.ToArray()
ArgumentList = arguments.ToArray(),
Timeout = 30
});
if (result.ExitCode == 0)
{

View File

@@ -203,31 +203,27 @@ public class CanUseHardwareEncoding:Node
{
if (parameters.Any(x => x.ToLower().Contains("nvenc")))
{
if (args.GetVariable("NoNvidia") as bool? == true)
return true;
if (args.GetVariable("NoNVIDIA") as bool? == true)
if (args.Variables.FirstOrDefault(x => x.Key.ToLowerInvariant() == "nonvidia").Value as bool? == true)
return true;
}
else if (parameters.Any(x => x.ToLower().Contains("qsv")))
{
if (args.GetVariable("NoQSV") as bool? == true)
if (args.Variables.FirstOrDefault(x => x.Key.ToLowerInvariant() == "noqsv").Value as bool? == true)
return true;
}
else if (parameters.Any(x => x.ToLower().Contains("vaapi")))
{
if (args.GetVariable("NoVAAPI") as bool? == true)
if (args.Variables.FirstOrDefault(x => x.Key.ToLowerInvariant() == "novaapi").Value as bool? == true)
return true;
}
else if (parameters.Any(x => x.ToLower().Contains("amf")))
{
if (args.GetVariable("NoAMF") as bool? == true)
return true;
if (args.GetVariable("NoAMD") as bool? == true)
if (args.Variables.FirstOrDefault(x => x.Key.ToLowerInvariant() == "noamf" || x.Key.ToLowerInvariant() == "noamd").Value as bool? == true)
return true;
}
else if (parameters.Any(x => x.ToLower().Contains("videotoolbox")))
{
if (args.GetVariable("NoVideoToolbox") as bool? == true)
if (args.Variables.FirstOrDefault(x => x.Key.ToLowerInvariant() == "novideotoolbox").Value as bool? == true)
return true;
}
return false;