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

DSPHLE, PCM16: improves audio quality in SMG: interpolation, preserve sample fraction. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3749 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
hrydgard 2009-07-11 15:39:14 +00:00
parent 3927efdb1d
commit 442fbf6476
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,10 +56,10 @@ void CUCode_Zelda::WritebackVoicePB(u32 _Addr, ZeldaVoicePB& PB)
void CUCode_Zelda::RenderVoice_PCM16(ZeldaVoicePB &PB, s32* _Buffer, int _Size)
{
float ratioFactor = 32000.0f / (float)soundStream->GetMixer()->GetSampleRate();
u32 _ratio = (((PB.RatioInt * 80) + PB.CurSampleFrac) << 4) & 0xFFFF0000;
u64 ratio = (u64)(((_ratio / 80) << 16) * ratioFactor);
u32 _ratio = (PB.RatioInt << 16);
s64 ratio = (_ratio * ratioFactor) * 16;
u32 inpos[2] = {0, 0};
u32 inpos[2] = {PB.CurSampleFrac << 16, 0};
int outpos = 0;
if (PB.KeyOff != 0)
@ -101,9 +101,12 @@ _lRestart:
for (; outpos < _Size;)
{
s16 sample = Common::swap16(source[inpos[1]]);
_Buffer[outpos++] = (s32)sample;
// Simple linear interpolation.
float sample1 = (s16)Common::swap16(source[inpos[1]]);
float sample2 = (s16)Common::swap16(source[inpos[1]]);
float frac = float(inpos[0] >> 16) / 65536.0f;
_Buffer[outpos++] = sample1 * (1-frac) + sample2 * frac;
(*(u64*)&inpos) += ratio;
if ((inpos[1] + ((PB.CurAddr - PB.StartAddr) >> 1)) >= PB.Length)
@ -122,6 +125,7 @@ _lRestart:
PB.RemLength -= inpos[1];
PB.CurAddr += inpos[1] << 1;
PB.CurSampleFrac = inpos[0]>>16;
// There should be a position fraction as well.
}
@ -426,7 +430,7 @@ void CUCode_Zelda::RenderAddVoice(ZeldaVoicePB &PB, s32* _LeftBuffer, s32* _Righ
case 0x0021: // Probably raw sound. Important for Zelda WW. Really need to implement - missing it causes hangs.
WARN_LOG(DSPHLE, "Unimplemented MixAddVoice format in zelda %04x", PB.Format);
#if 0 // To hear something weird in ZWW, turn this on.
#if 1 // To hear something weird in ZWW, turn this on.
RenderVoice_Raw(PB, m_TempBuffer, _Size);
#else
// This is what 0x20 and 0x21 do on end of voice