N-archive/citra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #5609 from gal20/enable-fdk-patch

Browse source 
Enable fdk decoder for flatpak version
This commit is contained in:
Marshall Mohror 2020-12-30 11:59:18 -06:00 committed by GitHub
commit ab6c605e59
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.ci/linux-flatpak/generate-data.sh
View file

@ -87,7 +87,8 @@ cat > /tmp/org.citra.$REPO_NAME.json <<EOF
"-DENABLE_QT_TRANSLATION=ON", "-DENABLE_QT_TRANSLATION=ON",
"-DCITRA_ENABLE_COMPATIBILITY_REPORTING=ON", "-DCITRA_ENABLE_COMPATIBILITY_REPORTING=ON",
"-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON", "-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON",
"-DENABLE_FFMPEG_VIDEO_DUMPER=ON" "-DENABLE_FFMPEG_VIDEO_DUMPER=ON",
"-DENABLE_FDK=ON"
], ],
"cleanup": [ "cleanup": [
"/bin/citra", "/bin/citra",

8
src/audio_core/hle/fdk_decoder.cpp
View file

@ -39,14 +39,6 @@ FDKDecoder::Impl::Impl(Memory::MemorySystem& memory) : memory(memory) {
LOG_ERROR(Audio_DSP, "Failed to retrieve fdk_aac library information!"); LOG_ERROR(Audio_DSP, "Failed to retrieve fdk_aac library information!");
return; 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, LOG_INFO(Audio_DSP, "Using fdk_aac version {} (build date: {})", decoder_info[0].versionStr,
decoder_info[0].build_date); decoder_info[0].build_date);