Add option to strip Audible brand audio

AaxDecrypter/AaxDecrypter.csproj

@@ -5,8 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AAXClean" Version="0.4.2" />
+    <PackageReference Include="AAXClean" Version="0.4.4" />
-    <PackageReference Include="AAXClean.Codecs" Version="0.2.0" />
+    <PackageReference Include="AAXClean.Codecs" Version="0.2.4" />
   </ItemGroup>
 
   <ItemGroup>

AaxDecrypter/AaxcDownloadSingleConverter.cs

@@ -36,8 +36,8 @@ namespace AaxDecrypter
             AaxFile.ConversionProgressUpdate += AaxFile_ConversionProgressUpdate;
             var decryptionResult
                 = OutputFormat == OutputFormat.M4b
-                ? AaxFile.ConvertToMp4a(outputFile, DownloadLicense.ChapterInfo)
+                ? AaxFile.ConvertToMp4a(outputFile, DownloadLicense.ChapterInfo, DownloadLicense.TrimOutputToChapterLength)
-                : AaxFile.ConvertToMp3(outputFile);
+                : AaxFile.ConvertToMp3(outputFile, null, DownloadLicense.ChapterInfo, DownloadLicense.TrimOutputToChapterLength);
             AaxFile.ConversionProgressUpdate -= AaxFile_ConversionProgressUpdate;
 
             DownloadLicense.ChapterInfo = AaxFile.Chapters;

AaxDecrypter/DownloadLicense.cs

@@ -10,6 +10,7 @@ namespace AaxDecrypter
         public string AudibleIV { get; }
         public string UserAgent { get; }
         public ChapterInfo ChapterInfo { get; set; }
