Changeset 651b97e

Timestamp:

Aug 8, 2005, 10:08:21 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:

54bf847

Parents:

f841b81

Message:

fix schmitt and fcomb, factorise slideblock code

File:

• src/pitchdetection.c (modified) (6 diffs)

src/pitchdetection.c

@@ -30 +30 @@
 typedef smpl_t (*aubio_pitchdetection_func_t)(aubio_pitchdetection_t *p, 
                 fvec_t * ibuf);
+void aubio_pitchdetection_slideblock(aubio_pitchdetection_t *p, fvec_t *ibuf);
 
 struct _aubio_pitchdetection_t {
@@ -73 +74 @@
                         break;
                 case aubio_fcomb:
+                        p->buf      = new_fvec(bufsize,channels);
                         p->fcomb    = new_aubio_pitchfcomb(bufsize,samplerate);
                         p->callback = aubio_pitchdetection_fcomb;
                         break;
                 case aubio_schmitt:
+                        p->buf      = new_fvec(bufsize,channels);
                         p->schmitt  = new_aubio_pitchschmitt(bufsize,samplerate);
-                        p->callback = aubio_pitchdetection_mcomb;
+                        p->callback = aubio_pitchdetection_schmitt;
                         break;
                 default:
@@ -98 +101 @@
                         break;
                 case aubio_schmitt:
+                        del_fvec(p->buf);
                         del_aubio_pitchschmitt(p->schmitt);
                         break;
                 case aubio_fcomb:
+                        del_fvec(p->buf);
                         del_aubio_pitchfcomb(p->fcomb);
                         break;
@@ -107 +112 @@
         }
         AUBIO_FREE(p);
+}
+
+void aubio_pitchdetection_slideblock(aubio_pitchdetection_t *p, fvec_t *ibuf){
+        uint_t i,j = 0, overlap_size = 0;
+        overlap_size = p->buf->length-ibuf->length;
+        for (i=0;i<p->buf->channels;i++){
+                for (j=0;j<overlap_size;j++){
+                        p->buf->data[i][j] = 
+                                p->buf->data[i][j+ibuf->length];
+                }
+        }
+        for (i=0;i<ibuf->channels;i++){
+                for (j=0;j<ibuf->length;j++){
+                        p->buf->data[i][j+overlap_size] = 
+                                ibuf->data[i][j];
+                }
+        }
 }
 
@@ -128 +150 @@
 smpl_t aubio_pitchdetection_yin(aubio_pitchdetection_t *p, fvec_t *ibuf) {
         smpl_t pitch = 0.;
-        uint_t i,j = 0, overlap_size = 0;
-        overlap_size = p->buf->length-ibuf->length;
-        /* do sliding window blocking */
-        for (i=0;i<p->buf->channels;i++){
-                for (j=0;j<overlap_size;j++){
-                        p->buf->data[i][j] = 
-                                p->buf->data[i][j+ibuf->length];
-                }
-        }
-        for (i=0;i<ibuf->channels;i++){
-                for (j=0;j<ibuf->length;j++){
-                        p->buf->data[i][j+overlap_size] = 
-                                ibuf->data[i][j];
-                }
-        }
+        aubio_pitchdetection_slideblock(p,ibuf);
         pitch = aubio_pitchyin_getpitchfast(p->buf,p->yin, 0.5);
         if (pitch>0) {
@@ -154 +162 @@
 
 smpl_t aubio_pitchdetection_fcomb(aubio_pitchdetection_t *p, fvec_t *ibuf){
-        return aubio_pitchfcomb_detect(p->fcomb,ibuf);
+        aubio_pitchdetection_slideblock(p,ibuf);
+        return aubio_pitchfcomb_detect(p->fcomb,p->buf);
 }
 
 smpl_t aubio_pitchdetection_schmitt(aubio_pitchdetection_t *p, fvec_t *ibuf){
-        return aubio_pitchschmitt_detect(p->schmitt,ibuf);
+        aubio_pitchdetection_slideblock(p,ibuf);
+        return aubio_pitchschmitt_detect(p->schmitt,p->buf);
 }