Special version using images from a folder instead of extracting them…

… from a video Images are sorted by name. Most features should work as expected.
mlaily · May 1, 2021 · 9efb4e3 · 9efb4e3
1 parent 7475c96
commit 9efb4e3
Show file tree

Hide file tree

Showing 14 changed files with 114 additions and 325 deletions.
diff --git a/MovieBarCodeGenerator.Tests/DebugTests.cs b/MovieBarCodeGenerator.Tests/DebugTests.cs
@@ -57,7 +57,7 @@ public void Generate_All_Barcode_Settings_Combinations()
         {
             Assert.Inconclusive("Uncomment me to run the test");
 
-            var ffmpegWrapper = new FfmpegWrapper(FfmpegExecutablePath);
+            var ffmpegWrapper = new ImageProvider();
             var streamProcessor = new ImageStreamProcessor();
 
             var allGenerators = new List<IBarGenerator>();

diff --git a/MovieBarCodeGenerator.Tests/VideoProcessingTests.cs b/MovieBarCodeGenerator.Tests/VideoProcessingTests.cs
@@ -50,17 +50,6 @@ public void TestFileCanBeCreated()
             Assert.IsTrue(File.Exists(TestVideoFileName));
         }
 
-        [Test]
-        public void FfmpegWrapper_GetMediaDuration_Returns_Correct_Value()
-        {
-            CreateTestVideoIfNecessary();
-            var ffmpegWrapper = new FfmpegWrapper(FfmpegExecutablePath);
-
-            var duration = ffmpegWrapper.GetMediaDuration(TestVideoFileName, CancellationToken.None);
-
-            Assert.AreEqual(TimeSpan.FromSeconds(TestVideoDuration), duration);
-        }
-
         [Test]
         [TestCase(1)]
         [TestCase(2)]
@@ -70,7 +59,7 @@ public void FfmpegWrapper_GetMediaDuration_Returns_Correct_Value()
         public async Task FfmpegWrapper_GetImagesFromMedia_Returns_Expected_Values(int requestedFrameCount)
         {
             CreateTestVideoIfNecessary();
-            var ffmpegWrapper = new FfmpegWrapper(FfmpegExecutablePath);
+            var ffmpegWrapper = new ImageProvider();
 
             var images = ffmpegWrapper.GetImagesFromMedia(
                 TestVideoFileName,

diff --git a/MovieBarCodeGenerator/CLI/CLIBatchProcessor.cs b/MovieBarCodeGenerator/CLI/CLIBatchProcessor.cs
@@ -35,7 +35,7 @@ namespace MovieBarCodeGenerator.CLI
     public class CLIBatchProcessor
     {
         private BarCodeParametersValidator _barCodeParametersValidator = new BarCodeParametersValidator();
-        private FfmpegWrapper _ffmpegWrapper = new FfmpegWrapper("ffmpeg.exe");
+        private ImageProvider _imageProvider = new ImageProvider();
         private ImageStreamProcessor _imageProcessor = new ImageStreamProcessor();
 
         public void Process(string[] args)
@@ -168,7 +168,6 @@ private void DealWithOneInputFile(RawArguments arguments)
                     rawBarWidth: arguments.RawBarWidth,
                     rawImageWidth: arguments.RawWidth,
                     rawImageHeight: arguments.RawHeight,
-                    useInputHeightForOutput: arguments.UseInputHeight,
                     // Choosing whether to overwrite or not is done after validating parameters, not here
                     shouldOverwriteOutputPaths: x => { existingOutputs = x; return true; },
                     generators);
@@ -191,7 +190,7 @@ private void DealWithOneInputFile(RawArguments arguments)
             {
                 result = _imageProcessor.CreateBarCodes(
                     parameters,
-                    _ffmpegWrapper,
+                    _imageProvider,
                     CancellationToken.None,
                     null,
                     x => Console.WriteLine(x));

diff --git a/MovieBarCodeGenerator/Core/BarCodeParametersValidator.cs b/MovieBarCodeGenerator/Core/BarCodeParametersValidator.cs
@@ -33,7 +33,6 @@ public BarCodeParameters GetValidatedParameters(
             string rawBarWidth,
             string rawImageWidth,
             string rawImageHeight,
-            bool useInputHeightForOutput,
             Func<IReadOnlyCollection<string>, bool> shouldOverwriteOutputPaths,
             IEnumerable<IBarGenerator> barGenerators)
         {
@@ -84,16 +83,13 @@ public BarCodeParameters GetValidatedParameters(
             }
 
             int? imageHeight = null;
-            if (!useInputHeightForOutput)
+            if (int.TryParse(rawImageHeight, out var nonNullableImageHeight) && nonNullableImageHeight > 0)
             {
-                if (int.TryParse(rawImageHeight, out var nonNullableImageHeight) && nonNullableImageHeight > 0)
-                {
-                    imageHeight = nonNullableImageHeight;
-                }
-                else
-                {
-                    throw new ParameterValidationException("Invalid output height.");
-                }
+                imageHeight = nonNullableImageHeight;
+            }
+            else
+            {
+                throw new ParameterValidationException("Invalid output height.");
             }
 
             return new BarCodeParameters

diff --git a/MovieBarCodeGenerator/Core/BitmapStream.cs b/MovieBarCodeGenerator/Core/BitmapStream.cs
diff --git a/MovieBarCodeGenerator/Core/FfmpegWrapper.cs b/MovieBarCodeGenerator/Core/FfmpegWrapper.cs
diff --git a/MovieBarCodeGenerator/Core/GdiBarGenerator.cs b/MovieBarCodeGenerator/Core/GdiBarGenerator.cs
@@ -21,6 +21,7 @@
 using System.Drawing;
 using System.Drawing.Drawing2D;
 using System.Drawing.Imaging;
+using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -89,7 +90,7 @@ public GdiBarGenerator(
         public string DisplayName => _displayName ?? Name;
         public string FileNameSuffix { get; }
 
-        public Image GetBar(BitmapStream source, int barWidth, int barHeight)
+        public Image GetBar(FileStream source, int barWidth, int barHeight)
         {
             var sourceImage = Image.FromStream(source, true, false);
             var useSaneDefaults = ScalingMode == ScalingMode.Sane;