From 38789162eb178c1d43395a3ea66f09ae937abe46 Mon Sep 17 00:00:00 2001 From: Phillip Fisher Date: Sat, 25 Feb 2023 11:29:41 -0600 Subject: [PATCH 1/4] Add chapters to FFProbe --- .../FFMpeg/Builders/MetaData/ChapterData.cs | 4 +++ FFMpegCore/FFProbe/FFProbe.cs | 2 +- FFMpegCore/FFProbe/FFProbeAnalysis.cs | 27 +++++++++++++++++++ FFMpegCore/FFProbe/IMediaAnalysis.cs | 5 +++- FFMpegCore/FFProbe/MediaAnalysis.cs | 13 +++++++++ 5 files changed, 49 insertions(+), 2 deletions(-) diff --git a/FFMpegCore/FFMpeg/Builders/MetaData/ChapterData.cs b/FFMpegCore/FFMpeg/Builders/MetaData/ChapterData.cs index 77a47bd..d0b5bcb 100644 --- a/FFMpegCore/FFMpeg/Builders/MetaData/ChapterData.cs +++ b/FFMpegCore/FFMpeg/Builders/MetaData/ChapterData.cs @@ -6,11 +6,15 @@ public class ChapterData public TimeSpan Start { get; private set; } public TimeSpan End { get; private set; } + public TimeSpan Duration { get; private set; } + public ChapterData(string title, TimeSpan start, TimeSpan end) { Title = title; Start = start; End = end; + + Duration = end - start; } } } diff --git a/FFMpegCore/FFProbe/FFProbe.cs b/FFMpegCore/FFProbe/FFProbe.cs index 8a7069e..d1032c6 100644 --- 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) - => PrepareInstance($"-loglevel error -print_format json -show_format -sexagesimal -show_streams \"{filePath}\"", ffOptions); + => PrepareInstance($"-loglevel error -print_format json -show_format -sexagesimal -show_streams -show_chapters \"{filePath}\"", ffOptions); private static ProcessArguments PrepareFrameAnalysisInstance(string filePath, FFOptions ffOptions) => PrepareInstance($"-loglevel error -print_format json -show_frames -v quiet -sexagesimal \"{filePath}\"", ffOptions); private static ProcessArguments PreparePacketAnalysisInstance(string filePath, FFOptions ffOptions) diff --git a/FFMpegCore/FFProbe/FFProbeAnalysis.cs b/FFMpegCore/FFProbe/FFProbeAnalysis.cs index b053d98..f3193ea 100644 --- 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 Chapters { get; set; } = null!; + [JsonIgnore] public IReadOnlyList ErrorData { get; set; } = new List(); } @@ -129,6 +132,30 @@ public class Format : ITagsContainer public Dictionary Tags { get; set; } = null!; } + 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 Tags { get; set; } = null!; + } + public interface IDispositionContainer { Dictionary Disposition { get; set; } diff --git a/FFMpegCore/FFProbe/IMediaAnalysis.cs b/FFMpegCore/FFProbe/IMediaAnalysis.cs index 47f47e4..d99992a 100644 --- 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 Chapters { get; } AudioStream? PrimaryAudioStream { get; } VideoStream? PrimaryVideoStream { get; } SubtitleStream? PrimarySubtitleStream { get; } diff --git a/FFMpegCore/FFProbe/MediaAnalysis.cs b/FFMpegCore/FFProbe/MediaAnalysis.cs index 9fce0fe..887baeb 100644 --- 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 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(); From ba78512cb92c9f59d22d713a026da68118a9e9f4 Mon Sep 17 00:00:00 2001 From: Malte Rosenbjerg Date: Wed, 12 Apr 2023 16:30:46 +0200 Subject: [PATCH 2/4] ChapterData.Duration as computed property --- FFMpegCore/FFMpeg/Builders/MetaData/ChapterData.cs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/FFMpegCore/FFMpeg/Builders/MetaData/ChapterData.cs b/FFMpegCore/FFMpeg/Builders/MetaData/ChapterData.cs index d0b5bcb..e278408 100644 --- a/FFMpegCore/FFMpeg/Builders/MetaData/ChapterData.cs +++ b/FFMpegCore/FFMpeg/Builders/MetaData/ChapterData.cs @@ -6,15 +6,13 @@ public class ChapterData public TimeSpan Start { get; private set; } public TimeSpan End { get; private set; } - public TimeSpan Duration { get; private set; } + public TimeSpan Duration => End - Start; public ChapterData(string title, TimeSpan start, TimeSpan end) { Title = title; Start = start; End = end; - - Duration = end - start; } } } From 0ac351493c2065945777b73e65fc527c92e7c310 Mon Sep 17 00:00:00 2001 From: Malte Rosenbjerg Date: Wed, 12 Apr 2023 16:31:26 +0200 Subject: [PATCH 3/4] Verify Chapters property is initialized to non-null in test --- FFMpegCore.Test/FFProbeTests.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/FFMpegCore.Test/FFProbeTests.cs b/FFMpegCore.Test/FFProbeTests.cs index 9da819a..38ec6cf 100644 --- 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); From ed30b146871df5bade326d6306a058dac0f1ae5b Mon Sep 17 00:00:00 2001 From: Malte Rosenbjerg Date: Thu, 5 Oct 2023 09:24:44 +0200 Subject: [PATCH 4/4] Align with main branch --- FFMpegCore/FFProbe/FFProbeAnalysis.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FFMpegCore/FFProbe/FFProbeAnalysis.cs b/FFMpegCore/FFProbe/FFProbeAnalysis.cs index 09a1cd9..1966242 100644 --- a/FFMpegCore/FFProbe/FFProbeAnalysis.cs +++ b/FFMpegCore/FFProbe/FFProbeAnalysis.cs @@ -153,7 +153,7 @@ public class Chapter : ITagsContainer public string EndTime { get; set; } = null!; [JsonPropertyName("tags")] - public Dictionary Tags { get; set; } = null!; + public Dictionary? Tags { get; set; } } public interface IDispositionContainer