From 512fc45d6762ef386bc76aaaaa60c6edd5f94b9b Mon Sep 17 00:00:00 2001 From: John Andrews Date: Mon, 29 Jan 2024 18:13:32 +1300 Subject: [PATCH] switching to -ss 1 instead of -frames:v --- .../FfmpegBuilderNodes/FfmpegBuilderExecutor.cs | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/VideoNodes/FfmpegBuilderNodes/FfmpegBuilderExecutor.cs b/VideoNodes/FfmpegBuilderNodes/FfmpegBuilderExecutor.cs index 7283c64c..c73d29b6 100644 --- a/VideoNodes/FfmpegBuilderNodes/FfmpegBuilderExecutor.cs +++ b/VideoNodes/FfmpegBuilderNodes/FfmpegBuilderExecutor.cs @@ -343,19 +343,17 @@ public class FfmpegBuilderExecutor: FfmpegBuilderNode if (result.ExitCode == 0) { args.Logger?.ILog("Supported hardware decoding detected: " + string.Join(" ", hw)); - return hw; } - var timeTaken = DateTime.Now.Subtract(dtStart); - args.Logger?.ILog("Time taken: " + timeTaken + " vs timeout: " + timeout); - - if (timeTaken.TotalSeconds >= timeout) + if (result.Completed == false) { - args.Logger?.ILog("Time was longer than timeout, assume it was aborted"); - args.Logger?.ILog("Output: " + (result.Output ?? String.Empty)); - args.Logger?.ILog("StandardOutput: " + (result.StandardOutput ?? string.Empty)); - if (result.Output?.Contains("frame=") == true || result.StandardOutput?.Contains("frame=") == true) + // timeout + args.Logger?.ILog("Test timed out"); + args.Logger?.ILog("Output: " + (result.Output ?? String.Empty)); + args.Logger?.ILog("StandardOutput: " + (result.StandardOutput ?? string.Empty)); + if (result.Output?.Contains("frame=") == true || + result.StandardOutput?.Contains("frame=") == true) { args.Logger?.ILog( "Sort of supported hardware decoding detected via frame=: " + string.Join(" ", hw));