From c4ac36b9b26b38f326a934788e215237b655c973 Mon Sep 17 00:00:00 2001 From: gal20 <71563441+gal20@users.noreply.github.com> Date: Sat, 14 Nov 2020 20:01:04 +0200 Subject: [PATCH 1/4] change ENABLE_FDK to option --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9fbbb0497e..35abd0c351 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,7 +41,7 @@ CMAKE_DEPENDENT_OPTION(COMPILE_WITH_DWARF "Add DWARF debugging information" ON " option(USE_SYSTEM_BOOST "Use the system Boost libs (instead of the bundled ones)" OFF) -CMAKE_DEPENDENT_OPTION(ENABLE_FDK "Use FDK AAC decoder" OFF "NOT ENABLE_FFMPEG_AUDIO_DECODER;NOT ENABLE_MF" OFF) +option(ENABLE_FDK "Use FDK AAC decoder" OFF) if(NOT EXISTS ${PROJECT_SOURCE_DIR}/.git/hooks/pre-commit) message(STATUS "Copying pre-commit hook") From d870651df7c3ab06637b1ef7e62374a4e717ad67 Mon Sep 17 00:00:00 2001 From: gal20 <71563441+gal20@users.noreply.github.com> Date: Sat, 14 Nov 2020 20:02:36 +0200 Subject: [PATCH 2/4] Enable fdk decoder in flatpak version --- .ci/linux-flatpak/generate-data.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.ci/linux-flatpak/generate-data.sh b/.ci/linux-flatpak/generate-data.sh index 799f0f1b80..3048badf06 100644 --- a/.ci/linux-flatpak/generate-data.sh +++ b/.ci/linux-flatpak/generate-data.sh @@ -87,7 +87,8 @@ cat > /tmp/org.citra.$REPO_NAME.json < Date: Sat, 14 Nov 2020 20:06:25 +0200 Subject: [PATCH 3/4] Remove pessimistic sanity check This check creates false positive when using the flatpak runtime library --- src/audio_core/hle/fdk_decoder.cpp | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/audio_core/hle/fdk_decoder.cpp b/src/audio_core/hle/fdk_decoder.cpp index 0dac8fd5de..ebf5a676f7 100644 --- a/src/audio_core/hle/fdk_decoder.cpp +++ b/src/audio_core/hle/fdk_decoder.cpp @@ -39,14 +39,6 @@ FDKDecoder::Impl::Impl(Memory::MemorySystem& memory) : memory(memory) { LOG_ERROR(Audio_DSP, "Failed to retrieve fdk_aac library information!"); return; } - // This segment: identify the broken fdk_aac implementation - // and refuse to initialize if identified as broken (check for module IDs) - // although our AAC samples do not contain SBC feature, this is a way to detect - // watered down version of fdk_aac implementations - if (FDKlibInfo_getCapabilities(decoder_info, FDK_SBRDEC) == 0) { - LOG_ERROR(Audio_DSP, "Bad fdk_aac library found! Initialization aborted!"); - return; - } LOG_INFO(Audio_DSP, "Using fdk_aac version {} (build date: {})", decoder_info[0].versionStr, decoder_info[0].build_date); From eca33d2de839f4a2cdb83918ef07c38a375afb5c Mon Sep 17 00:00:00 2001 From: gal20 <71563441+gal20@users.noreply.github.com> Date: Mon, 16 Nov 2020 08:37:34 +0200 Subject: [PATCH 4/4] Revert ENABLE_FDK to dependent option --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 35abd0c351..9fbbb0497e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,7 +41,7 @@ CMAKE_DEPENDENT_OPTION(COMPILE_WITH_DWARF "Add DWARF debugging information" ON " option(USE_SYSTEM_BOOST "Use the system Boost libs (instead of the bundled ones)" OFF) -option(ENABLE_FDK "Use FDK AAC decoder" OFF) +CMAKE_DEPENDENT_OPTION(ENABLE_FDK "Use FDK AAC decoder" OFF "NOT ENABLE_FFMPEG_AUDIO_DECODER;NOT ENABLE_MF" OFF) if(NOT EXISTS ${PROJECT_SOURCE_DIR}/.git/hooks/pre-commit) message(STATUS "Copying pre-commit hook")