Changeset d4c5de7 for examples/aubioonset.c

Timestamp:

Oct 16, 2009, 11:03:08 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:

6107f4c

Parents:

2828382

Message:

examples/: make use of aubio_onset in aubioonset and aubionotes, simplify, keep only general stuff in utils

File:

• examples/aubioonset.c (modified) (4 diffs)

examples/aubioonset.c

@@ -20 +20 @@
 
 unsigned int pos = 0; /*frames%dspblocksize*/
-uint_t usepitch = 0;
 
-int aubio_process(smpl_t **input, smpl_t **output, int nframes);
-int aubio_process(smpl_t **input, smpl_t **output, int nframes) {
+aubio_onset_t *o;
+fvec_t *onset;
+
+static int aubio_process(smpl_t **input, smpl_t **output, int nframes) {
   unsigned int i;       /*channels*/
   unsigned int j;       /*frames*/
@@ -38 +39 @@
     if (pos == overlap_size-1) {         
       /* block loop */
-      aubio_pvoc_do (pv,ibuf, fftgrain);
-      aubio_onsetdetection_do (o,fftgrain, onset);
-      isonset = aubio_peakpicker_do(parms, onset);
-      if (isonset) {
-        /* test for silence */
-        if (aubio_silence_detection(ibuf, silence)==1)
-          isonset=0.;
-        else
-          for (pos = 0; pos < overlap_size; pos++){
-            obuf->data[0][pos] = woodblock->data[0][pos];
-          }
+      aubio_onset_do (o, ibuf, onset);
+      if (fvec_read_sample(onset, 0, 0)) {
+        for (pos = 0; pos < overlap_size; pos++){
+          obuf->data[0][pos] = woodblock->data[0][pos];
+        }
       } else {
-        for (pos = 0; pos < overlap_size; pos++)
+        for (pos = 0; pos < overlap_size; pos++) {
           obuf->data[0][pos] = 0.;
+        }
       }
       /* end of block loop */
@@ -61 +57 @@
 }
 
-void process_print (void);
-void process_print (void) {
+static void process_print (void) {
       /* output times in seconds, taking back some 
        * delay to ensure the label is _before_ the
        * actual onset */
-      if (isonset && output_filename == NULL) {
+      if (!verbose && usejack) return;
+      smpl_t onset_found = fvec_read_sample(onset, 0, 0);
+      if (onset_found) {
         if(frames >= 4) {
-          outmsg("%f\n",(frames - frames_delay + isonset)*overlap_size/(float)samplerate);
+          outmsg("%f\n",(frames - frames_delay + onset_found) 
+                  *overlap_size/(float)samplerate);
         } else if (frames < frames_delay) {
           outmsg("%f\n",0.);
@@ -78 +76 @@
   frames_delay = 3;
   examples_common_init(argc,argv);
+
+  o = new_aubio_onset (onset_mode, buffer_size, overlap_size, channels,
+          samplerate);
+  onset = new_fvec (1, channels);
+
   examples_common_process(aubio_process,process_print);
+
+  del_aubio_onset (o);
+  del_fvec (onset);
+
   examples_common_del();
   debug("End of program.\n");