Merge branch 'main' into pr/431

rosenbjerg · Oct 5, 2023 · f8407bc · f8407bc
2 parents 54e5d08 + 20a5b15
commit f8407bc
Show file tree

Hide file tree

Showing 7 changed files with 62 additions and 5 deletions.
diff --git a/FFMpegCore.Test/FFProbeTests.cs b/FFMpegCore.Test/FFProbeTests.cs
@@ -105,6 +105,7 @@ public void Probe_Success()
         {
             var info = FFProbe.Analyse(TestResources.Mp4Video);
             Assert.AreEqual(3, info.Duration.Seconds);
+            Assert.AreEqual(0, info.Chapters.Count);
 
             Assert.AreEqual("5.1", info.PrimaryAudioStream!.ChannelLayout);
             Assert.AreEqual(6, info.PrimaryAudioStream.Channels);

diff --git a/FFMpegCore/FFMpeg/Builders/MetaData/ChapterData.cs b/FFMpegCore/FFMpeg/Builders/MetaData/ChapterData.cs
@@ -6,6 +6,8 @@ public class ChapterData
         public TimeSpan Start { get; private set; }
         public TimeSpan End { get; private set; }
 
+        public TimeSpan Duration => End - Start;
+
         public ChapterData(string title, TimeSpan start, TimeSpan end)
         {
             Title = title;

diff --git a/FFMpegCore/FFProbe/FFProbe.cs b/FFMpegCore/FFProbe/FFProbe.cs
@@ -213,7 +213,7 @@ private static void ThrowIfExitCodeNotZero(IProcessResult result)
         }
 
         private static ProcessArguments PrepareStreamAnalysisInstance(string filePath, FFOptions ffOptions, string? customArguments)
-            => PrepareInstance($"-loglevel error -print_format json -show_format -sexagesimal -show_streams \"{filePath}\"", ffOptions, customArguments);
+            => PrepareInstance($"-loglevel error -print_format json -show_format -sexagesimal -show_streams -show_chapters \"{filePath}\"", ffOptions, customArguments);
         private static ProcessArguments PrepareFrameAnalysisInstance(string filePath, FFOptions ffOptions, string? customArguments)
             => PrepareInstance($"-loglevel error -print_format json -show_frames -v quiet -sexagesimal \"{filePath}\"", ffOptions, customArguments);
         private static ProcessArguments PreparePacketAnalysisInstance(string filePath, FFOptions ffOptions, string? customArguments)

diff --git a/FFMpegCore/FFProbe/FFProbeAnalysis.cs b/FFMpegCore/FFProbe/FFProbeAnalysis.cs
@@ -11,6 +11,9 @@ public class FFProbeAnalysis
         [JsonPropertyName("format")]
         public Format Format { get; set; } = null!;
 
+        [JsonPropertyName("chapters")]
+        public List<Chapter> Chapters { get; set; } = null!;
+
         [JsonIgnore]
         public IReadOnlyList<string> ErrorData { get; set; } = new List<string>();
     }
@@ -129,6 +132,30 @@ public class Format : ITagsContainer
         public Dictionary<string, string>? Tags { get; set; }
     }
 
