Changeset cf7c76a

Timestamp:

Apr 11, 2005, 6:31:48 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:

84941cb

Parents:

a0fd4e4

Message:

update pitchyin.[ch] and pitchdetection.c

Location:

src

Files:

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

src/pitchdetection.c

@@ -104 +104 @@
                                 }
                         }
-                        /* get the autocorr and pitch */
-                        aubio_pitchyin_diff(p->buf,p->yin);
-                        aubio_pitchyin_getcum(p->yin);
-                        pitch = aubio_pitchyin_getpitch(p->yin);
+                        pitch = aubio_pitchyin_getpitchfast(p->buf,p->yin, 0.5);
                         if (pitch>0) {
                                 pitch = p->srate/(pitch+0.);
@@ -113 +110 @@
                                 pitch = 0.;
                         }
-                        //fprintf(stderr,"%f\n",pitch);
                         break;
                 case mcomb:

src/pitchyin.c

@@ -83 +83 @@
                 tau++;
         } while (tau<yin->length);
-        //AUBIO_DBG("No pitch found");
+        AUBIO_DBG("No pitch found");
         return 0;
 }
@@ -89 +89 @@
 
 /* all the above in one */
-uint_t aubio_pitchyin_getpitchfast(fvec_t * input, fvec_t * yin){
-        uint_t c,j,tau = 0;
+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, tmp2;
-        for (c=0;c<input->channels;c++)
+        for (tau=0;tau<yin->length;tau++)
         {
-                for (tau=0;tau<yin->length;tau++)
+                yin->data[c][tau] = 0.;
+        }
+        for (tau=1;tau<yin->length;tau++)
+        {
+                for (j=0;j<yin->length;j++)
                 {
-                        yin->data[c][tau] = 0.;
-                }
-                for (tau=1;tau<yin->length;tau++)
-                {
-                        for (j=0;j<yin->length;j++)
-                        {
-                                tmp = input->data[c][j] - input->data[c][j+tau];
-                                yin->data[c][tau] += SQR(tmp);
-                        }
-                }
-                tmp2 = 0.;
-                yin->data[c][0] = 1.;
-                for (tau=1;tau<yin->length;tau++)
-                {
-                        tmp += yin->data[c][tau];
-                        yin->data[c][tau] *= tau/tmp;
+                        tmp = input->data[c][j] - input->data[c][j+tau];
+                        yin->data[c][tau] += SQR(tmp);
                 }
         }
+        tmp2 = 0.;
+        yin->data[c][0] = 1.;
+        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] < 0.1) { 
+                if(yin->data[c][tau] < tol) { 
                         while (yin->data[c][tau+1] < yin->data[c][tau]) {
                                 tau++;

src/pitchyin.h

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