From 61d455b831c5935e73bb3b70c80c45c0fcd42537 Mon Sep 17 00:00:00 2001 From: Joshua Hatzenbuehler Date: Thu, 2 May 2019 10:11:00 -0500 Subject: [PATCH 1/3] FFMpegCore: use Path.DirectorySeparatorChar instead of \\, for non windows based platform dont use target, for non windows based platform dont use .exe --- FFMpegCore.Test/FFMpegOptions.cs | 4 ++-- FFMpegCore.Test/Resources/VideoLibrary.cs | 18 +++++++++--------- FFMpegCore/FFMPEG/FFMpeg.cs | 16 ++++++++++++---- FFMpegCore/FFMPEG/FFMpegOptions.cs | 4 ++-- FFMpegCore/FFMPEG/FFProbe.cs | 15 ++++++++++++--- FFMpegCore/FFMpegCore.csproj | 2 +- FFMpegCore/Helpers/FFMpegHelper.cs | 12 +++++++++--- FFMpegCore/Helpers/FFProbeHelper.cs | 12 +++++++++--- FFMpegCore/ImageInfo.cs | 4 ++-- FFMpegCore/VideoInfo.cs | 4 ++-- 10 files changed, 60 insertions(+), 31 deletions(-) diff --git a/FFMpegCore.Test/FFMpegOptions.cs b/FFMpegCore.Test/FFMpegOptions.cs index 7928ce3..efdd6e3 100644 --- a/FFMpegCore.Test/FFMpegOptions.cs +++ b/FFMpegCore.Test/FFMpegOptions.cs @@ -17,7 +17,7 @@ public void Options_Initialized() [TestMethod] public void Options_Defaults_Configured() { - Assert.AreEqual(new FFMpegOptions().RootDirectory, ".\\FFMPEG\\bin"); + Assert.AreEqual(new FFMpegOptions().RootDirectory, $".{Path.DirectorySeparatorChar}FFMPEG{Path.DirectorySeparatorChar}bin"); } [TestMethod] @@ -25,7 +25,7 @@ public void Options_Loaded_From_File() { Assert.AreEqual( FFMpegOptions.Options.RootDirectory, - JsonConvert.DeserializeObject(File.ReadAllText(".\\ffmpeg.config.json")).RootDirectory + JsonConvert.DeserializeObject(File.ReadAllText($".{Path.DirectorySeparatorChar}ffmpeg.config.json")).RootDirectory ); } diff --git a/FFMpegCore.Test/Resources/VideoLibrary.cs b/FFMpegCore.Test/Resources/VideoLibrary.cs index 74f5b7f..90280f8 100644 --- a/FFMpegCore.Test/Resources/VideoLibrary.cs +++ b/FFMpegCore.Test/Resources/VideoLibrary.cs @@ -16,13 +16,13 @@ public enum ImageType public static class VideoLibrary { - public static readonly FileInfo LocalVideo = new FileInfo(".\\Resources\\input.mp4"); - public static readonly FileInfo LocalVideoAudioOnly = new FileInfo(".\\Resources\\audio_only.mp4"); - public static readonly FileInfo LocalVideoNoAudio = new FileInfo(".\\Resources\\mute.mp4"); - public static readonly FileInfo LocalAudio = new FileInfo(".\\Resources\\audio.mp3"); - public static readonly FileInfo LocalCover = new FileInfo(".\\Resources\\cover.png"); - public static readonly FileInfo ImageDirectory = new FileInfo(".\\Resources\\images"); - public static readonly FileInfo ImageJoinOutput = new FileInfo(".\\Resources\\images\\output.mp4"); + public static readonly FileInfo LocalVideo = new FileInfo($".{Path.DirectorySeparatorChar}Resources{Path.DirectorySeparatorChar}input.mp4"); + public static readonly FileInfo LocalVideoAudioOnly = new FileInfo($".{Path.DirectorySeparatorChar}Resources{Path.DirectorySeparatorChar}audio_only.mp4"); + public static readonly FileInfo LocalVideoNoAudio = new FileInfo($".{Path.DirectorySeparatorChar}Resources{Path.DirectorySeparatorChar}mute.mp4"); + public static readonly FileInfo LocalAudio = new FileInfo($".{Path.DirectorySeparatorChar}Resources{Path.DirectorySeparatorChar}audio.mp3"); + public static readonly FileInfo LocalCover = new FileInfo($".{Path.DirectorySeparatorChar}Resources{Path.DirectorySeparatorChar}cover.png"); + public static readonly FileInfo ImageDirectory = new FileInfo($".{Path.DirectorySeparatorChar}Resources{Path.DirectorySeparatorChar}images"); + public static readonly FileInfo ImageJoinOutput = new FileInfo($".{Path.DirectorySeparatorChar}Resources{Path.DirectorySeparatorChar}images{Path.DirectorySeparatorChar}output.mp4"); public static FileInfo OutputLocation(this FileInfo file, VideoType type) { @@ -44,7 +44,7 @@ public static FileInfo OutputLocation(this FileInfo file, Enum type, string keyw string originalLocation = file.Directory.FullName, outputFile = file.Name.Replace(file.Extension, keyword + "." + type.ToString().ToLower()); - return new FileInfo($"{originalLocation}\\{outputFile}"); + return new FileInfo($"{originalLocation}{Path.DirectorySeparatorChar}{outputFile}"); } } -} \ No newline at end of file +} diff --git a/FFMpegCore/FFMPEG/FFMpeg.cs b/FFMpegCore/FFMPEG/FFMpeg.cs index 0f12c3b..561fb65 100644 --- a/FFMpegCore/FFMPEG/FFMpeg.cs +++ b/FFMpegCore/FFMPEG/FFMpeg.cs @@ -11,6 +11,7 @@ using System.Globalization; using System.IO; using System.Linq; +using System.Runtime.InteropServices; using System.Text; using System.Text.RegularExpressions; @@ -29,9 +30,16 @@ public FFMpeg(): base() { FFMpegHelper.RootExceptionCheck(FFMpegOptions.Options.RootDirectory); - var target = Environment.Is64BitProcess ? "x64" : "x86"; + var progName = "ffmpeg"; + if (RuntimeInformation.IsOSPlatform (OSPlatform.Windows)) { + var target = Environment.Is64BitProcess ? "x64" : "x86"; - _ffmpegPath = $"{FFMpegOptions.Options.RootDirectory}\\{target}\\ffmpeg.exe"; + progName = $"{target}{Path.DirectorySeparatorChar}{progName}.exe"; + } + + var path = $"{Path.DirectorySeparatorChar}{progName}"; + + _ffmpegPath = $"{FFMpegOptions.Options.RootDirectory}{path}"; ArgumentBuilder = new FFArgumentBuilder(); } @@ -302,7 +310,7 @@ public VideoInfo JoinImageSequence(FileInfo output, double frameRate = 30, param new FrameRateArgument(frameRate), new SizeArgument(firstImage.Width, firstImage.Height), new StartNumberArgument(0), - new InputArgument($"{firstImage.Directory}\\%09d.png"), + new InputArgument($"{firstImage.Directory}{Path.DirectorySeparatorChar}%09d.png"), new FrameOutputCountArgument(images.Length), new VideoCodecArgument(VideoCodec.LibX264), new OutputArgument(output) @@ -539,4 +547,4 @@ private void OutputData(object sender, DataReceivedEventArgs e) #endregion } -} \ No newline at end of file +} diff --git a/FFMpegCore/FFMPEG/FFMpegOptions.cs b/FFMpegCore/FFMPEG/FFMpegOptions.cs index c7f46d6..aa34749 100644 --- a/FFMpegCore/FFMPEG/FFMpegOptions.cs +++ b/FFMpegCore/FFMPEG/FFMpegOptions.cs @@ -5,8 +5,8 @@ namespace FFMpegCore.FFMPEG { public class FFMpegOptions { - private static string _ConfigFile = ".\\ffmpeg.config.json"; - private static string _DefaultRoot = ".\\FFMPEG\\bin"; + private static string _ConfigFile = $".{Path.DirectorySeparatorChar}ffmpeg.config.json"; + private static string _DefaultRoot = $".{Path.DirectorySeparatorChar}FFMPEG{Path.DirectorySeparatorChar}bin"; public static FFMpegOptions Options { get; private set; } = new FFMpegOptions(); diff --git a/FFMpegCore/FFMPEG/FFProbe.cs b/FFMpegCore/FFMPEG/FFProbe.cs index ad7a9bc..838c271 100644 --- a/FFMpegCore/FFMPEG/FFProbe.cs +++ b/FFMpegCore/FFMPEG/FFProbe.cs @@ -3,6 +3,8 @@ using Newtonsoft.Json; using System; using System.Globalization; +using System.IO; +using System.Runtime.InteropServices; namespace FFMpegCore.FFMPEG { @@ -14,9 +16,16 @@ public FFProbe(): base() { FFProbeHelper.RootExceptionCheck(FFMpegOptions.Options.RootDirectory); - var target = Environment.Is64BitProcess ? "x64" : "x86"; + var progName = "ffprobe"; + if (RuntimeInformation.IsOSPlatform (OSPlatform.Windows)) { + var target = Environment.Is64BitProcess ? "x64" : "x86"; - _ffprobePath = $"{FFMpegOptions.Options.RootDirectory}\\{target}\\ffprobe.exe"; + progName = $"{target}{Path.DirectorySeparatorChar}{progName}.exe"; + } + + var path = $"{Path.DirectorySeparatorChar}{progName}"; + + _ffprobePath = $"{FFMpegOptions.Options.RootDirectory}{path}"; } /// @@ -122,4 +131,4 @@ private string RunProcess(string args) #endregion } -} \ No newline at end of file +} diff --git a/FFMpegCore/FFMpegCore.csproj b/FFMpegCore/FFMpegCore.csproj index d634dd1..4f26b4b 100644 --- a/FFMpegCore/FFMpegCore.csproj +++ b/FFMpegCore/FFMpegCore.csproj @@ -140,7 +140,7 @@ - + diff --git a/FFMpegCore/Helpers/FFMpegHelper.cs b/FFMpegCore/Helpers/FFMpegHelper.cs index 3f33471..dc574dd 100644 --- a/FFMpegCore/Helpers/FFMpegHelper.cs +++ b/FFMpegCore/Helpers/FFMpegHelper.cs @@ -1,6 +1,7 @@ using System; using System.Drawing; using System.IO; +using System.Runtime.InteropServices; using FFMpegCore.FFMPEG.Exceptions; namespace FFMpegCore.Helpers @@ -73,13 +74,18 @@ public static void RootExceptionCheck(string root) throw new FFMpegException(FFMpegExceptionType.Dependency, "FFMpeg root is not configured in app config. Missing key 'ffmpegRoot'."); - var target = Environment.Is64BitProcess ? "x64" : "x86"; + var progName = "ffmpeg"; + if (RuntimeInformation.IsOSPlatform (OSPlatform.Windows)) { + var target = Environment.Is64BitProcess ? "x64" : "x86"; - var path = root + $"\\{target}\\ffmpeg.exe"; + progName = $"{target}{Path.DirectorySeparatorChar}{progName}.exe"; + } + + var path = root + $"{Path.DirectorySeparatorChar}{progName}"; if (!File.Exists(path)) throw new FFMpegException(FFMpegExceptionType.Dependency, "FFMpeg cannot be found in the root directory!"); } } -} \ No newline at end of file +} diff --git a/FFMpegCore/Helpers/FFProbeHelper.cs b/FFMpegCore/Helpers/FFProbeHelper.cs index 749f311..59bc724 100644 --- a/FFMpegCore/Helpers/FFProbeHelper.cs +++ b/FFMpegCore/Helpers/FFProbeHelper.cs @@ -1,5 +1,6 @@ using System; using System.IO; +using System.Runtime.InteropServices; using FFMpegCore.FFMPEG.Exceptions; namespace FFMpegCore.Helpers @@ -23,13 +24,18 @@ public static void RootExceptionCheck(string root) throw new FFMpegException(FFMpegExceptionType.Dependency, "FFProbe root is not configured in app config. Missing key 'ffmpegRoot'."); - var target = Environment.Is64BitProcess ? "x64" : "x86"; + var progName = "ffprobe"; + if (RuntimeInformation.IsOSPlatform (OSPlatform.Windows)) { + var target = Environment.Is64BitProcess ? "x64" : "x86"; - var path = root + $"\\{target}\\ffprobe.exe"; + progName = $"{target}{Path.DirectorySeparatorChar}{progName}.exe"; + } + + var path = root + $"{Path.DirectorySeparatorChar}{progName}"; if (!File.Exists(path)) throw new FFMpegException(FFMpegExceptionType.Dependency, $"FFProbe cannot be found in the in {path}..."); } } -} \ No newline at end of file +} diff --git a/FFMpegCore/ImageInfo.cs b/FFMpegCore/ImageInfo.cs index a8551c4..3550b25 100644 --- a/FFMpegCore/ImageInfo.cs +++ b/FFMpegCore/ImageInfo.cs @@ -158,7 +158,7 @@ public FileStream FileOpen(FileMode mode) /// public void MoveTo(DirectoryInfo destination) { - var newLocation = $"{destination.FullName}\\{Name}{Extension}"; + var newLocation = $"{destination.FullName}{Path.DirectorySeparatorChar}{Name}{Extension}"; _file.MoveTo(newLocation); _file = new FileInfo(newLocation); } @@ -180,4 +180,4 @@ public FileInfo ToFileInfo() return new FileInfo(_file.FullName); } } -} \ No newline at end of file +} diff --git a/FFMpegCore/VideoInfo.cs b/FFMpegCore/VideoInfo.cs index 13eebf2..a4556d3 100644 --- a/FFMpegCore/VideoInfo.cs +++ b/FFMpegCore/VideoInfo.cs @@ -162,7 +162,7 @@ public FileStream FileOpen(FileMode mode) /// public void MoveTo(DirectoryInfo destination) { - var newLocation = $"{destination.FullName}\\{Name}{Extension}"; + var newLocation = $"{destination.FullName}{Path.DirectorySeparatorChar}{Name}{Extension}"; _file.MoveTo(newLocation); _file = new FileInfo(newLocation); } @@ -184,4 +184,4 @@ public FileInfo ToFileInfo() return new FileInfo(_file.FullName); } } -} \ No newline at end of file +} From f5c40697d40f1646f5041344aba5651e612bf587 Mon Sep 17 00:00:00 2001 From: Joshua Hatzenbuehler Date: Thu, 2 May 2019 11:25:04 -0500 Subject: [PATCH 2/3] Readme: added basic line regarding MacOSx testing --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index c9e7439..bbfdb85 100644 --- a/README.md +++ b/README.md @@ -42,6 +42,9 @@ The files that need to be included can be found here: https://github.com/vladjer I can only guarantee an expected behaviour built binaries included, other 3rd party builds could contain API changes rendering an unexpected behaviour. +MacOSX +The Unit test have run on MacOSX - 10.14.4 using ffmpeg version 4.1.3. (It was installed using "brew install ffmpeg" and "brew install mono-libgdiplus"). The RootDirectory was set to "/usr/local/bin" for running unit test. + ### FFProbe FFProbe is used to gather video information From 65ab084deedbc9ac67e7774629b0d8c11dab38f1 Mon Sep 17 00:00:00 2001 From: Joshua Hatzenbuehler Date: Thu, 2 May 2019 14:27:52 -0500 Subject: [PATCH 3/3] Readme: added data for test results on linux unit testing --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index bbfdb85..8aac1a3 100644 --- a/README.md +++ b/README.md @@ -45,6 +45,11 @@ I can only guarantee an expected behaviour built binaries included, other 3rd pa MacOSX The Unit test have run on MacOSX - 10.14.4 using ffmpeg version 4.1.3. (It was installed using "brew install ffmpeg" and "brew install mono-libgdiplus"). The RootDirectory was set to "/usr/local/bin" for running unit test. +Ubuntu 16.04 +The unit test failed on 2 test when running against default ffmpeg package of (ffmpeg version 2.8.15-0ubuntu0.16.04.1) + The two test that failed were Video_ToMP4_Args and Video_ToMP4_Resize_Args +The Unit test passed when running against ffmpeg version 4.1.3 + ### FFProbe FFProbe is used to gather video information