ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DSPHLE: Zelda ucode: Better volume handling for volume mode 1. Fixes most (not all) volume and stereo issues. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3747 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
hrydgard 2009-07-11 14:45:05 +00:00
parent f6edc361b4
commit e0efa586a1
1 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_Zelda_Voice.cpp
View File

@ -473,7 +473,7 @@ void CUCode_Zelda::RenderAddVoice(ZeldaVoicePB &PB, s32* _LeftBuffer, s32* _Righ
short AX0L = PB.raw[0x28] >> 8; short AX0L = PB.raw[0x28] >> 8;
short AX0H = PB.raw[0x28] & 0x7F; short AX0H = PB.raw[0x28] & 0x7F;
short AX1L = AX0L ^ 0x7F; short AX1L = AX0L ^ 0x7F;
short AX1H = AX1L ^ 0x7F; short AX1H = AX0H ^ 0x7F;
AX0L = m_MiscTable[0x200 + AX0L]; AX0L = m_MiscTable[0x200 + AX0L];
AX0H = m_MiscTable[0x200 + AX0H]; AX0H = m_MiscTable[0x200 + AX0H];
AX1L = m_MiscTable[0x200 + AX1L]; AX1L = m_MiscTable[0x200 + AX1L];
@ -484,27 +484,46 @@ void CUCode_Zelda::RenderAddVoice(ZeldaVoicePB &PB, s32* _LeftBuffer, s32* _Righ
b00[1] = AX0L * AX1H >> 16; b00[1] = AX0L * AX1H >> 16;
b00[2] = AX0H * AX1L >> 16; b00[2] = AX0H * AX1L >> 16;
b00[3] = AX0L * AX0H >> 16; b00[3] = AX0L * AX0H >> 16;
for (int i = 0; i < 4; i++) { for (int i = 0; i < 4; i++) {
b00[i + 4] = b00[i] * PB.raw[0x2a] >> 16; b00[i + 4] = (s16)b00[i] * (s16)PB.raw[0x2a] >> 16;
} }
// ... not done yet... int prod = ((s16)PB.raw[0x2a] * (s16)PB.raw[0x29] * 2) >> 16;
for (int i = 0; i < 4; i++) {
b00[i + 8] = (s16)b00[i + 4] * prod;
}
// ZWW 0d34
int diff = (s16)PB.raw[0x2b] - (s16)PB.raw[0x2a];
PB.raw[0x2a] = PB.raw[0x2b];
for (int i = 0; i < 4; i++) {
b00[i + 0xc] = (unsigned short)b00[i] * diff >> 16;
}
for (int i = 0; i < 4; i++) {
b00[i + 0x10] = (s16)b00[i + 0xc] * PB.raw[0x29];
}
for (int count = 0; count < 8; count++) for (int count = 0; count < 8; count++)
{ {
// The 8 buffers to mix to: 0d00, 0d60, 0f40 0ca0 0e80 0ee0 0c00 0c50 // The 8 buffers to mix to: 0d00, 0d60, 0f40 0ca0 0e80 0ee0 0c00 0c50
// We just mix to the first to and call it stereo :p
int value = b00[0x4 + count];
int delta = b00[0xC + count] << 11;
} int ramp = value << 16;
// this should be scrapped
for (int i = 0; i < _Size; i++) for (int i = 0; i < _Size; i++)
{ {
// arbitrary int unmixed_audio = m_TempBuffer[i];
s32 left = m_TempBuffer[i] >> 3; switch (count) {
s32 right = m_TempBuffer[i] >> 3; case 0: _LeftBuffer[i] += (u64)unmixed_audio * ramp >> 29; break;
case 1: _RightBuffer[i] += (u64)unmixed_audio * ramp >> 29; break;
_LeftBuffer[i] += left; //(s32)(((float)left * (float)PB.volumeLeft) / 1000.f); break;
_RightBuffer[i] += right; //(s32)(((float)right * (float)PB.volumeRight) / 1000.0f); }
}
} }
} }
else else