+    public class Chapter : ITagsContainer
+    {
+        [JsonPropertyName("id")]
+        public int Id { get; set; }
+
+        [JsonPropertyName("time_base")]
+        public string TimeBase { get; set; } = null!;
+
+        [JsonPropertyName("start")]
+        public int Start { get; set; }
+
+        [JsonPropertyName("start_time")]
+        public string StartTime { get; set; } = null!;
+
+        [JsonPropertyName("end")]
+        public int End { get; set; }
+
+        [JsonPropertyName("end_time")]
+        public string EndTime { get; set; } = null!;
+
+        [JsonPropertyName("tags")]
+        public Dictionary<string, string>? Tags { get; set; }
+    }
+
     public interface IDispositionContainer
     {
         Dictionary<string, int> Disposition { get; set; }

diff --git a/FFMpegCore/FFProbe/IMediaAnalysis.cs b/FFMpegCore/FFProbe/IMediaAnalysis.cs
@@ -1,9 +1,12 @@
-namespace FFMpegCore
+using FFMpegCore.Builders.MetaData;
+
+namespace FFMpegCore
 {
     public interface IMediaAnalysis
     {
         TimeSpan Duration { get; }
         MediaFormat Format { get; }
+        List<ChapterData> Chapters { get; }
         AudioStream? PrimaryAudioStream { get; }
         VideoStream? PrimaryVideoStream { get; }
         SubtitleStream? PrimarySubtitleStream { get; }

diff --git a/FFMpegCore/FFProbe/MediaAnalysis.cs b/FFMpegCore/FFProbe/MediaAnalysis.cs
@@ -1,4 +1,5 @@
 using System.Text.RegularExpressions;
+using FFMpegCore.Builders.MetaData;
 
 namespace FFMpegCore
 {
@@ -7,6 +8,7 @@ internal class MediaAnalysis : IMediaAnalysis
         internal MediaAnalysis(FFProbeAnalysis analysis)
         {
             Format = ParseFormat(analysis.Format);
+            Chapters = analysis.Chapters.Select(c => ParseChapter(c)).ToList();
             VideoStreams = analysis.Streams.Where(stream => stream.CodecType == "video").Select(ParseVideoStream).ToList();
             AudioStreams = analysis.Streams.Where(stream => stream.CodecType == "audio").Select(ParseAudioStream).ToList();
             SubtitleStreams = analysis.Streams.Where(stream => stream.CodecType == "subtitle").Select(ParseSubtitleStream).ToList();
@@ -28,6 +30,15 @@ private MediaFormat ParseFormat(Format analysisFormat)
             };
         }
 
+        private ChapterData ParseChapter(Chapter analysisChapter)
+        {
+            var title = analysisChapter.Tags.FirstOrDefault(t => t.Key == "title").Value;
+            var start = MediaAnalysisUtils.ParseDuration(analysisChapter.StartTime);
+            var end = MediaAnalysisUtils.ParseDuration(analysisChapter.EndTime);
+
+            return new ChapterData(title, start, end);
+        }
+
         public TimeSpan Duration => new[]
         {
             Format.Duration,
@@ -37,6 +48,8 @@ private MediaFormat ParseFormat(Format analysisFormat)
 
         public MediaFormat Format { get; }
 
+        public List<ChapterData> Chapters { get; }
+
         public AudioStream? PrimaryAudioStream => AudioStreams.OrderBy(stream => stream.Index).FirstOrDefault();
         public VideoStream? PrimaryVideoStream => VideoStreams.OrderBy(stream => stream.Index).FirstOrDefault();
         public SubtitleStream? PrimarySubtitleStream => SubtitleStreams.OrderBy(stream => stream.Index).FirstOrDefault();

diff --git a/FFMpegCore/GlobalFFOptions.cs b/FFMpegCore/GlobalFFOptions.cs
@@ -30,12 +30,23 @@ private static string GetFFBinaryPath(string name, FFOptions ffOptions)
             }
 
             var target = Environment.Is64BitProcess ? "x64" : "x86";
-            if (Directory.Exists(Path.Combine(ffOptions.BinaryFolder, target)))
+            var possiblePaths = new List<string>()
             {
-                ffName = Path.Combine(target, ffName);
+                Path.Combine(ffOptions.BinaryFolder, target),
+                ffOptions.BinaryFolder
+            };
+
+            foreach (var possiblePath in possiblePaths)
+            {
+                var possibleFFMpegPath = Path.Combine(possiblePath, ffName);
+                if (File.Exists(possibleFFMpegPath))
+                {
+                    return possibleFFMpegPath;
+                }
             }
 
-            return Path.Combine(ffOptions.BinaryFolder, ffName);
+            //Fall back to the assumption this tool exists in the PATH
+            return ffName;
         }
 
         private static FFOptions LoadFFOptions()