|
@@ -87,8 +87,10 @@ void SMBPitchShift::PitchShift(float pitchShift, long numSampsToProcess, long ff
|
|
double magn, phase, tmp, window, real, imag;
|
|
double magn, phase, tmp, window, real, imag;
|
|
double freqPerBin, expct;
|
|
double freqPerBin, expct;
|
|
long i,k, qpd, index, inFifoLatency, stepSize, fftFrameSize2;
|
|
long i,k, qpd, index, inFifoLatency, stepSize, fftFrameSize2;
|
|
|
|
+ unsigned long fftFrameBufferSize;
|
|
|
|
|
|
/* set up some handy variables */
|
|
/* set up some handy variables */
|
|
|
|
+ fftFrameBufferSize = (unsigned long)fftFrameSize*sizeof(float);
|
|
fftFrameSize2 = fftFrameSize/2;
|
|
fftFrameSize2 = fftFrameSize/2;
|
|
stepSize = fftFrameSize/osamp;
|
|
stepSize = fftFrameSize/osamp;
|
|
freqPerBin = sampleRate/(double)fftFrameSize;
|
|
freqPerBin = sampleRate/(double)fftFrameSize;
|
|
@@ -160,8 +162,8 @@ void SMBPitchShift::PitchShift(float pitchShift, long numSampsToProcess, long ff
|
|
|
|
|
|
/* ***************** PROCESSING ******************* */
|
|
/* ***************** PROCESSING ******************* */
|
|
/* this does the actual pitch shifting */
|
|
/* this does the actual pitch shifting */
|
|
- memset(gSynMagn, 0, fftFrameSize*sizeof(float));
|
|
|
|
- memset(gSynFreq, 0, fftFrameSize*sizeof(float));
|
|
|
|
|
|
+ memset(gSynMagn, 0, fftFrameBufferSize);
|
|
|
|
+ memset(gSynFreq, 0, fftFrameBufferSize);
|
|
for (k = 0; k <= fftFrameSize2; k++) {
|
|
for (k = 0; k <= fftFrameSize2; k++) {
|
|
index = k*pitchShift;
|
|
index = k*pitchShift;
|
|
if (index <= fftFrameSize2) {
|
|
if (index <= fftFrameSize2) {
|
|
@@ -214,7 +216,7 @@ void SMBPitchShift::PitchShift(float pitchShift, long numSampsToProcess, long ff
|
|
}
|
|
}
|
|
|
|
|
|
/* shift accumulator */
|
|
/* shift accumulator */
|
|
- memmove(gOutputAccum, gOutputAccum+stepSize, fftFrameSize*sizeof(float));
|
|
|
|
|
|
+ memmove(gOutputAccum, gOutputAccum+stepSize, fftFrameBufferSize);
|
|
|
|
|
|
/* move input FIFO */
|
|
/* move input FIFO */
|
|
for (k = 0; k < inFifoLatency; k++) { gInFIFO[k] = gInFIFO[k+stepSize];
|
|
for (k = 0; k < inFifoLatency; k++) { gInFIFO[k] = gInFIFO[k+stepSize];
|