octo/citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

audio_core: Fix FDK AAC decoding. (#6530)

Browse Source
This commit is contained in:
Steveice10
2023-05-14 19:50:07 -07:00
committed by GitHub
parent dc39eac916
commit 0768bd8ce0
2 changed files with 29 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/audio_core/hle/audiotoolbox_decoder.cpp
View File

@ -187,8 +187,8 @@ std::optional<BinaryResponse> AudioToolboxDecoder::Impl::Decode(const BinaryRequ
return std::nullopt;
}
// 1024 samples, up to 2 channels each
s16 decoder_output[2048];
// Up to 2048 samples, up to 2 channels each
s16 decoder_output[4096];
AudioBufferList out_buffer{1,
{{
output_format.mChannelsPerFrame,
@ -208,8 +208,8 @@ std::optional<BinaryResponse> AudioToolboxDecoder::Impl::Decode(const BinaryRequ
// De-interleave samples.
std::array<std::vector<s16>, 2> out_streams;
auto num_frames = num_packets * output_format.mFramesPerPacket;
for (auto frame = 0; frame < num_frames; frame++) {
for (auto ch = 0; ch < output_format.mChannelsPerFrame; ch++) {
for (u32 frame = 0; frame < num_frames; frame++) {
for (u32 ch = 0; ch < output_format.mChannelsPerFrame; ch++) {
out_streams[ch].push_back(
decoder_output[(frame * output_format.mChannelsPerFrame) + ch]);
}
@ -223,16 +223,17 @@ std::optional<BinaryResponse> AudioToolboxDecoder::Impl::Decode(const BinaryRequ
response.num_samples = num_frames;
// transfer the decoded buffer from vector to the FCRAM
for (auto ch = 0; ch < out_streams.size(); ch++) {
for (std::size_t ch = 0; ch < out_streams.size(); ch++) {
if (!out_streams[ch].empty()) {
auto byte_size = out_streams[ch].size() * bytes_per_sample;
auto dst = ch == 0 ? request.dst_addr_ch0 : request.dst_addr_ch1;
if (dst < Memory::FCRAM_PADDR ||
dst + out_streams[ch].size() > Memory::FCRAM_PADDR + Memory::FCRAM_SIZE) {
dst + byte_size > Memory::FCRAM_PADDR + Memory::FCRAM_SIZE) {
LOG_ERROR(Audio_DSP, "Got out of bounds dst_addr_ch{} {:08x}", ch, dst);
return {};
}
std::memcpy(memory.GetFCRAMPointer(dst - Memory::FCRAM_PADDR), out_streams[ch].data(),
out_streams[ch].size() * bytes_per_sample);
byte_size);
}
}