Merge pull request #256 from benrr101/feature/asf-time-fixes

ASF Duration Calculation Fix, Creation Date Fix

Author: decriptor

src/TaglibSharp.Tests/FileFormats/AsfFormatTest.cs

@@ -1,3 +1,4 @@
+using System;
 using NUnit.Framework;
 using TagLib;
 
@@ -19,7 +20,12 @@ public void Init ()
 		[Test]
 		public void ReadAudioProperties ()
 		{
-			StandardTests.ReadAudioProperties (file);
+			Assert.AreEqual (96, file.Properties.AudioBitrate);
+			Assert.AreEqual (2, file.Properties.AudioChannels);
+			Assert.AreEqual (44100, file.Properties.AudioSampleRate);
+			// NOTE, with .net core it keeps the decimal places. So, for now, we round to match .net behavior
+			Assert.AreEqual (4153, Math.Round(file.Properties.Duration.TotalMilliseconds));
+			Assert.AreEqual (MediaTypes.Audio, file.Properties.MediaTypes);
 		}
 
 		[Test]

src/TaglibSharp/Asf/FilePropertiesObject.cs

@@ -6,7 +6,7 @@
 //   Brian Nickel ([email protected])
 //
 // Copyright (C) 2006-2007 Brian Nickel
-// 
+//
 // This library is free software; you can redistribute it and/or modify
 // it  under the terms of the GNU Lesser General Public License version
 // 2.1 as published by the Free Software Foundation.
@@ -33,6 +33,12 @@ namespace TagLib.Asf
 	/// </summary>
 	public class FilePropertiesObject : Object
 	{
+		#region Constant Values
+
+		static readonly DateTime FileTimeOffset = new DateTime (1601, 1, 1);
+
+		#endregion
+
 		#region Private Fields
 
 		/// <summary>
@@ -98,8 +104,8 @@ public FilePropertiesObject (File file, long position)
 			FileSize = file.ReadQWord ();
 			creation_date = file.ReadQWord ();
 			DataPacketsCount = file.ReadQWord ();
-			send_duration = file.ReadQWord ();
 			play_duration = file.ReadQWord ();
+			send_duration = file.ReadQWord ();
 			Preroll = file.ReadQWord ();
 			Flags = file.ReadDWord ();
 			MinimumDataPacketSize = file.ReadDWord ();
@@ -144,7 +150,7 @@ public System.Guid FileId {
 		///    date of the file described by the current instance.
 		/// </value>
 		public DateTime CreationDate {
-			get { return new DateTime ((long)creation_date); }
+			get { return new DateTime ((long)creation_date + FileTimeOffset.Ticks); }
 		}
 
 		/// <summary>
@@ -253,8 +259,8 @@ public override ByteVector Render ()
 			output.Add (RenderQWord (FileSize));
 			output.Add (RenderQWord (creation_date));
 			output.Add (RenderQWord (DataPacketsCount));
-			output.Add (RenderQWord (send_duration));
 			output.Add (RenderQWord (play_duration));
+			output.Add (RenderQWord (send_duration));
 			output.Add (RenderQWord (Preroll));
 			output.Add (RenderDWord (Flags));
 			output.Add (RenderDWord (MinimumDataPacketSize));

src/TaglibSharp/Asf/HeaderObject.cs

@@ -6,7 +6,7 @@
 //   Brian Nickel ([email protected])
 //
 // Copyright (C) 2006-2007 Brian Nickel
-// 
+//
 // This library is free software; you can redistribute it and/or modify
 // it  under the terms of the GNU Lesser General Public License version
 // 2.1 as published by the Free Software Foundation.
@@ -144,7 +144,7 @@ public Properties Properties {
 
 				foreach (var obj in Children) {
 					if (obj is FilePropertiesObject fpobj) {
-						duration = fpobj.PlayDuration - new TimeSpan ((long)fpobj.Preroll);
+						duration = fpobj.PlayDuration - TimeSpan.FromMilliseconds (fpobj.Preroll);
 						continue;
 					}