petern
/
pplugins
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't check for buffer wrap unless necessary this cycle.

master
Peter Nelson 2013-02-06 01:12:13 +00:00
parent 14441af2c4
commit 2a421ff619
1 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
ptap/ptap.cpp
View File

@ -24,8 +24,9 @@ struct PTap
Tap tap[TAPS + CHANNELS]; Tap tap[TAPS + CHANNELS];
float *buffers[TAPS]; ///< Tap audio buffers float *buffers[TAPS]; ///< Tap audio buffers
float *wp[TAPS]; ///< Write pointers const float *buffers_end[TAPS]; ///< Audio buffer end points
float *wp[TAPS]; ///< Write pointers
float *in_l; float *in_l;
float *in_r; float *in_r;
@ -57,6 +58,7 @@ static LV2_Handle ptap_instantiate(
return NULL; return NULL;
} }
ptap->buffers_end[i] = ptap->buffers[i] + ptap->buffer_max;
ptap->wp[i] = ptap->buffers[i]; ptap->wp[i] = ptap->buffers[i];
} }
@ -109,6 +111,7 @@ static void ptap_run(LV2_Handle lv2instance, uint32_t sample_count)
const float *readp[TAPS + CHANNELS]; const float *readp[TAPS + CHANNELS];
float gain[TAPS + CHANNELS]; float gain[TAPS + CHANNELS];
bool check_overflow = false;
/* Position read pointers behind write pointers */ /* Position read pointers behind write pointers */
for (int i = 0; i < TAPS; i++) { for (int i = 0; i < TAPS; i++) {
@ -119,6 +122,8 @@ static void ptap_run(LV2_Handle lv2instance, uint32_t sample_count)
if (readp[i] < ptap->buffers[i]) { if (readp[i] < ptap->buffers[i]) {
readp[i] += ptap->buffer_max; readp[i] += ptap->buffer_max;
} }
if (ptap->wp[i] + sample_count >= ptap->buffers_end[i]) check_overflow = true;
if (readp[i] + sample_count >= ptap->buffers_end[i]) check_overflow = true;
gain[i] = *ptap->tap[i].gain; gain[i] = *ptap->tap[i].gain;
} }
@ -134,35 +139,28 @@ static void ptap_run(LV2_Handle lv2instance, uint32_t sample_count)
float rp[TAPS + CHANNELS]; float rp[TAPS + CHANNELS];
float wp[TAPS + CHANNELS]; float wp[TAPS + CHANNELS];
for (int i = 0; i < TAPS + CHANNELS; i++) { /* Read input to local buffers */
rp[i] = *readp[i]++; for (int i = 0; i < TAPS + CHANNELS; i++) rp[i] = *readp[i]++;
}
/* Process delays */
for (int i = 0; i < TAPS + CHANNELS; i++) { for (int i = 0; i < TAPS + CHANNELS; i++) {
const Tap *tap = &ptap->tap[i]; const Tap *tap = &ptap->tap[i];
float sample = 0; float sample = 0;
for (int j = 0; j < TAPS + CHANNELS; j++) { for (int j = 0; j < TAPS + CHANNELS; j++) sample += rp[j] * *tap->t_gain[j];
sample += rp[j] * *tap->t_gain[j];
}
wp[i] = sample * gain[i]; wp[i] = sample * gain[i];
} }
for (int i = 0; i < TAPS; i++) { /* Write outputs */
*ptap->wp[i]++ = wp[i]; for (int i = 0; i < TAPS; i++) *ptap->wp[i]++ = wp[i];
}
*out_l++ = wp[TAPS]; *out_l++ = wp[TAPS];
*out_r++ = wp[TAPS + 1]; *out_r++ = wp[TAPS + 1];
/* Progress read pointers */ /* Check read/write pointers */
for (int i = 0; i < TAPS; i++) { if (check_overflow) {
if (ptap->wp[i] >= ptap->buffers[i] + ptap->buffer_max) { for (int i = 0; i < TAPS; i++) {
ptap->wp[i] = ptap->buffers[i]; if (ptap->wp[i] >= ptap->buffers_end[i]) ptap->wp[i] = ptap->buffers[i];
} if (readp[i] >= ptap->buffers_end[i]) readp[i] = ptap->buffers[i];
if (readp[i] >= ptap->buffers[i] + ptap->buffer_max) {
readp[i] = ptap->buffers[i];
} }
} }
} }