From 9055076d0d81d7b83fc88d652020a21f9a8f440d Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Wed, 4 Sep 2024 22:31:19 +0300
Subject: [PATCH] Add fdk-aac & AAC request structure

---
 .gitmodules           | 3 +++
 CMakeLists.txt        | 3 ++-
 include/audio/aac.hpp | 9 +++++++++
 third_party/fdk-aac   | 1 +
 4 files changed, 15 insertions(+), 1 deletion(-)
 create mode 160000 third_party/fdk-aac

diff --git a/.gitmodules b/.gitmodules
index 656e1f41..981b4426 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -76,3 +76,6 @@
 [submodule "third_party/metal-cpp"]
 	path = third_party/metal-cpp
 	url = https://github.com/Panda3DS-emu/metal-cpp
+[submodule "third_party/fdk-aac"]
+	path = third_party/fdk-aac
+	url = https://github.com/mstorsjo/fdk-aac/
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 107593d0..d1a67b79 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -225,6 +225,7 @@ else()
 endif()
 
 add_subdirectory(third_party/teakra EXCLUDE_FROM_ALL)
+add_subdirectory(third_party/fdk-aac)
 
 set(CAPSTONE_ARCHITECTURE_DEFAULT OFF)
 set(CAPSTONE_ARM_SUPPORT ON)
@@ -478,7 +479,7 @@ set(ALL_SOURCES ${SOURCE_FILES} ${FS_SOURCE_FILES} ${CRYPTO_SOURCE_FILES} ${KERN
     ${AUDIO_SOURCE_FILES} ${HEADER_FILES} ${FRONTEND_HEADER_FILES})
 target_sources(AlberCore PRIVATE ${ALL_SOURCES})
 
-target_link_libraries(AlberCore PRIVATE dynarmic cryptopp glad resources_console_fonts teakra)
+target_link_libraries(AlberCore PRIVATE dynarmic cryptopp glad resources_console_fonts teakra fdk-aac)
 target_link_libraries(AlberCore PUBLIC glad capstone)
 
 if(ENABLE_DISCORD_RPC AND NOT ANDROID)
diff --git a/include/audio/aac.hpp b/include/audio/aac.hpp
index afd2dbba..e59a006c 100644
--- a/include/audio/aac.hpp
+++ b/include/audio/aac.hpp
@@ -54,6 +54,13 @@ namespace Audio::AAC {
 		u32_le sampleCount;
 	};
 
+	struct DecodeRequest {
+		u32_le address;        // Address of input AAC stream
+		u32_le size;           // Size of input AAC stream
+		u32_le destAddrLeft;   // Output address for left channel samples
+		u32_le destAddrRight;  // Output address for right channel samples
+	};
+
 	struct Message {
 		u16_le mode = Mode::None;  // Encode or decode AAC?
 		u16_le command = Command::Init;
@@ -62,7 +69,9 @@ namespace Audio::AAC {
 		// Info on the AAC request
 		union {
 			std::array<u8, 24> commandData{};
+
 			DecodeResponse decodeResponse;
+			DecodeRequest decodeRequest;
 		};
 	};
 
diff --git a/third_party/fdk-aac b/third_party/fdk-aac
new file mode 160000
index 00000000..716f4394
--- /dev/null
+++ b/third_party/fdk-aac
@@ -0,0 +1 @@
+Subproject commit 716f4394641d53f0d79c9ddac3fa93b03a49f278