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

Remove the verification.

Browse source
This commit is contained in:
Henrik Rydgard 2016-12-20 21:42:11 +01:00
parent 451388070a
commit e802fb0b73
2 changed files with 5 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
Core/HW/SasAudio.cpp
View file

@ -511,25 +511,13 @@ void SasInstance::MixVoice(SasVoice &voice) {
}
sampleFrac = voice.sampleFrac;
tempPos = 2; // skip the two history samples in the read buffer for now
int altSampleFrac = voice.sampleFrac;
for (int i = delay; i < grainSize; i++) {
while (sampleFrac >= PSP_SAS_PITCH_BASE) {
voice.resampleHist[0] = voice.resampleHist[1];
voice.resampleHist[1] = temp[tempPos++];
sampleFrac -= PSP_SAS_PITCH_BASE;
}
const int16_t *oldS = voice.resampleHist;
const int16_t *s = temp + (altSampleFrac >> PSP_SAS_PITCH_BASE_SHIFT);
if (s[0] != oldS[0] || s[1] != oldS[1])
Crash();
const int16_t *s = temp + (sampleFrac >> PSP_SAS_PITCH_BASE_SHIFT);
// Linear interpolation. Good enough. Need to make resampleHist bigger if we want more.
int sample = (s[0] * (PSP_SAS_PITCH_BASE - 1 - (int)sampleFrac) + s[1] * (int)sampleFrac) >> PSP_SAS_PITCH_BASE_SHIFT;
int f = sampleFrac & PSP_SAS_PITCH_MASK;
int sample = (s[0] * (PSP_SAS_PITCH_MASK - f) + s[1] * f) >> PSP_SAS_PITCH_BASE_SHIFT;
sampleFrac += voice.pitch;
altSampleFrac += voice.pitch;
// The maximum envelope height (PSP_SAS_ENVELOPE_HEIGHT_MAX) is (1 << 30) - 1.
// Reduce it to 14 bits, by shifting off 15. Round up by adding (1 << 14) first.
@ -553,10 +541,7 @@ void SasInstance::MixVoice(SasVoice &voice) {
voice.resampleHist[0] = temp[tempPos - 2];
voice.resampleHist[1] = temp[tempPos - 1];
altSampleFrac -= (tempPos - 2) * PSP_SAS_PITCH_BASE;
if (sampleFrac != altSampleFrac)
Crash();
voice.sampleFrac = altSampleFrac;
voice.sampleFrac = sampleFrac - (tempPos - 2) * PSP_SAS_PITCH_BASE;;
if (voice.HaveSamplesEnded())
voice.envelope.End();

1
Core/HW/SasAudio.h
View file

@ -33,6 +33,7 @@ enum {
PSP_SAS_PITCH_MIN = 0x0000,
PSP_SAS_PITCH_BASE = 0x1000,
PSP_SAS_PITCH_MASK = 0xFFF,
PSP_SAS_PITCH_BASE_SHIFT = 12,
PSP_SAS_PITCH_MAX = 0x4000,