Changeset cf83555 for plugins/puredata/aubioonset~.c

Timestamp:

Nov 6, 2005, 1:10:41 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:

091b171

Parents:

f41f5c4

Message:

rewrite of the puredata external
rewrite of the puredata external

File:

• plugins/puredata/aubioonset~.c (modified) (6 diffs)

plugins/puredata/aubioonset~.c

@@ -21 +21 @@
         t_object x_obj;
         t_float threshold;      
+        t_float threshold2;     
+        t_int pos; /*frames%dspblocksize*/
         t_int bufsize;
         t_int hopsize;
         aubio_onsetdetection_t *o;
         aubio_pvoc_t * pv;
+        aubio_pickpeak_t * parms;
         fvec_t *vec;
         fvec_t *onset;
         cvec_t *fftgrain;
-        t_outlet *onsetval;
+        t_outlet *onsetbang;
 } t_aubioonset_tilde;
 
@@ -36 +39 @@
         t_sample *in          = (t_sample *)(w[2]);
         int n                 = (int)(w[3]);
-        //t_sample f = (x->threshold < 0.) ? 0.2 : 
-        //      (x->threshold > 10.) ? 10. : x->threshold;
-        while (n--) //*(x->vec->data[0])++ = (*in++);
-                x->vec->data[0][n] = in[n];
-        aubio_pvoc_do (x->pv, x->vec, x->fftgrain);
-        aubio_onsetdetection(x->o, x->fftgrain, x->onset);
-        outlet_float(x->onsetval, x->onset->data[0][0]);
+        int j,isonset;
+        for (j=0;j<n;j++) {
+                /* write input to datanew */
+                fvec_write_sample(x->vec, in[j], 0, x->pos);
+                /*time for fft*/
+                if (x->pos == x->hopsize-1) {         
+                        /* block loop */
+                        aubio_pvoc_do (x->pv,x->vec, x->fftgrain);
+                        aubio_onsetdetection(x->o,x->fftgrain, x->onset);
+                        isonset = aubio_peakpick_pimrt(x->onset,x->parms);
+                        if (isonset) {
+                                /* test for silence */
+                                if (aubio_silence_detection(x->vec, x->threshold2)==1)
+                                        isonset=0;
+                                else
+                                        outlet_bang(x->onsetbang);
+                        }
+                        /* end of block loop */
+                        x->pos = -1; /* so it will be zero next j loop */
+                }
+                x->pos++;
+        }
         return (w+4);
 }
@@ -58 +76 @@
         post("aubioonset~ audio in:\t%f", x->vec->data[0][0]);
         post("aubioonset~ onset:\t%f", x->onset->data[0][0]);
-        outlet_float(x->onsetval, x->threshold);
 }
 
@@ -67 +84 @@
 
         x->threshold = (f < 1e-5) ? 0.1 : (f > 10.) ? 10. : f;
-        /* should get from block~ size */
+        x->threshold2 = -70.;
         x->bufsize   = 1024;
         x->hopsize   = x->bufsize / 2;
@@ -73 +90 @@
         x->o = new_aubio_onsetdetection(aubio_onset_complex, x->bufsize, 1);
         x->vec = (fvec_t *)new_fvec(x->hopsize,1);
-        x->pv = new_aubio_pvoc(x->bufsize, x->hopsize, 1);
-        x->fftgrain  = new_cvec(x->bufsize,1);
+        x->pv = (aubio_pvoc_t *)new_aubio_pvoc(x->bufsize, x->hopsize, 1);
+        x->fftgrain  = (cvec_t *)new_cvec(x->bufsize,1);
         x->onset = (fvec_t *)new_fvec(1,1);
+        x->parms = new_aubio_peakpicker(x->threshold);
 
         floatinlet_new (&x->x_obj, &x->threshold);
-        x->onsetval = outlet_new (&x->x_obj, &s_float);
+        x->onsetbang = outlet_new (&x->x_obj, &s_bang);
+        post(aubioonset_version);
         return (void *)x;
 }
@@ -98 +117 @@
         CLASS_MAINSIGNALIN(aubioonset_tilde_class, 
                         t_aubioonset_tilde, threshold);
-        post("aubioonset~ v0.1 for puredata");
 }