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

SPU2-X: Better version of pseudonym's bugfix. 

Details: Properly initialize SCurrent in V_Core::Reset so that it need not be checked during Dummy processing, and add some asserts to test for SCurrent validity.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2727 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2010-03-17 14:07:25 +00:00
parent 58b9768c61
commit 48fae1a824
2 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
plugins/spu2-x/src/Mixer.cpp
View File

@ -31,22 +31,6 @@ static const s32 tbl_XA_Factor[5][2] =
{ 122, -60 } { 122, -60 }
}; };
static double K0[4] =
{
0.0,
0.9375,
1.796875,
1.53125
};
static double K1[4] =
{
0.0,
0.0,
-0.8125,
-0.859375
};
// Performs a 64-bit multiplication between two values and returns the // Performs a 64-bit multiplication between two values and returns the
// high 32 bits as a result (discarding the fractional 32 bits). // high 32 bits as a result (discarding the fractional 32 bits).
@ -121,7 +105,7 @@ static void __forceinline XA_decode_block(s16* buffer, const s16* block, s32& pr
static void __forceinline XA_decode_block_unsaturated(s16* buffer, const s16* block, s32& prev1, s32& prev2) static void __forceinline XA_decode_block_unsaturated(s16* buffer, const s16* block, s32& prev1, s32& prev2)
{ {
const u8 header = *(u8*)block; const s32 header = *block;
const s32 shift = (header&0xF) + 16; const s32 shift = (header&0xF) + 16;
const s32 pred1 = tbl_XA_Factor[header>>4][0]; const s32 pred1 = tbl_XA_Factor[header>>4][0];
const s32 pred2 = tbl_XA_Factor[header>>4][1]; const s32 pred2 = tbl_XA_Factor[header>>4][1];
@ -271,7 +255,7 @@ static __forceinline void __fastcall GetNextDataDummy(V_Core& thiscore, uint voi
{ {
V_Voice& vc( thiscore.Voices[voiceidx] ); V_Voice& vc( thiscore.Voices[voiceidx] );
if (vc.SCurrent == 28 || !vc.SCurrent) if (vc.SCurrent == 28)
{ {
if(vc.LoopFlags & XAFLAG_LOOP_END) if(vc.LoopFlags & XAFLAG_LOOP_END)
{ {
@ -605,6 +589,10 @@ static __forceinline StereoOut32 MixVoice( uint coreidx, uint voiceidx )
V_Core& thiscore( Cores[coreidx] ); V_Core& thiscore( Cores[coreidx] );
V_Voice& vc( thiscore.Voices[voiceidx] ); V_Voice& vc( thiscore.Voices[voiceidx] );
// If this assertion fails, it mans SCurrent is being corrupted somewhere, or is not initialized
// properly. Invalid values in SCurrent will cause errant IRQs and corrupted audio.
pxAssumeMsg( (vc.SCurrent <= 28) && (vc.SCurrent != 0), "Current sample should always range from 1->28" );
// Most games don't use much volume slide effects. So only call the UpdateVolume // Most games don't use much volume slide effects. So only call the UpdateVolume
// methods when needed by checking the flag outside the method here... // methods when needed by checking the flag outside the method here...
// (Note: Ys 6 : Ark of Nephistm uses these effects) // (Note: Ys 6 : Ark of Nephistm uses these effects)

1
plugins/spu2-x/src/spu2sys.cpp
View File

@ -145,6 +145,7 @@ void V_Core::Reset( int index )
VoiceGates[v].WetR = -1; VoiceGates[v].WetR = -1;
Voices[v].Volume = V_VolumeSlideLR::Max; Voices[v].Volume = V_VolumeSlideLR::Max;
Voices[v].SCurrent = 28;
Voices[v].ADSR.Value = 0; Voices[v].ADSR.Value = 0;
Voices[v].ADSR.Phase = 0; Voices[v].ADSR.Phase = 0;