libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2025-01-18 22:53:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Implement _sceSasCoreWithMix correctly.

Browse Source 
The inoutAddr should be both input and output buffer address.
This commit is contained in:
oioitff 2013-04-23 22:00:14 +08:00
parent dd8f1b3c27
commit 62f79989bd
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Core/HLE/sceSas.cpp
View File

@ -95,20 +95,20 @@ u32 _sceSasCore(u32 core, u32 outAddr) {
return ERROR_SAS_INVALID_PARAMETER;
}
Memory::Memset(outAddr, 0, sas->GetGrainSize() * 2 * 2);
//Memory::Memset(outAddr, 0, sas->GetGrainSize() * 2 * 2);
sas->Mix(outAddr);
return 0;
}
// Another way of running the mixer, what was the difference again?
u32 _sceSasCoreWithMix(u32 core, u32 outAddr, int leftVolume, int rightVolume) {
DEBUG_LOG(HLE,"sceSasCoreWithMix(%08x, %08x, %i, %i)", core , outAddr, leftVolume, rightVolume);
// Another way of running the mixer, the inoutAddr should be both input and output
u32 _sceSasCoreWithMix(u32 core, u32 inoutAddr, int leftVolume, int rightVolume) {
DEBUG_LOG(HLE,"sceSasCoreWithMix(%08x, %08x, %i, %i)", core , inoutAddr, leftVolume, rightVolume);
if (!Memory::IsValidAddress(outAddr)) {
if (!Memory::IsValidAddress(inoutAddr)) {
return ERROR_SAS_INVALID_PARAMETER;
}
sas->Mix(outAddr);
sas->Mix(inoutAddr, inoutAddr);
return 0;
}

7
Core/HW/SasAudio.cpp
View File

@ -265,7 +265,7 @@ static inline s16 clamp_s16(int i) {
return i;
}
void SasInstance::Mix(u32 outAddr) {
void SasInstance::Mix(u32 outAddr, u32 inAddr) {
int voicesPlayingCount = 0;
for (int v = 0; v < PSP_SAS_VOICES_MAX; v++) {
SasVoice &voice = voices[v];
@ -373,12 +373,17 @@ void SasInstance::Mix(u32 outAddr) {
// Alright, all voices mixed. Let's convert and clip, and at the same time, wipe mixBuffer for next time. Could also dither.
s16 *outp = (s16 *)Memory::GetPointer(outAddr);
s16 *inp = inAddr ? (s16*)Memory::GetPointer(inAddr) : 0;
for (int i = 0; i < grainSize * 2; i += 2) {
int sampleL = mixBuffer[i] + sendBuffer[i];
if (inp)
sampleL += *inp++;
*outp++ = clamp_s16(sampleL);
if (outputMode == 0) {
// stereo
int sampleR = mixBuffer[i + 1] + sendBuffer[i + 1];
if (inp)
sampleR += *inp++;
*outp++ = clamp_s16(sampleR);
}
}

2
Core/HW/SasAudio.h
View File

@ -237,7 +237,7 @@ public:
FILE *audioDump;
void Mix(u32 outAddr);
void Mix(u32 outAddr, u32 inAddr = 0);
void DoState(PointerWrap &p);