From 98c194b462789dfef76553f2760c688c7ce2e3e1 Mon Sep 17 00:00:00 2001
From: John Andrews <john@reven.co.nz>
Date: Sat, 6 Jul 2024 10:19:14 +1200
Subject: [PATCH] FF-1667: ConvertAudio AAC High Efficiency not used on fixed
 bitrate

---
 .../Nodes/ConvertFlowElements/ConvertNode.cs  |   5 +
 AudioNodes/Tests/AudioTestBase.cs             |   2 +-
 AudioNodes/Tests/ConvertTests.cs              |  17 +++
 AudioNodes/Tests/EmbedArtworkTests.cs         |   1 -
 AudioNodes/Tests/TestLogger.cs                | 144 +++++++++++-------
 AudioNodes/Tests/_LocalFileService.cs         |   2 +-
 AudioNodes/Tests/_TestBase.cs                 |   1 +
 FileFlows.Plugin.dll                          | Bin 146944 -> 146944 bytes
 FileFlows.Plugin.pdb                          | Bin 36360 -> 36364 bytes
 9 files changed, 111 insertions(+), 61 deletions(-)

diff --git a/AudioNodes/Nodes/ConvertFlowElements/ConvertNode.cs b/AudioNodes/Nodes/ConvertFlowElements/ConvertNode.cs
index 852edc83..9b7da153 100644
--- a/AudioNodes/Nodes/ConvertFlowElements/ConvertNode.cs
+++ b/AudioNodes/Nodes/ConvertFlowElements/ConvertNode.cs
@@ -109,6 +109,11 @@ namespace FileFlows.AudioNodes
                     "-ab",
                     (bitrate == -1 ? GetSourceBitrate(args).ToString() : bitrate + "k")
                 });
+                if (Codec == "aac" && HighEfficiency)
+                {
+                    extension = "m4a";
+                    ffArgs.AddRange(new[] { "-profile:a", "aac_he_v2" });
+                }
             }
 
             if (SampleRate > 0)
