Changes in src/onset/peakpicker.c [e149aa9:67b6618]

File:

• src/onset/peakpicker.c (modified) (1 diff)

src/onset/peakpicker.c

@@ -93 +93 @@
   fvec_t *scratch = p->scratch;
   smpl_t mean = 0., median = 0.;
+  uint_t length = p->win_post + p->win_pre + 1;
   uint_t j = 0;
 
-  /* push new novelty to the end */
-  fvec_push(onset_keep, onset->data[0]);
-  /* store a copy */
-  fvec_copy(onset_keep, onset_proc);
-
-  /* filter this copy */
+  /* store onset in onset_keep */
+  /* shift all elements but last, then write last */
+  for (j = 0; j < length - 1; j++) {
+    onset_keep->data[j] = onset_keep->data[j + 1];
+    onset_proc->data[j] = onset_keep->data[j];
+  }
+  onset_keep->data[length - 1] = onset->data[0];
+  onset_proc->data[length - 1] = onset->data[0];
+
+  /* filter onset_proc */
+  /** \bug filtfilt calculated post+pre times, should be only once !? */
   aubio_filter_do_filtfilt (p->biquad, onset_proc, scratch);
 
   /* calculate mean and median for onset_proc */
   mean = fvec_mean (onset_proc);
-
-  /* copy to scratch and compute its median */
-  fvec_copy(onset_proc, scratch);
+  /* copy to scratch */
+  for (j = 0; j < length; j++)
+    scratch->data[j] = onset_proc->data[j];
   median = p->thresholdfn (scratch);