From 965e756dc4e7d80c5ed487368b129bb675467396 Mon Sep 17 00:00:00 2001
From: BobSilent <andre_1@gmx.net>
Date: Tue, 2 Nov 2021 10:40:05 +0100
Subject: [PATCH] Add Configure on FFMpegArgumentProcessor to fuently configure
 ffoptions per run.

---
 FFMpegCore/FFMpeg/FFMpegArgumentProcessor.cs | 37 +++++++++++++++-----
 FFMpegCore/FFOptions.cs                      | 17 ++++++---
 2 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/FFMpegCore/FFMpeg/FFMpegArgumentProcessor.cs b/FFMpegCore/FFMpeg/FFMpegArgumentProcessor.cs
index 68738be..209cc36 100644
--- a/FFMpegCore/FFMpeg/FFMpegArgumentProcessor.cs
+++ b/FFMpegCore/FFMpeg/FFMpegArgumentProcessor.cs
@@ -14,6 +14,7 @@ namespace FFMpegCore
     public class FFMpegArgumentProcessor
     {
         private static readonly Regex ProgressRegex = new Regex(@"time=(\d\d:\d\d:\d\d.\d\d?)", RegexOptions.Compiled);
+        private readonly List<Action<FFOptions>> _configurations;
         private readonly FFMpegArguments _ffMpegArguments;
         private Action<double>? _onPercentageProgress;
         private Action<TimeSpan>? _onTimeProgress;
@@ -22,12 +23,13 @@ public class FFMpegArgumentProcessor
 
         internal FFMpegArgumentProcessor(FFMpegArguments ffMpegArguments)
         {
+            _configurations = new List<Action<FFOptions>>();
             _ffMpegArguments = ffMpegArguments;
         }
 
         public string Arguments => _ffMpegArguments.Text;
 
-        private event EventHandler<int> CancelEvent = null!; 
+        private event EventHandler<int> CancelEvent = null!;
 
         /// <summary>
         /// Register action that will be invoked during the ffmpeg processing, when a progress time is output and parsed and progress percentage is calculated.
@@ -70,10 +72,15 @@ public FFMpegArgumentProcessor CancellableThrough(CancellationToken token, int t
             token.Register(() => CancelEvent?.Invoke(this, timeout));
             return this;
         }
+        public FFMpegArgumentProcessor Configure(Action<FFOptions> configureOptions)
+        {
+            _configurations.Add(configureOptions);
+            return this;
+        }
         public bool ProcessSynchronously(bool throwOnError = true, FFOptions? ffMpegOptions = null)
         {
-            using var instance = PrepareInstance(ffMpegOptions ?? GlobalFFOptions.Current, out var cancellationTokenSource);
-            var errorCode = -1;
+            var options = GetConfiguredOptions(ffMpegOptions);
+            using var instance = PrepareInstance(options, out var cancellationTokenSource);
 
             void OnCancelEvent(object sender, int timeout)
             {
@@ -87,7 +94,8 @@ void OnCancelEvent(object sender, int timeout)
             }
             CancelEvent += OnCancelEvent;
             instance.Exited += delegate { cancellationTokenSource.Cancel(); };
-            
+
+            var errorCode = -1;
             try
             {
                 errorCode = Process(instance, cancellationTokenSource).ConfigureAwait(false).GetAwaiter().GetResult();
@@ -100,14 +108,14 @@ void OnCancelEvent(object sender, int timeout)
             {
                 CancelEvent -= OnCancelEvent;
             }
-            
+
             return HandleCompletion(throwOnError, errorCode, instance.ErrorData);
         }
 
         public async Task<bool> ProcessAsynchronously(bool throwOnError = true, FFOptions? ffMpegOptions = null)
         {
-            using var instance = PrepareInstance(ffMpegOptions ?? GlobalFFOptions.Current, out var cancellationTokenSource);
-            var errorCode = -1;
+            var options = GetConfiguredOptions(ffMpegOptions);
+            using var instance = PrepareInstance(options, out var cancellationTokenSource);
 
             void OnCancelEvent(object sender, int timeout)
             {
@@ -120,7 +128,8 @@ void OnCancelEvent(object sender, int timeout)
                 }
             }
             CancelEvent += OnCancelEvent;
-            
+
+            var errorCode = -1;
             try
             {
                 errorCode = await Process(instance, cancellationTokenSource).ConfigureAwait(false);
@@ -163,6 +172,18 @@ private bool HandleCompletion(bool throwOnError, int exitCode, IReadOnlyList<str
             return exitCode == 0;
         }
 
+        private FFOptions GetConfiguredOptions(FFOptions? ffOptions)
+        {
+            var options = ffOptions ?? GlobalFFOptions.Current.Clone();
+
+            foreach (var configureOptions in _configurations)
+            {
+                configureOptions(options);
+            }
+
+            return options;
+        }
+
         private Instance PrepareInstance(FFOptions ffOptions,
             out CancellationTokenSource cancellationTokenSource)
         {
diff --git a/FFMpegCore/FFOptions.cs b/FFMpegCore/FFOptions.cs
index 94ce212..a34bca2 100644
--- a/FFMpegCore/FFOptions.cs
+++ b/FFMpegCore/FFOptions.cs
@@ -1,10 +1,11 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Text;
 
 namespace FFMpegCore
 {
-    public class FFOptions
+    public class FFOptions : ICloneable
     {
         /// <summary>
         /// Working directory for the ffmpeg/ffprobe instance
@@ -27,16 +28,24 @@ public class FFOptions
         public Encoding Encoding { get; set; } = Encoding.Default;
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public Dictionary<string, string> ExtensionOverrides { get; set; } = new Dictionary<string, string>
         {
             { "mpegts", ".ts" },
         };
-        
+
         /// <summary>
         /// Whether to cache calls to get ffmpeg codec, pixel- and container-formats
         /// </summary>
         public bool UseCache { get; set; } = true;
+
+        /// <inheritdoc/>
+        object ICloneable.Clone() => Clone();
+
+        /// <summary>
+        /// Creates a new object that is a copy of the current instance.
+        /// </summary>
+        public FFOptions Clone() => (FFOptions)MemberwiseClone();
     }
 }
\ No newline at end of file