Changeset 5284e0d for src/pitch

Timestamp:

Mar 11, 2013, 1:15:47 AM (12 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:

426e6f7

Parents:

8c4560e

Message:

src/pitch: start adding confidence

Location:

src/pitch

Files:

• pitch.c (modified) (7 diffs)
• pitchyin.c (modified) (2 diffs)
• pitchyin.h (modified) (1 diff)
• pitchyinfft.c (modified) (2 diffs)
• pitchyinfft.h (modified) (1 diff)

src/pitch/pitch.c

@@ -62 +62 @@
   (smpl_t value, uint_t srate, uint_t bufsize);
 
+typedef smpl_t (*aubio_conf_cb_t) (void * p);
+
 void aubio_pitch_slideblock (aubio_pitch_t * p, fvec_t * ibuf);
 
-void aubio_pitch_do_mcomb (aubio_pitch_t * p, fvec_t * ibuf, fvec_t * obuf);
-void aubio_pitch_do_yin (aubio_pitch_t * p, fvec_t * ibuf, fvec_t * obuf);
-void aubio_pitch_do_schmitt (aubio_pitch_t * p, fvec_t * ibuf, fvec_t * obuf);
-void aubio_pitch_do_fcomb (aubio_pitch_t * p, fvec_t * ibuf, fvec_t * obuf);
-void aubio_pitch_do_yinfft (aubio_pitch_t * p, fvec_t * ibuf, fvec_t * obuf);
+static void aubio_pitch_do_mcomb (aubio_pitch_t * p, fvec_t * ibuf, fvec_t * obuf);
+static void aubio_pitch_do_yin (aubio_pitch_t * p, fvec_t * ibuf, fvec_t * obuf);
+static void aubio_pitch_do_schmitt (aubio_pitch_t * p, fvec_t * ibuf, fvec_t * obuf);
+static void aubio_pitch_do_fcomb (aubio_pitch_t * p, fvec_t * ibuf, fvec_t * obuf);
+static void aubio_pitch_do_yinfft (aubio_pitch_t * p, fvec_t * ibuf, fvec_t * obuf);
 
 /** generic pitch detection structure */
@@ -82 +84 @@
   aubio_pitchyinfft_t *yinfft;    /**< yinfft object */
   aubio_pitchyin_t *yin;    /**< yinfft object */
+  void *pitch;
   aubio_filter_t *filter;         /**< filter */
   aubio_pvoc_t *pv;               /**< phase vocoder for mcomb */
@@ -88 +91 @@
   aubio_pitch_func_t callback; /**< pointer to current pitch detection method */
   aubio_pitch_conv_t freqconv; /**< pointer to current pitch conversion method */
+  aubio_conf_cb_t confidence_callback; /**< pointer to the current confidence callback */
 };
 
@@ -140 +144 @@
   aubio_pitch_set_unit (p, "default");
   p->bufsize = bufsize;
+  p->confidence_callback = NULL;
   switch (p->type) {
     case aubio_pitcht_yin:
@@ -145 +150 @@
       p->yin = new_aubio_pitchyin (bufsize);
       p->callback = aubio_pitch_do_yin;
+      p->confidence_callback = (aubio_conf_cb_t)aubio_pitchyin_get_confidence;
+      p->pitch = (void*)p->yin;
       aubio_pitchyin_set_tolerance (p->yin, 0.15);
       break;
@@ -168 +175 @@
       p->yinfft = new_aubio_pitchyinfft (bufsize);
       p->callback = aubio_pitch_do_yinfft;
+      p->confidence_callback = (aubio_conf_cb_t)aubio_pitchyinfft_get_confidence;
+      p->pitch = (void*)p->yin;
       aubio_pitchyinfft_set_tolerance (p->yinfft, 0.85);
       break;
@@ -345 +354 @@
   out->data[0] = pitch;
 }
+
+/* confidence callbacks */
+smpl_t
+aubio_pitch_get_confidence (aubio_pitch_t * p)
+{
+  if (p->confidence_callback) {
+    return p->confidence_callback ((void*)(p->pitch));
+  }
+  return 0.;
+}

src/pitch/pitchyin.c

@@ -37 +37 @@
   fvec_t *yin;
   smpl_t tol;
+  smpl_t confidence;
 };
 
@@ -159 +160 @@
 }
 
+smpl_t
+aubio_pitchyin_get_confidence (aubio_pitchyin_t * o) {
+  o->confidence = 1. - fvec_min (o->yin);
+  return o->confidence;
+}
+
 uint_t
 aubio_pitchyin_set_tolerance (aubio_pitchyin_t * o, smpl_t tol)

src/pitch/pitchyin.h

@@ -85 +85 @@
 smpl_t aubio_pitchyin_get_tolerance (aubio_pitchyin_t * o);
 
+/** get current confidence of YIN algorithm
+
+  \param o YIN pitch detection object
+  \return confidence parameter
+
+*/
+smpl_t aubio_pitchyin_get_confidence (aubio_pitchyin_t * o);
+
 #ifdef __cplusplus
 }

src/pitch/pitchyinfft.c

@@ -38 +38 @@
   fvec_t *yinfft;     /**< Yin function */
   smpl_t tol;         /**< Yin tolerance */
+  smpl_t confidence;  /**< confidence */
 };
 
@@ -166 +167 @@
 }
 
+smpl_t
+aubio_pitchyinfft_get_confidence (aubio_pitchyinfft_t * o) {
+  o->confidence = 1. - fvec_min (o->yinfft);
+  return o->confidence;
+}
+
 uint_t
 aubio_pitchyinfft_set_tolerance (aubio_pitchyinfft_t * p, smpl_t tol)

src/pitch/pitchyinfft.h

@@ -84 +84 @@
 uint_t aubio_pitchyinfft_set_tolerance (aubio_pitchyinfft_t * o, smpl_t tol);
 
+/** get current confidence of YIN algorithm
+
+  \param o YIN pitch detection object
+  \return confidence parameter
+
+*/
+smpl_t aubio_pitchyinfft_get_confidence (aubio_pitchyinfft_t * o);
+
 #ifdef __cplusplus
 }