diff --git a/AudioNodes/Tests/AudioTestBase.cs b/AudioNodes/Tests/AudioTestBase.cs
index a33569ed..8006e179 100644
--- a/AudioNodes/Tests/AudioTestBase.cs
+++ b/AudioNodes/Tests/AudioTestBase.cs
@@ -9,7 +9,7 @@ public abstract class AudioTestBase : TestBase
 {
     protected NodeParameters GetNodeParameters(string file, bool isDirectory = false)
     {
-        var args = new FileFlows.Plugin.NodeParameters(file, Logger, isDirectory, string.Empty, new LocalFileService());
+        var args = new NodeParameters(file, Logger, isDirectory, string.Empty, new LocalFileService());
         
         args.GetToolPathActual = (string tool) =>
         {
diff --git a/AudioNodes/Tests/ConvertTests.cs b/AudioNodes/Tests/ConvertTests.cs
index 5401ef60..650cd0e9 100644
--- a/AudioNodes/Tests/ConvertTests.cs
+++ b/AudioNodes/Tests/ConvertTests.cs
@@ -112,6 +112,23 @@ public class ConvertTests :  AudioTestBase
     }
 
 
+    [TestMethod]
+    public void Convert_AacHighEfficient()
+    {
+        var args = GetNodeParameters(TestFile_Mp3);
+        var af = new AudioFile();
+        af.PreExecute(args);
+        af.Execute(args); // need to read the Audio info and set it
+        
+        ConvertToAAC ele = new();
+        ele.HighEfficiency = true;
+        ele.Bitrate = 192;
+        ele.PreExecute(args);
+        int output = ele.Execute(args);
+
+        Assert.AreEqual(1, output);
+    }
+    
     [TestMethod]
     public void Convert_Mp3ToMp3_Bitrate()
     {
diff --git a/AudioNodes/Tests/EmbedArtworkTests.cs b/AudioNodes/Tests/EmbedArtworkTests.cs
index 9520c6a6..d4b205b5 100644
--- a/AudioNodes/Tests/EmbedArtworkTests.cs
+++ b/AudioNodes/Tests/EmbedArtworkTests.cs
@@ -78,7 +78,6 @@ public class EmbedArtworkTests : AudioTestBase
         var result = convertNode.Execute(args);
         var log = Logger.ToString();
         Assert.AreEqual(1, result);
-        Logger.Clear();
         
         var ele = new EmbedArtwork();
         var output = ele.Execute(args);
diff --git a/AudioNodes/Tests/TestLogger.cs b/AudioNodes/Tests/TestLogger.cs
index 919a0ca9..5be157f0 100644
--- a/AudioNodes/Tests/TestLogger.cs
+++ b/AudioNodes/Tests/TestLogger.cs
@@ -1,67 +1,95 @@
 #if(DEBUG)
 
-namespace FileFlows.AudioNodes.Tests
+using FileFlows.Plugin;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FileFlows.AudioNodes.Tests;
+    
+/// <summary>
+/// A logger for tests that stores the logs in memory
+/// </summary>
+public class TestLogger : ILogger
 {
-    using FileFlows.Plugin;
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Text;
-    using System.Threading.Tasks;
+    private readonly List<string> Messages = new();
 
-    internal class TestLogger : ILogger
+    /// <summary>
+    /// Writes an information log message
+    /// </summary>
+    /// <param name="args">the log parameters</param>
+    public void ILog(params object[] args)
+        => Log(LogType.Info, args);
+
+    /// <summary>
+    /// Writes an debug log message
+    /// </summary>
+    /// <param name="args">the log parameters</param>
+    public void DLog(params object[] args)
+        => Log(LogType.Debug, args);
+
+    /// <summary>
+    /// Writes an warning log message
+    /// </summary>
+    /// <param name="args">the log parameters</param>
+    public void WLog(params object[] args)
+        => Log(LogType.Warning, args);
+
+    /// <summary>
+    /// Writes an error log message
+    /// </summary>
+    /// <param name="args">the log parameters</param>
+    public void ELog(params object[] args)
+        => Log(LogType.Error, args);
+
+    /// <summary>
+    /// Gets the tail of the log
+    /// </summary>
+    /// <param name="length">the number of messages to get</param>
+    public string GetTail(int length = 50)
     {
-        private List<string> Messages = new List<string>();
-
-        public void DLog(params object[] args) => Log("DBUG", args);
-
-        public void ELog(params object[] args) => Log("ERRR", args);
-
-        public void ILog(params object[] args) => Log("INFO", args);
-
-        public void WLog(params object[] args) => Log("WARN", args);
-
-        private void Log(string type, object[] args)
-        {
-            if (args == null || args.Length == 0)
-                return;
-            string message = type + " -> " +
-                string.Join(", ", args.Select(x =>
-                x == null ? "null" :
-                x.GetType().IsPrimitive || x is string ? x.ToString() :
-                System.Text.Json.JsonSerializer.Serialize(x)));
-            Messages.Add(message);
-        }
-
-        public bool Contains(string message)
-        {
-            if (string.IsNullOrWhiteSpace(message))
-                return false;
-
-            string log = string.Join(Environment.NewLine, Messages);
-            return log.Contains(message);
-        }
-
-        public override string ToString()
-        {
-            return String.Join(Environment.NewLine, this.Messages.ToArray());
-        }
-
-        public string GetTail(int length = 50)
-        {
-            if (length <= 0)
-                length = 50;
-            if (Messages.Count <= length)
-                return string.Join(Environment.NewLine, Messages);
-            return string.Join(Environment.NewLine, Messages.TakeLast(length));
-        }
-
-        /// <summary>
-        /// Clears the log
-        /// </summary>
-        public void Clear()
-            => Messages.Clear();
+        if (Messages.Count <= length)
+            return string.Join(Environment.NewLine, Messages);
+        return string.Join(Environment.NewLine, Messages.TakeLast(50));
     }
+
+    /// <summary>
+    /// Logs a message
+    /// </summary>
+    /// <param name="type">the type of log to record</param>
+    /// <param name="args">the arguments of the message</param>
+    private void Log(LogType type, params object[] args)
+    {
+        string message = type + " -> " + string.Join(", ", args.Select(x =>
+            x == null ? "null" :
+            x.GetType().IsPrimitive ? x.ToString() :
+            x is string ? x.ToString() :
+            System.Text.Json.JsonSerializer.Serialize(x)));
+        Writer?.Invoke(message);
+        Messages.Add(message);
+    }
+
+    /// <summary>
+    /// Gets or sets an optional writer
+    /// </summary>
+    public Action<string> Writer { get; set; }
+
+    /// <summary>
+    /// Returns the entire log as a string
+    /// </summary>
+    /// <returns>the entire log</returns>
+    public override string ToString()
+        => string.Join(Environment.NewLine, Messages);
+
+    /// <summary>
+    /// Checks if the log contains the text
+    /// </summary>
+    /// <param name="text">the text to check for</param>
+    /// <returns>true if it contains it, otherwise false</returns>
+    public bool Contains(string text)
+        => Messages.Any(x => x.Contains(text));
 }
 
 #endif
\ No newline at end of file
diff --git a/AudioNodes/Tests/_LocalFileService.cs b/AudioNodes/Tests/_LocalFileService.cs
index 43a20d62..e09fee2c 100644
--- a/AudioNodes/Tests/_LocalFileService.cs
+++ b/AudioNodes/Tests/_LocalFileService.cs
@@ -367,7 +367,7 @@ public class LocalFileService : IFileService
 
     public Result<long> DirectorySize(string path)
     {
-        throw new NotImplementedException();
+        return 0;
     }
 
     public Result<bool> SetCreationTimeUtc(string path, DateTime date)
diff --git a/AudioNodes/Tests/_TestBase.cs b/AudioNodes/Tests/_TestBase.cs
index cffa168e..d960ae90 100644
--- a/AudioNodes/Tests/_TestBase.cs
+++ b/AudioNodes/Tests/_TestBase.cs
@@ -39,6 +39,7 @@ public abstract class TestBase
     [TestInitialize]
     public void TestInitialize()
     {
+        Logger.Writer = (msg) => TestContext.WriteLine(msg);
         this.TestPath = this.TestPath?.EmptyAsNull() ?? (IsLinux ? "~/src/ff-files/test-files/audio" : @"d:\audio\testfiles");
         this.TempPath = this.TempPath?.EmptyAsNull() ?? (IsLinux ? "~/src/ff-files/temp" : @"d:\audio\temp");
         this.FfmpegPath = this.FfmpegPath?.EmptyAsNull() ?? (IsLinux ? "/usr/local/bin/ffmpeg" :  @"C:\utils\ffmpeg\ffmpeg.exe");
diff --git a/FileFlows.Plugin.dll b/FileFlows.Plugin.dll
index 73d037fe57aa9b6617b53516605e00b4a5ff07cf..8f56f74c613a16b4d4451bac66bd9f611cd69647 100644
GIT binary patch
delta 250
zcmZqp!_n}EV?qbZ`{c8)8+%%N7`OH?-H{WR+R^y+ikG=Z)11%seYI1hw^ztBEf>}>
zF*Pu;Fi1`|N;R`IF*7qaPcpVNH#4;`NHZ`rNijDyNKHvgN=q`^?rzL9k&)&1OU(n*
z@0c(J2<WBz?^^lcyzj0r-QPa2c=S!TF=et>fQrigf{FswJEUEARQ@%$!+rHZxx?FM
zn=(yh^*3QKWiVhcVXy#_$v|ktkjh}jU<nj41445kOkyww^38!fQ?RNuph`oad<swu
Uq&F4FN&~6_VYBV^)=Z5|0AkWo;s5{u

delta 250
zcmZqp!_n}EV?qbZh4{kfjXkYBj9Yt{?#Ky<s%}}eso<VRQ~s&*hPRJx+g>5hv|L!j
z!qC#tFe%y0z{1kN)X2a*EjcwY#lj%PBGJe)&A=kbB*`?<$T-<zySp*dL`D|h<5M?H
zzhlA_AYgaaSY#Vdg2$Fs^$*r$G09H1F=et>fQrsAfr<jv8yRhQw`*qd&rOOtMwQ!V
zn=(yh^|xR!WUvHcLxv=VWCk+^0|pBq-+;lC!3ap2Go%4UQyCH&Qh?$HU@{RXV+j-o
ZsZ3%p0b*02yb*&jP^HE8dTXXeCIDfkOymFn

diff --git a/FileFlows.Plugin.pdb b/FileFlows.Plugin.pdb
index 9387b8c89f28051738f5e8c4caa45672f5365259..cbcff748eb4ae7effe19f09c6542d8c9e8e18b2c 100644
GIT binary patch
delta 2958
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

delta 2955
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