diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2012-11-20 03:22:24 +0100 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2012-11-20 03:22:24 +0100 |
| commit | ae85159a9481a8eba49dcb9ec744c16dbbecd16d (patch) | |
| tree | e98c46f3f5416cdb3be003117fc9c43b2e12cf42 /Source/Core | |
| parent | 954c55e35afbb1191f97e6da2f2b05be3696e2c4 (diff) | |
Add surround sound support to GC AX HLE
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp | 18 | ||||
| -rw-r--r-- | Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h | 3 |
2 files changed, 12 insertions, 9 deletions
diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp index 54bd50830d..8f372f3313 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp @@ -157,13 +157,11 @@ void CUCode_AX::HandleCommandList() break; case CMD_OUTPUT: - // Skip the first address, it is used for surround audio - // output, which we don't support yet. - curr_idx += 2; - addr_hi = m_cmdlist[curr_idx++]; addr_lo = m_cmdlist[curr_idx++]; - OutputSamples(HILO_TO_32(addr)); + addr2_hi = m_cmdlist[curr_idx++]; + addr2_lo = m_cmdlist[curr_idx++]; + OutputSamples(HILO_TO_32(addr2), HILO_TO_32(addr)); break; case CMD_END: @@ -379,8 +377,14 @@ void CUCode_AX::UploadLRS(u32 dst_addr) memcpy(HLEMemory_Get_Pointer(dst_addr), buffers, sizeof (buffers)); } -void CUCode_AX::OutputSamples(u32 out_addr) +void CUCode_AX::OutputSamples(u32 lr_addr, u32 surround_addr) { + int surround_buffer[5 * 32]; + + for (u32 i = 0; i < 5 * 32; ++i) + surround_buffer[i] = Common::swap32(m_samples_surround[i]); + memcpy(HLEMemory_Get_Pointer(surround_addr), surround_buffer, sizeof (surround_buffer)); + // 32 samples per ms, 5 ms, 2 channels short buffer[5 * 32 * 2]; @@ -405,7 +409,7 @@ void CUCode_AX::OutputSamples(u32 out_addr) buffer[2 * i + 1] = Common::swap16(m_samples_right[i]); } - memcpy(HLEMemory_Get_Pointer(out_addr), buffer, sizeof (buffer)); + memcpy(HLEMemory_Get_Pointer(lr_addr), buffer, sizeof (buffer)); } void CUCode_AX::HandleMail(u32 mail) diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h index 23bc786111..d5f07fc13a 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h @@ -21,7 +21,6 @@ // * Depop support // * ITD support // * Polyphase sample interpolation support (not very useful) -// * Surround sound mixing // * Dolby Pro 2 mixing with recent AX versions #ifndef _UCODE_AX_H @@ -135,7 +134,7 @@ protected: void ProcessPBList(u32 pb_addr); void MixAUXSamples(int aux_id, u32 write_addr, u32 read_addr); void UploadLRS(u32 dst_addr); - void OutputSamples(u32 out_addr); + void OutputSamples(u32 out_addr, u32 surround_addr); private: enum CmdType |