AAC FAAD test

Author: pschatzmann

src/AudioTools/AudioCodecs/CodecAACFAAD.h

@@ -57,7 +57,7 @@ class AACDecoderFAAD : public AudioDecoder {
     conf->outputFormat = FAAD_FMT_16BIT;
     //conf->defObjectType = LC;
     conf->defSampleRate = info.sample_rate;
-    conf->downMatrix = false;
+    conf->downMatrix = true; // 5.1 channel downmatrixed to 2 channel
     conf->useOldADTSFormat = false;
     conf->dontUpSampleImplicitSBR = false;
 

src/AudioTools/CoreAudio/AudioHttp/URLStream.h

@@ -95,7 +95,7 @@ class URLStream : public AbstractURLStream {
     int result = process<const char*>(action, url, reqMime, reqData);
     if (result > 0) {
       size = request.contentLength();
-      LOGI("size: %d", (int)size);
+      LOGI("contentLength: %d", (int)size);
       if (size >= 0 && wait_for_data) {
         waitForData(clientTimeout);
       }

tests-cmake/codec/CMakeLists.txt

@@ -18,6 +18,7 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
 endif()
 
 
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/aac-faad ${CMAKE_CURRENT_BINARY_DIR}/aac-faad)
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/aac-fdk ${CMAKE_CURRENT_BINARY_DIR}/aac-fdk)
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/aac-fdk-encode ${CMAKE_CURRENT_BINARY_DIR}/aac-fdk-encode)
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/mp3-helix ${CMAKE_CURRENT_BINARY_DIR}/mp3-helix)

tests-cmake/codec/aac-faad/aac-faad.cpp

@@ -7,8 +7,8 @@
 using namespace audio_tools;  
 
 MemoryStream aac(gs_16b_2c_44100hz_aac, gs_16b_2c_44100hz_aac_len);
-PortAudioStream out;   // Output of sound on desktop 
-//CsvOutput<int16_t> out(Serial, 2);
+//PortAudioStream out;   // Output of sound on desktop 
+CsvOutput<int16_t> out(Serial, 2);
 EncodedAudioStream dec(&out, new AACDecoderFAAD()); // aac data source
 StreamCopy copier(dec, aac); // copy in to out