Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Smooth SAS resampling when pitch != 0x1000."

Browse source 
This reverts commit 1efcebb121.
This commit is contained in:
Unknown W. Brackets 2014-02-23 08:48:49 -08:00
parent c806ae0982
commit be79670efb
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Core/HW/SasAudio.cpp
View file

@ -478,7 +478,7 @@ void SasInstance::MixVoice(SasVoice &voice) {
voice.resampleHist[1] = resampleBuffer[2 + numSamples - 1];
// Resample to the correct pitch, writing exactly "grainSize" samples.
// This is a poor resampler by the way.
// This is a HORRIBLE resampler by the way.
// TODO: Special case no-resample case (and 2x and 0.5x) for speed, it's not uncommon
u32 sampleFrac = voice.sampleFrac;
@ -487,11 +487,7 @@ void SasInstance::MixVoice(SasVoice &voice) {
if (volumeShift < 0) volumeShift = 0;
for (int i = 0; i < grainSize; i++) {
// For now: nearest neighbour, not even using the resample history at all.
const int readIndex = sampleFrac / PSP_SAS_PITCH_BASE;
const int readFrac = sampleFrac % PSP_SAS_PITCH_BASE;
int sample1 = resampleBuffer[readIndex + 2];
int sample2 = resampleBuffer[readIndex + 1 + 2];
int sample = (sample1 * (PSP_SAS_PITCH_BASE - readFrac) + sample2 * readFrac) / PSP_SAS_PITCH_BASE;
int sample = resampleBuffer[sampleFrac / PSP_SAS_PITCH_BASE + 2];
sampleFrac += voice.pitch;
// The maximum envelope height (PSP_SAS_ENVELOPE_HEIGHT_MAX) is (1 << 30) - 1.
@ -513,7 +509,10 @@ void SasInstance::MixVoice(SasVoice &voice) {
voice.envelope.Step();
}
voice.sampleFrac = sampleFrac & (PSP_SAS_PITCH_BASE - 1);
voice.sampleFrac = sampleFrac;
// Let's hope grainSize is a power of 2.
//voice.sampleFrac &= grainSize * PSP_SAS_PITCH_BASE - 1;
voice.sampleFrac -= numSamples * PSP_SAS_PITCH_BASE;
if (voice.HaveSamplesEnded())
voice.envelope.End();