mirror of
https://github.com/hrydgard/ppsspp.git
synced 2025-04-02 11:01:50 -04:00
Remove the verification.
This commit is contained in:
parent
451388070a
commit
e802fb0b73
2 changed files with 5 additions and 19 deletions
|
@ -511,25 +511,13 @@ void SasInstance::MixVoice(SasVoice &voice) {
|
||||||
}
|
}
|
||||||
|
|
||||||
sampleFrac = voice.sampleFrac;
|
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++) {
|
for (int i = delay; i < grainSize; i++) {
|
||||||
while (sampleFrac >= PSP_SAS_PITCH_BASE) {
|
const int16_t *s = temp + (sampleFrac >> PSP_SAS_PITCH_BASE_SHIFT);
|
||||||
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();
|
|
||||||
|
|
||||||
// Linear interpolation. Good enough. Need to make resampleHist bigger if we want more.
|
// 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;
|
sampleFrac += voice.pitch;
|
||||||
altSampleFrac += voice.pitch;
|
|
||||||
|
|
||||||
// The maximum envelope height (PSP_SAS_ENVELOPE_HEIGHT_MAX) is (1 << 30) - 1.
|
// 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.
|
// 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[0] = temp[tempPos - 2];
|
||||||
voice.resampleHist[1] = temp[tempPos - 1];
|
voice.resampleHist[1] = temp[tempPos - 1];
|
||||||
|
|
||||||
altSampleFrac -= (tempPos - 2) * PSP_SAS_PITCH_BASE;
|
voice.sampleFrac = sampleFrac - (tempPos - 2) * PSP_SAS_PITCH_BASE;;
|
||||||
if (sampleFrac != altSampleFrac)
|
|
||||||
Crash();
|
|
||||||
voice.sampleFrac = altSampleFrac;
|
|
||||||
|
|
||||||
if (voice.HaveSamplesEnded())
|
if (voice.HaveSamplesEnded())
|
||||||
voice.envelope.End();
|
voice.envelope.End();
|
||||||
|
|
|
@ -33,6 +33,7 @@ enum {
|
||||||
|
|
||||||
PSP_SAS_PITCH_MIN = 0x0000,
|
PSP_SAS_PITCH_MIN = 0x0000,
|
||||||
PSP_SAS_PITCH_BASE = 0x1000,
|
PSP_SAS_PITCH_BASE = 0x1000,
|
||||||
|
PSP_SAS_PITCH_MASK = 0xFFF,
|
||||||
PSP_SAS_PITCH_BASE_SHIFT = 12,
|
PSP_SAS_PITCH_BASE_SHIFT = 12,
|
||||||
PSP_SAS_PITCH_MAX = 0x4000,
|
PSP_SAS_PITCH_MAX = 0x4000,
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue