[WIP] AAC/HE-AAC encoder (powered by libfdk-aac)

.travis.yml

@@ -47,11 +47,12 @@ addons:
       - scons
       - qtkeychain-dev
       - liblilv-dev
+      - libfdk-aac-dev
 before_install:
   # Virtual X, needed for analyzer waveform tests
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export DISPLAY=:99.0         ; fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sh -e /etc/init.d/xvfb start ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install scons portaudio libsndfile libogg libvorbis portmidi taglib libshout protobuf flac ffmpeg qt chromaprint rubberband libmodplug libid3tag libmad mp4v2 faad2 wavpack opusfile lilv lame sound-touch; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install scons portaudio libsndfile libogg libvorbis portmidi taglib libshout protobuf flac ffmpeg qt chromaprint rubberband libmodplug libid3tag libmad mp4v2 faad2 wavpack opusfile lilv lame sound-touch fdk-aac; fi
 
 install:
   ####

appveyor.yml

@@ -50,7 +50,7 @@ for:
 
   install:
     - sudo apt-get update
-    - sudo apt-get -y install gdb libavformat-dev libchromaprint-dev libfaad-dev libflac-dev libid3tag0-dev libmad0-dev libmodplug-dev libmp3lame-dev libmp4v2-dev libopus-dev libopusfile-dev libportmidi-dev libprotobuf-dev libqt5opengl5-dev libqt5sql5-sqlite libqt5svg5-dev librubberband-dev libshout3-dev libsndfile1-dev libsqlite3-dev libtag1-dev libupower-glib-dev libusb-1.0-0-dev libwavpack-dev portaudio19-dev protobuf-compiler qt5-default qtscript5-dev libqt5x11extras5-dev scons qtkeychain-dev liblilv-dev libsoundtouch-dev
+    - sudo apt-get -y install gdb libavformat-dev libchromaprint-dev libfaad-dev libflac-dev libid3tag0-dev libmad0-dev libmodplug-dev libmp3lame-dev libmp4v2-dev libopus-dev libopusfile-dev libportmidi-dev libprotobuf-dev libqt5opengl5-dev libqt5sql5-sqlite libqt5svg5-dev librubberband-dev libshout3-dev libsndfile1-dev libsqlite3-dev libtag1-dev libupower-glib-dev libusb-1.0-0-dev libwavpack-dev portaudio19-dev protobuf-compiler qt5-default qtscript5-dev libqt5x11extras5-dev scons qtkeychain-dev liblilv-dev libsoundtouch-dev libfdk-aac-dev
 
   build_script:
     - scons -j4 test=1 mad=1 faad=1 ffmpeg=1 opus=1 modplug=1 wv=1 hss1394=0 virtualize=0 debug_assertions_fatal=1 verbose=0 localecompare=1

build/depends.py

@@ -682,6 +682,11 @@ def configure(self, build, conf):
         if not conf.CheckLib(['libmp3lame', 'libmp3lame-static']):
             raise Exception("Could not find libmp3lame.")
 
+class FdkAac(Dependence):
+    def configure(self, build, conf):
+        if not conf.CheckLib(['libfdk-aac']):
+            raise Exception("Could not find libfdk-aac.")
+
 class MixxxCore(Feature):
 
     def description(self):
@@ -1174,6 +1179,8 @@ def sources(self, build):
                    "src/encoder/encoderwave.cpp",
                    "src/encoder/encoderwavesettings.cpp",
                    'src/encoder/encoderopussettings.cpp',
+                   "src/encoder/encoderfdkaac.cpp"
+                   "src/encoder/encoderfdkaacsettings.cpp",
 
                    "src/util/sleepableqthread.cpp",
                    "src/util/statsmanager.cpp",
@@ -1507,7 +1514,7 @@ def depends(self, build):
                 FidLib, SndFile, FLAC, OggVorbis, OpenGL, TagLib, ProtoBuf,
                 Chromaprint, RubberBand, SecurityFramework, CoreServices, IOKit,
                 QtScriptByteArray, Reverb, FpClassify, PortAudioRingBuffer, LAME,
