Merge 65cbc5552c into 2f06ec99f3

This preserves the original semantics and contract (throw only if the ffprobe exits with a non-zero code).

FFMpegCore/FFProbe/FFProbe.cs

@@ -84,8 +84,7 @@ public static class FFProbe
 
         var instance = PrepareStreamAnalysisInstance(filePath, ffOptions ?? GlobalFFOptions.Current, customArguments);
         var result = await instance.StartAndWaitForExitAsync(cancellationToken).ConfigureAwait(false);
-        cancellationToken.ThrowIfCancellationRequested();
+        ThrowIfExitCodeNotZero(result, cancellationToken);
-        ThrowIfExitCodeNotZero(result);
 
         return ParseOutput(result);
     }
@@ -124,8 +123,7 @@ public static class FFProbe
     {
         var instance = PrepareStreamAnalysisInstance(uri.AbsoluteUri, ffOptions ?? GlobalFFOptions.Current, customArguments);
         var result = await instance.StartAndWaitForExitAsync(cancellationToken).ConfigureAwait(false);
-        cancellationToken.ThrowIfCancellationRequested();
+        ThrowIfExitCodeNotZero(result, cancellationToken);
-        ThrowIfExitCodeNotZero(result);
 
         return ParseOutput(result);
     }
@@ -152,8 +150,7 @@ public static class FFProbe
         }
 
         var result = await task.ConfigureAwait(false);
-        cancellationToken.ThrowIfCancellationRequested();
+        ThrowIfExitCodeNotZero(result, cancellationToken);
-        ThrowIfExitCodeNotZero(result);
 
         pipeArgument.Post();
         return ParseOutput(result);
@@ -215,10 +212,13 @@ public static class FFProbe
         }
     }
 
-    private static void ThrowIfExitCodeNotZero(IProcessResult result)
+    private static void ThrowIfExitCodeNotZero(IProcessResult result, CancellationToken cancellationToken = default)
     {
         if (result.ExitCode != 0)
         {
+            // if cancellation requested, then we are not interested in the exit code, just throw the cancellation exception
+            // to get consistent and expected behavior.
+            cancellationToken.ThrowIfCancellationRequested();
             var message = $"ffprobe exited with non-zero exit-code ({result.ExitCode} - {string.Join("\n", result.ErrorData)})";
             throw new FFMpegException(FFMpegExceptionType.Process, message, null, string.Join("\n", result.ErrorData));
         }