Changeset 1aeac4c

Timestamp:

Aug 22, 2005, 9:30:10 PM (19 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:

f97445c

Parents:

162fd27

Message:

speeding up yin

File:

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

src/pitchyin.c

@@ -91 +91 @@
 uint_t aubio_pitchyin_getpitchfast(fvec_t * input, fvec_t * yin, smpl_t tol){
         uint_t c=0,j,tau = 0;
-        smpl_t tmp = 0;
-        for (tau=0;tau<yin->length;tau++)
+        smpl_t tmp = 0., tmp2 = 0.;
+        yin->data[c][0] = 1.;
+        for (tau=1;tau<yin->length;tau++)
         {
                 yin->data[c][tau] = 0.;
-        }
-        for (tau=1;tau<yin->length;tau++)
-        {
                 for (j=0;j<yin->length;j++)
                 {
@@ -103 +101 @@
                         yin->data[c][tau] += SQR(tmp);
                 }
-        }
-        yin->data[c][0] = 1.;
-        tmp = 0.;
-        for (tau=1;tau<yin->length;tau++)
-        {
-                tmp += yin->data[c][tau];
-                yin->data[c][tau] *= tau/tmp;
-        }
-        /* should merge the following with above */
-        tau = 1;
-        do 
-        {
-                if(yin->data[c][tau] < tol) { 
-                        while (yin->data[c][tau+1] < yin->data[c][tau]) {
-                                tau++;
-                        }
-                        return tau;
+                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;
                 }
-                tau++;
-        } while (tau<yin->length);
+        }
         return 0;
 }