Changeset cf83555

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

Location:

plugins/puredata

Files:

• Makefile.am (modified) (1 diff)
• aubio_setup.c (added)
• aubioonset~.c (modified) (6 diffs)
• aubioquiet~.c (added)
• aubiotempo~.c (added)
• aubiotss~.c (added)
• help-aubioonset~.pd (modified) (1 diff)
• help-aubioquiet~.pd (added)
• help-aubiotempo~.pd (added)
• help-aubiotss~.pd (added)

plugins/puredata/Makefile.am

@@ -12 +12 @@
 
 # Automake won't accept something ending in ".pd_linux" as a library
-pdinstall_PROGRAMS = aubioonset~.pd_linux
+pdinstall_PROGRAMS = aubio.pd_linux
 
-aubioonset__pd_linux_SOURCES = \
-        aubioonset~.c
+aubio_pd_linux_SOURCES = \
+        aubio_setup.c \
+        aubioonset~.c \
+        aubiotempo~.c \
+        aubiotss~.c \
+        aubioquiet~.c
 
 pdincludedir = $(pddir)/src

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");
 }
 

plugins/puredata/help-aubioonset~.pd

@@ -1 @@
-#N canvas 27 302 238 292 10;
+#N canvas 245 501 672 291 10;
 #X obj 50 33 adc~;
-#X obj 59 137 vu 15 120 empty empty -1 -8 0 8 -66577 -1 1 0;
-#X obj 58 109 scale 0 2000 -100 12;
-#N canvas 270 196 450 300 aubioonset 1;
-#X text 71 130 set blocksize to 1024 with 50% overlap;
-#X obj 56 90 outlet;
-#X obj 57 41 inlet~;
-#X obj 55 64 aubioonset~ 0.1;
-#X text 29 141 ugly. not required \, but should give better results
-;
-#X obj 200 95 block~ 1024 2 1;
-#X text 129 22 aubioonset~ takes an input signal and outputs the value
-of the value of the onset detection function;
-#X connect 2 0 3 0;
-#X connect 3 0 1 0;
-#X restore 58 78 pd aubioonset;
-#X obj 108 141 nbx 5 14 -1e+37 1e+37 0 0 empty empty empty 0 -6 0 10
--262144 -1 -1 1310.81 256;
-#X connect 0 0 3 0;
-#X connect 0 1 3 0;
-#X connect 2 0 1 0;
-#X connect 3 0 2 0;
-#X connect 3 0 4 0;
+#X text 181 26 aubioonset~ takes an input signal and outputs a bang
+when an onset has been detected;
+#X text 180 64 this is somewhat similar to the bonk~ object \, except
+it should work on non-percussive attacks too.;
+#X obj 50 97 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1
+-1;
+#X text 182 111 the creation argument and right input can be used to
+set the detection threshold. values between 0 and 10 are accepted.
+low values favorise over-detection. higher values will reduce the number
+of onset detected.;
+#X obj 50 65 aubioonset~ 0.3;
+#X floatatom 128 29 5 0 0 0 - - -;
+#X connect 0 0 5 0;
+#X connect 0 1 5 0;
+#X connect 5 0 3 0;
+#X connect 6 0 5 1;