Changeset 61316a6

Timestamp:

Oct 8, 2009, 8:54:49 PM (15 years ago)

Author:

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

3027c6e

Parents:

05773a2c

Message:

examples plugins: update to latest pitch prototypes

Files:

• examples/aubionotes.c (modified) (1 diff)
• examples/utils.c (modified) (3 diffs)
• examples/utils.h (modified) (1 diff)
• plugins/puredata/aubiopitch~.c (modified) (5 diffs)

examples/aubionotes.c

@@ -46 +46 @@
       isonset = aubio_peakpicker_do(parms, onset);
       
-      pitch = aubio_pitchdetection_do (pitchdet,ibuf);
+      aubio_pitchdetection_do (pitchdet, ibuf, pitch_obuf);
+      pitch = fvec_read_sample(pitch_obuf, 0, 0);
       if(median){
               note_append(note_buffer, pitch);

examples/utils.c

@@ -62 +62 @@
 fvec_t *ibuf;
 fvec_t *obuf;
+fvec_t *pitch_obuf;
 cvec_t *fftgrain;
 fvec_t *woodblock;
@@ -319 +320 @@
     pitchdet = new_aubio_pitchdetection (buffer_size * 4,
         overlap_size, channels, samplerate, type_pitch, mode_pitch);
-    aubio_pitchdetection_set_yinthresh (pitchdet, 0.7);
+    aubio_pitchdetection_set_tolerance (pitchdet, 0.7);
+    pitch_obuf = new_fvec (1, channels);
 
     if (median) {
@@ -350 +352 @@
       del_fvec (note_buffer2);
     }
+    del_fvec (pitch_obuf);
   }
   if (usedoubled) {

examples/utils.h

@@ -95 +95 @@
 extern fvec_t *ibuf;
 extern fvec_t *obuf;
+extern fvec_t *pitch_obuf;
 extern cvec_t *fftgrain;
 extern fvec_t *woodblock;

plugins/puredata/aubiopitch~.c

@@ -31 +31 @@
         aubio_pitchdetection_t *o;
         fvec_t *vec;
+        fvec_t *pitchvec;
         t_outlet *pitch;
 } t_aubiopitch_tilde;
@@ -40 +41 @@
         int n                 = (int)(w[3]);
         int j;
-        smpl_t pitch;
         for (j=0;j<n;j++) {
                 /* write input to datanew */
@@ -47 +47 @@
                 if (x->pos == x->hopsize-1) {         
                         /* block loop */
-                        pitch = aubio_pitchdetection(x->o,x->vec);
-                        outlet_float(x->pitch, pitch);
+                        aubio_pitchdetection_do(x->o,x->vec, x->pitchvec);
+                        outlet_float(x->pitch, x->pitchvec->data[0][0]);
                         /* end of block loop */
                         x->pos = -1; /* so it will be zero next j loop */
@@ -96 +96 @@
         x->o = new_aubio_pitchdetection(x->bufsize, 
                     x->hopsize, 1, 44100., type_pitch, mode_pitch);
-        aubio_pitchdetection_set_yinthresh(x->o, 0.7);
+        aubio_pitchdetection_set_tolerance (x->o, 0.7);
         x->vec = (fvec_t *)new_fvec(x->hopsize,1);
+        x->pitchvec = (fvec_t *)new_fvec(1,1);
 
         //floatinlet_new (&x->x_obj, &x->threshold);
@@ -110 +111 @@
         del_aubio_pitchdetection(x->o);
         del_fvec(x->vec);
+        del_fvec(x->pitchvec);
         return 0;
 }