Changeset 9c9202f for src/pitch

Timestamp:

Apr 10, 2013, 1:47:05 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:

e987c05

Parents:

483b883

Message:

src/pitch/pitchyinfft.c: adapt filter and shortest period to samplerate

Location:

src/pitch

Files:

• pitch.c (modified) (1 diff)
• pitchyinfft.c (modified) (5 diffs)
• pitchyinfft.h (modified) (1 diff)

src/pitch/pitch.c

@@ -159 +159 @@
     case aubio_pitcht_yinfft:
       p->buf = new_fvec (bufsize);
-      p->p_object = new_aubio_pitchyinfft (bufsize);
+      p->p_object = new_aubio_pitchyinfft (samplerate, bufsize);
       p->detect_cb = aubio_pitch_do_yinfft;
       p->conf_cb = (aubio_pitch_get_conf_t)aubio_pitchyinfft_get_confidence;

src/pitch/pitchyinfft.c

@@ -38 +38 @@
   smpl_t tol;         /**< Yin tolerance */
   smpl_t confidence;  /**< confidence */
+  uint_t short_period; /** shortest period under which to check for octave error */
 };
 
@@ -53 +54 @@
 
 aubio_pitchyinfft_t *
-new_aubio_pitchyinfft (uint_t bufsize)
+new_aubio_pitchyinfft (uint_t samplerate, uint_t bufsize)
 {
   aubio_pitchyinfft_t *p = AUBIO_NEW (aubio_pitchyinfft_t);
@@ -67 +68 @@
   smpl_t freq = 0, a0 = 0, a1 = 0, f0 = 0, f1 = 0;
   for (i = 0; i < p->weight->length; i++) {
-    freq = (smpl_t) i / (smpl_t) bufsize *(smpl_t) 44100.;
+    freq = (smpl_t) i / (smpl_t) bufsize *(smpl_t) samplerate;
     while (freq > freqs[j]) {
       j += 1;
@@ -90 +91 @@
     //p->weight->data[i] = SQRT(DB2LIN(p->weight->data[i]));
   }
+  // check for octave errors above 1300 Hz
+  p->short_period = (uint_t)ROUND(samplerate / 1300.);
   return p;
 }
@@ -143 +146 @@
     //return fvec_quadratic_peak_pos (yin,tau,1);
     /* additional check for (unlikely) octave doubling in higher frequencies */
-    if (tau > 35) {
+    if (tau > p->short_period) {
       output->data[0] = fvec_quadratic_peak_pos (yin, tau);
     } else {

src/pitch/pitchyinfft.h

@@ -59 +59 @@
  
 */
-aubio_pitchyinfft_t *new_aubio_pitchyinfft (uint_t buf_size);
+aubio_pitchyinfft_t *new_aubio_pitchyinfft (uint_t samplerate, uint_t buf_size);
 /** deletion of the pitch detection object