Changeset 56ef7e1 for src/mathutils.c

Timestamp:

Oct 18, 2009, 3:08:59 PM (15 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+

Children:

e5f49af

Parents:

74516f7

Message:

Change peakpicker to match API specs, make quadint per channel

• src/mathutils.c
  • add per channel mean and median
  • update moving thres and adapt_thres accordingly
  • change quadint unused span argument to a channel argument
• src/onset/onset.c:
  • make wasonset a vector for multi channel, use new peakpicker
• src/onset/peakpick.c:
  • update peakpicker do for multi channeling
• src/pitch/: update use to fvec_quadint
• src/tempo/beattracking.c: update calls to fvec_quadint
• src/tempo/tempo.c: update peakpicker usage
• tests/src/test-peakpick.c: update peakpicker usage

File:

• src/mathutils.c (modified) (5 diffs)

src/mathutils.c

@@ -142 +142 @@
 
 smpl_t
+fvec_mean_channel (fvec_t * s, uint_t i)
+{
+  uint_t j;
+  smpl_t tmp = 0.0;
+  for (j = 0; j < s->length; j++)
+      tmp += s->data[i][j];
+  return tmp / (smpl_t) (s->length);
+}
+
+smpl_t
 fvec_sum (fvec_t * s)
 {
@@ -289 +299 @@
 
 void fvec_adapt_thres(fvec_t * vec, fvec_t * tmp,
-    uint_t post, uint_t pre) {
-  uint_t length = vec->length, i=0, j;
+    uint_t post, uint_t pre, uint_t channel) {
+  uint_t length = vec->length, i=channel, j;
   for (j=0;j<length;j++) {
-    vec->data[i][j] -= fvec_moving_thres(vec, tmp, post, pre, j);
+    vec->data[i][j] -= fvec_moving_thres(vec, tmp, post, pre, j, i);
   }
 }
@@ -298 +308 @@
 smpl_t
 fvec_moving_thres (fvec_t * vec, fvec_t * tmpvec,
-    uint_t post, uint_t pre, uint_t pos)
-{
-  smpl_t *medar = (smpl_t *) tmpvec->data[0];
-  uint_t k;
+    uint_t post, uint_t pre, uint_t pos, uint_t channel)
+{
+  uint_t i = channel, k;
+  smpl_t *medar = (smpl_t *) tmpvec->data[i];
   uint_t win_length = post + pre + 1;
   uint_t length = vec->length;
@@ -321 +331 @@
       medar[k] = 0.;            /* 0-padding at the end */
   }
-  return fvec_median (tmpvec);
-}
-
-smpl_t fvec_median(fvec_t * input) {
+  return fvec_median_channel (tmpvec, i);
+}
+
+smpl_t fvec_median_channel (fvec_t * input, uint_t channel) {
   uint_t n = input->length;
-  smpl_t * arr = (smpl_t *) input->data[0];
+  smpl_t * arr = (smpl_t *) input->data[channel];
   uint_t low, high ;
   uint_t median;
@@ -375 +385 @@
 }
 
-smpl_t fvec_quadint(fvec_t * x,uint_t pos, uint_t span) {
+smpl_t fvec_quadint (fvec_t * x, uint_t pos, uint_t i) {
   smpl_t s0, s1, s2;
-  uint_t x0 = (pos < span) ? pos : pos - span;
-  uint_t x2 = (pos + span < x->length) ? pos + span : pos;
-  if (x0 == pos) return (x->data[0][pos] <= x->data[0][x2]) ? pos : x2;
-  if (x2 == pos) return (x->data[0][pos] <= x->data[0][x0]) ? pos : x0;
-  s0 = x->data[0][x0];
-  s1 = x->data[0][pos];
-  s2 = x->data[0][x2];
+  uint_t x0 = (pos < 1) ? pos : pos - 1;
+  uint_t x2 = (pos + 1 < x->length) ? pos + 1 : pos;
+  if (x0 == pos) return (x->data[i][pos] <= x->data[i][x2]) ? pos : x2;
+  if (x2 == pos) return (x->data[i][pos] <= x->data[i][x0]) ? pos : x0;
+  s0 = x->data[i][x0];
+  s1 = x->data[i][pos];
+  s2 = x->data[i][x2];
   return pos + 0.5 * (s2 - s0 ) / (s2 - 2.* s1 + s0);
 }