+        public bool TrimOutputToChapterLength { get; set; }
 
         public DownloadLicense(string downloadUrl, string audibleKey, string audibleIV, string userAgent)
         {

FileLiberator/DownloadDecryptBook.cs

@@ -86,6 +86,8 @@ namespace FileLiberator
 
             try
             {
+                var config = Configuration.Instance;
+
                 downloadValidation(libraryBook);
 
                 var api = await libraryBook.GetApiAsync();
@@ -104,15 +106,32 @@ namespace FileLiberator
                 //These assumptions may be wrong, and only time and bug reports will tell.
                 var outputFormat = 
                     contentLic.ContentMetadata.ContentReference.ContentFormat == "MPEG" ||
-                    (Configuration.Instance.AllowLibationFixup && Configuration.Instance.DecryptToLossy) ? 
+                    (config.AllowLibationFixup && config.DecryptToLossy) ? 
                     OutputFormat.Mp3 : OutputFormat.M4b;
 
-                if (Configuration.Instance.AllowLibationFixup || outputFormat == OutputFormat.Mp3)
+                audiobookDlLic.TrimOutputToChapterLength = config.StripAudibleBrandAudio;
-                {
-                    audiobookDlLic.ChapterInfo = new AAXClean.ChapterInfo();
 
-                    foreach (var chap in contentLic.ContentMetadata?.ChapterInfo?.Chapters)
+                long startMs = config.StripAudibleBrandAudio ? 
-                        audiobookDlLic.ChapterInfo.AddChapter(chap.Title, TimeSpan.FromMilliseconds(chap.LengthMs));
+                    contentLic.ContentMetadata.ChapterInfo.BrandIntroDurationMs :
+                    0;
+
+                if (config.AllowLibationFixup || outputFormat == OutputFormat.Mp3)
+                {
+                    audiobookDlLic.ChapterInfo = new AAXClean.ChapterInfo(TimeSpan.FromMilliseconds(startMs));
+
+                    for (int i = 0; i < contentLic.ContentMetadata.ChapterInfo.Chapters.Length; i++)
+                    {
+                        var chapter = contentLic.ContentMetadata.ChapterInfo.Chapters[i];
+                        long chapLenMs = chapter.LengthMs;
+
+                        if (i == 0)
+                            chapLenMs -= startMs;
+
+                        if (config.StripAudibleBrandAudio && i == contentLic.ContentMetadata.ChapterInfo.Chapters.Length - 1)
+                            chapLenMs -= contentLic.ContentMetadata.ChapterInfo.BrandOutroDurationMs + 500; //A little more headroom at the end of the file (500 ms)
+
+                        audiobookDlLic.ChapterInfo.AddChapter(chapter.Title, TimeSpan.FromMilliseconds(chapLenMs));
+                    }
                 }
 
                 var outFileName = AudibleFileStorage.Audio.GetInProgressFilename(libraryBook, outputFormat.ToString().ToLower());
@@ -124,12 +143,12 @@ namespace FileLiberator
                 else
                 {
                     AaxcDownloadConvertBase converter
-                        = Configuration.Instance.SplitFilesByChapter ? new AaxcDownloadMultiConverter(
+                        = config.SplitFilesByChapter ? new AaxcDownloadMultiConverter(
                             outFileName, cacheDir, audiobookDlLic, outputFormat,
                             AudibleFileStorage.Audio.CreateMultipartRenamerFunc(libraryBook))
                         : new AaxcDownloadSingleConverter(outFileName, cacheDir, audiobookDlLic, outputFormat);
 
-                    if (Configuration.Instance.AllowLibationFixup)
+                    if (config.AllowLibationFixup)
                         converter.RetrievedMetadata += (_, tags) => tags.Generes = string.Join(", ", libraryBook.Book.CategoriesNames);
 
                     abDownloader = converter;

LibationFileManager/Configuration.cs

@@ -96,6 +96,13 @@ namespace LibationFileManager
             set => persistentDictionary.SetNonString(nameof(AllowLibationFixup), value);
         }
 
+        [Description("Allow Libation to remove audible branding from the start\r\nand end of audiobooks. (e.g. \"This is Audible\")")]
+        public bool StripAudibleBrandAudio
+        {
+            get => persistentDictionary.GetNonString<bool>(nameof(StripAudibleBrandAudio));
+            set => persistentDictionary.SetNonString(nameof(StripAudibleBrandAudio), value);
+        }
+
         [Description("Decrypt to lossy format?")]
         public bool DecryptToLossy
         {

LibationWinForms/Dialogs/SettingsDialog.cs

@@ -34,6 +34,7 @@ namespace LibationWinForms.Dialogs
 			this.inProgressDescLbl.Text = desc(nameof(config.InProgress));
 			this.allowLibationFixupCbox.Text = desc(nameof(config.AllowLibationFixup));
 			this.splitFilesByChapterCbox.Text = desc(nameof(config.SplitFilesByChapter));
+			this.stripAudibleBrandingCbox.Text = desc(nameof(config.StripAudibleBrandAudio));
 
 			booksSelectControl.SetSearchTitle("books location");
 			booksSelectControl.SetDirectoryItems(
@@ -54,6 +55,7 @@ namespace LibationWinForms.Dialogs
 			convertLosslessRb.Checked = !config.DecryptToLossy;
 			convertLossyRb.Checked = config.DecryptToLossy;
 			splitFilesByChapterCbox.Checked = config.SplitFilesByChapter;
+			stripAudibleBrandingCbox.Checked = config.StripAudibleBrandAudio;
 
 			allowLibationFixupCbox_CheckedChanged(this, e);
 
@@ -174,6 +176,7 @@ namespace LibationWinForms.Dialogs
 			config.AllowLibationFixup = allowLibationFixupCbox.Checked;
 			config.DecryptToLossy = convertLossyRb.Checked;
 			config.SplitFilesByChapter = splitFilesByChapterCbox.Checked;
+			config.StripAudibleBrandAudio = stripAudibleBrandingCbox.Checked;
 
 			config.InProgress = inProgressSelectControl.SelectedDirectory;