From 073cfee5ea275494769b31cc2c77e22d33835313 Mon Sep 17 00:00:00 2001 From: Crydsch Date: Thu, 13 Feb 2020 17:36:49 +0100 Subject: [PATCH] Lift restriction of duration to seconds Former-commit-id: 0b35935b5d1016c0779c840a4147c9df89fda7e5 --- FFMpegCore.Test/VideoTest.cs | 16 ++++++++++++---- FFMpegCore/FFMPEG/FFProbe.cs | 5 ++--- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/FFMpegCore.Test/VideoTest.cs b/FFMpegCore.Test/VideoTest.cs index 88510e6..ec781aa 100644 --- a/FFMpegCore.Test/VideoTest.cs +++ b/FFMpegCore.Test/VideoTest.cs @@ -260,7 +260,11 @@ public void Video_Join() var result = Encoder.Join(output, input, input2); Assert.IsTrue(File.Exists(output.FullName)); - Assert.AreEqual(input.Duration.TotalSeconds * 2, result.Duration.TotalSeconds); + TimeSpan expectedDuration = input.Duration * 2; + Assert.AreEqual(expectedDuration.Days, result.Duration.Days); + Assert.AreEqual(expectedDuration.Hours, result.Duration.Hours); + Assert.AreEqual(expectedDuration.Minutes, result.Duration.Minutes); + Assert.AreEqual(expectedDuration.Seconds, result.Duration.Seconds); Assert.AreEqual(input.Height, result.Height); Assert.AreEqual(input.Width, result.Width); } @@ -316,10 +320,10 @@ public void Video_With_Only_Audio_Should_Extract_Metadata() var video = VideoInfo.FromFileInfo(VideoLibrary.LocalVideoAudioOnly); Assert.AreEqual(video.VideoFormat, "none"); Assert.AreEqual(video.AudioFormat, "aac"); - Assert.AreEqual(video.Duration.TotalSeconds, 79); + Assert.AreEqual(video.Duration.TotalSeconds, 79.451); Assert.AreEqual(video.Size, 1.25); } - + [TestMethod] public void Video_Duration() { var video = VideoInfo.FromFileInfo(VideoLibrary.LocalVideo); @@ -335,7 +339,11 @@ public void Video_Duration() { Assert.IsTrue(File.Exists(output.FullName)); var outputVideo = new VideoInfo(output.FullName); - Assert.AreEqual(video.Duration.TotalSeconds - 5, outputVideo.Duration.TotalSeconds); + + Assert.AreEqual(video.Duration.Days, outputVideo.Duration.Days); + Assert.AreEqual(video.Duration.Hours, outputVideo.Duration.Hours); + Assert.AreEqual(video.Duration.Minutes, outputVideo.Duration.Minutes); + Assert.AreEqual(video.Duration.Seconds - 5, outputVideo.Duration.Seconds); } finally { if (File.Exists(output.FullName)) output.Delete(); diff --git a/FFMpegCore/FFMPEG/FFProbe.cs b/FFMpegCore/FFMPEG/FFProbe.cs index a3c1d08..2c69aff 100644 --- a/FFMpegCore/FFMPEG/FFProbe.cs +++ b/FFMpegCore/FFMPEG/FFProbe.cs @@ -85,10 +85,9 @@ private VideoInfo ParseVideoInfoInternal(VideoInfo info, string probeOutput) else { sDuration = (video ?? audio).Tags.Duration; - TimeSpan.TryParse(sDuration.Remove(sDuration.LastIndexOf('.')), CultureInfo.InvariantCulture, out duration); + TimeSpan.TryParse(sDuration.Remove(sDuration.LastIndexOf('.') + 8), CultureInfo.InvariantCulture, out duration); // TimeSpan fractions only allow up to 7 digits } - // Strip milliseconds and additional ticks - info.Duration = new TimeSpan(duration.Days, duration.Hours, duration.Minutes, duration.Seconds); + info.Duration = duration; if (video != null) {