Changeset 9771488

Timestamp:

Mar 21, 2006, 7:05:23 PM (18 years ago)

Author:

Paul Brossier <piem@altern.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:

d94f98b

Parents:

1d4fc4a

Message:

add interpolation to yin
add interpolation to yin

Location:

src

Files:

• mathutils.c (modified) (1 diff)
• mathutils.h (modified) (1 diff)
• pitchyin.c (modified) (2 diffs)
• pitchyin.h (modified) (1 diff)

src/mathutils.c

@@ -331 +331 @@
 }
 
+smpl_t vec_quadint_min(fvec_t * x,uint_t pos, uint_t span) {
+  smpl_t step = 1./200.;
+  /* init resold to - something (in case x[pos+-span]<0)) */
+  smpl_t res, frac, s0, s1, s2, exactpos = (smpl_t)pos, resold = 100000.;
+  if ((pos > span) && (pos < x->length-span)) {
+    s0 = x->data[0][pos-span];
+    s1 = x->data[0][pos]     ;
+    s2 = x->data[0][pos+span];
+    /* increase frac */
+    for (frac = 0.; frac < 2.; frac = frac + step) {
+      res = aubio_quadfrac(s0, s1, s2, frac);
+      if (res < resold) {
+        resold = res;
+      } else {                          
+        exactpos += (frac-step)*span - span/2.;
+        break;
+      }
+    }
+  }
+  return exactpos;
+}
+
 smpl_t aubio_quadfrac(smpl_t s0, smpl_t s1, smpl_t s2, smpl_t pf) {
   smpl_t tmp = s0 + (pf/2.) * (pf * ( s0 - 2.*s1 + s2 ) - 3.*s0 + 4.*s1 - s2);

src/mathutils.h

@@ -212 +212 @@
 smpl_t vec_median(fvec_t * input);
 
-/** finds exact peak position by quadratic interpolation*/
+/** finds exact maximum position by quadratic interpolation*/
 smpl_t vec_quadint(fvec_t * x,uint_t pos);
+
+/** finds exact minimum position by quadratic interpolation*/
+smpl_t vec_quadint_min(fvec_t * x,uint_t pos, uint_t span);
 
 /** Quadratic interpolation using Lagrange polynomial.

src/pitchyin.c

@@ -89 +89 @@
 
 /* all the above in one */
-uint_t aubio_pitchyin_getpitchfast(fvec_t * input, fvec_t * yin, smpl_t tol){
+smpl_t aubio_pitchyin_getpitchfast(fvec_t * input, fvec_t * yin, smpl_t tol){
         uint_t c=0,j,tau = 0;
+        sint_t period;
         smpl_t tmp = 0., tmp2 = 0.;
         yin->data[c][0] = 1.;
@@ -103 +104 @@
                 tmp2 += yin->data[c][tau];
                 yin->data[c][tau] *= tau/tmp2;
-                if((yin->data[c][tau] < tol) && 
-                                (yin->data[c][tau-1] < yin->data[c][tau])) {
-                        return tau-1;
+                period = tau-3;
+                if(tau > 4 && (yin->data[c][period] < tol) && 
+                                (yin->data[c][period] < yin->data[c][period+1])) {
+                        return vec_quadint_min(yin,period,1)-1;
                 }
         }

src/pitchyin.h

@@ -39 +39 @@
 uint_t aubio_pitchyin_getpitch(fvec_t *yinbuf);
 
-uint_t aubio_pitchyin_getpitchfast(fvec_t * input, fvec_t *yinbuf, smpl_t tol);
+smpl_t aubio_pitchyin_getpitchfast(fvec_t * input, fvec_t *yinbuf, smpl_t tol);
 
 #ifdef __cplusplus