-                QueenMaryDsp]
+                QueenMaryDsp, FdkAac]
 
     def post_dependency_check_configure(self, build, conf):
         """Sets up additional things in the Environment that must happen

src/broadcast/defs_broadcast.h

@@ -26,6 +26,9 @@
 #define BROADCAST_FORMAT_MP3 "MP3"
 #define BROADCAST_FORMAT_OV "OggVorbis"
 #define BROADCAST_FORMAT_OPUS "Opus"
+#define BROADCAST_FORMAT_AAC "AAC"
+#define BROADCAST_FORMAT_HEAAC "HEAAC"
+#define BROADCAST_FORMAT_HEAACV2 "HEAACV2"
 
 // EngineNetworkStream can't use locking mechanisms to protect its
 // internal worker list against concurrency issues, as it is used by

src/encoder/encoder.cpp

@@ -33,6 +33,9 @@
 #endif
 #include "encoder/encoderopussettings.h"
 
+#include "encoder/encoderfdkaac.h"
+#include "encoder/encoderfdkaacsettings.h"
+
 #include <QList>
 
 EncoderFactory EncoderFactory::factory;
@@ -49,10 +52,12 @@ EncoderFactory::EncoderFactory() {
     m_formats.append(Encoder::Format("FLAC", ENCODING_FLAC, true));
     m_formats.append(Encoder::Format("MP3", ENCODING_MP3, false));
     m_formats.append(Encoder::Format("OGG Vorbis", ENCODING_OGG, false));
-
 #ifdef __OPUS__
     m_formats.append(Encoder::Format("Opus", ENCODING_OPUS, false));
 #endif
+    m_formats.append(Encoder::Format("AAC",ENCODING_AAC, false, "m4a"));
+    m_formats.append(Encoder::Format("HE-AAC",ENCODING_HEAAC, false, "m4a"));
+    m_formats.append(Encoder::Format("HE-AACv2",ENCODING_HEAACV2, false, "m4a"));
 }
 
 const QList<Encoder::Format> EncoderFactory::getFormats() const
@@ -116,6 +121,11 @@ EncoderPointer EncoderFactory::getNewEncoder(Encoder::Format format,
         pEncoder->setEncoderSettings(EncoderOpusSettings(pConfig));
     }
 #endif
+    } else if (format.internalName == ENCODING_AAC ||
+            format.internalName == ENCODING_HEAAC ||
+            format.internalName == ENCODING_HEAACV2) {
+        pEncoder = std::make_shared<EncoderFdkAac>(pCallback, format.internalName);
+        pEncoder->setEncoderSettings(EncoderFdkAacSettings(pConfig));
     else {
         qWarning() << "Unsupported format requested! " << format.internalName;
         DEBUG_ASSERT(false);
@@ -140,6 +150,10 @@ EncoderSettingsPointer EncoderFactory::getEncoderSettings(Encoder::Format format
         return std::make_shared<EncoderVorbisSettings>(pConfig);
     } else if (format.internalName == ENCODING_OPUS) {
         return std::make_shared<EncoderOpusSettings>(pConfig);
+    } else if (format.internalName == ENCODING_AAC ||
+            format.internalName == ENCODING_HEAAC ||
+            format.internalName == ENCODING_HEAACV2) {
+        return std::make_shared<EncoderFdkAacSettings>(pConfig);
     } else {
         qWarning() << "Unsupported format requested! " << format.internalName;
         DEBUG_ASSERT(false);

src/encoder/encoder.h

@@ -20,11 +20,18 @@ class Encoder {
   public:
         class Format {
             public:
-            Format(QString labelIn, QString nameIn, bool losslessIn) :
-                label(labelIn), internalName(nameIn), lossless(losslessIn) {}
+            Format(QString labelIn, QString nameIn, bool losslessIn,
+                    QString fileExtIn = QString::null) :
+                label(labelIn), internalName(nameIn), lossless(losslessIn),
+                    fileExtension(fileExtIn){
+                if(fileExtension == QString::null) {
+                    fileExtension = label;
+                }
+            }
             QString label;
             QString internalName;
             bool lossless;
+            QString fileExtension;
         };
 
     Encoder() {}