Changeset 9771488 for src/pitchyin.c

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

File:

• src/pitchyin.c (modified) (2 diffs)

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;
                 }
         }