Changeset 56ef7e1 for src/mathutils.h

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.h (modified) (5 diffs)

src/mathutils.h

@@ -60 +60 @@
 /** compute the mean of a vector
 
-  \param s vector to compute norm from
+  \param s vector to compute mean from
 
   \return the mean of v
@@ -66 +66 @@
 */
 smpl_t fvec_mean (fvec_t * s);
+
+/** compute the mean of a vector channel
+
+  \param s vector to compute mean from
+  \param i channel to compute mean from
+
+  \return the mean of v
+
+*/
+smpl_t fvec_mean_channel (fvec_t * s, uint_t i);
 
 /** find the max of a vector
@@ -220 +230 @@
 */
 smpl_t fvec_moving_thres (fvec_t * v, fvec_t * tmp, uint_t post, uint_t pre,
-    uint_t pos);
+    uint_t pos, uint_t channel);
 
 /** apply adaptive threshold to a vector
@@ -233 +243 @@
 
 */
-void fvec_adapt_thres (fvec_t * v, fvec_t * tmp, uint_t post, uint_t pre);
+void fvec_adapt_thres (fvec_t * v, fvec_t * tmp, uint_t post, uint_t pre, 
+    uint_t channel);
 
 /** returns the median of a vector 
@@ -246 +257 @@
 
   \param v vector to get median from
+  \param channel channel to get median from
 
   \return the median of v
  
 */
-smpl_t fvec_median (fvec_t * v);
+smpl_t fvec_median_channel (fvec_t * v, uint_t channel);
 
 /** finds exact peak index by quadratic interpolation*/
-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 channel);
 
 /** Quadratic interpolation using Lagrange polynomial.