Changeset bd2f2ab for examples/aubioonset.c

Timestamp:

Apr 11, 2005, 6:37:51 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:

dc27a81

Parents:

84941cb

Message:

merged commmon code between aubionotes.c and aubioonset.c into utils.c

File:

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

examples/aubioonset.c

@@ -17 +17 @@
 */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <getopt.h>
-#include <unistd.h>
-#include "aubio.h"
-#include "aubioext.h"
 #include "utils.h"
 
+unsigned int pos = 0; /*frames%dspblocksize*/
+uint_t usepitch = 0;
+
 int aubio_process(float **input, float **output, int nframes);
-
-const char * output_filename = NULL;
-const char * input_filename  = NULL;
-const char * onset_filename  = "/usr/share/sounds/aubio/woodblock.aiff";
-
-/* settings */
-int verbose = 0;
-int usejack = 0;
-int usedoubled = 1;
-
-
-/* energy,specdiff,hfc,complexdomain,phase */
-aubio_onsetdetection_type type_onset  = hfc;
-aubio_onsetdetection_type type_onset2 = complexdomain;
-smpl_t threshold                      = 0.1;
-smpl_t threshold2                     = -90.;
-uint_t buffer_size                    = 1024;
-uint_t overlap_size                   = 512;
-uint_t channels                       = 1;
-uint_t samplerate                     = 44100;
-
-/* global objects */
-aubio_pvoc_t * pv;
-fvec_t * ibuf;
-fvec_t * obuf;
-cvec_t * fftgrain;
-fvec_t * woodblock;
-aubio_onsetdetection_t *o;
-aubio_onsetdetection_t *o2;
-fvec_t *onset;
-fvec_t *onset2;
-int isonset = 0;
-aubio_pickpeak_t * parms;
-unsigned int pos = 0; /*frames%dspblocksize*/
-
 int aubio_process(float **input, float **output, int nframes) {
   unsigned int i;       /*channels*/
@@ -96 +57 @@
           obuf->data[0][pos] = 0.;
       }
-      //aubio_pvoc_rdo(pv,fftgrain, obuf);
       /* end of block loop */
       pos = -1; /* so it will be zero next j loop */
@@ -105 +65 @@
 }
 
-int main(int argc, char **argv) {
-  int frames;
-
-  aubio_file_t * file = NULL;
-  aubio_file_t * fileout = NULL;
-
-  aubio_file_t * onsetfile = new_file_ro(onset_filename);
-  parse_args(argc, argv);
-
-  if(!usejack)
-  {
-    debug("Opening files ...\n");
-    file = new_file_ro (input_filename);
-    if (verbose) file_info(file);
-    channels = aubio_file_channels(file);
-    samplerate = aubio_file_samplerate(file);
-    if (output_filename != NULL)
-      fileout = new_file_wo(file, output_filename);
-  }
-
-  ibuf      = new_fvec(overlap_size, channels);
-  obuf      = new_fvec(overlap_size, channels);
-  woodblock = new_fvec(buffer_size,1);
-  fftgrain  = new_cvec(buffer_size, channels);
-
-  /* read the output sound once */
-  file_read(onsetfile, overlap_size, woodblock);
-
-  /* phase vocoder */
-  debug("Phase voc init ... \n");
-  pv = new_aubio_pvoc(buffer_size, overlap_size, channels);
-
-  /* onsets */
-  parms = new_aubio_peakpicker(threshold);
-  o = new_aubio_onsetdetection(type_onset,buffer_size,channels);
-  onset = new_fvec(1, channels);
-  if (usedoubled)    {
-    o2 = new_aubio_onsetdetection(type_onset2,buffer_size,channels);
-    onset2 = new_fvec(1 , channels);
-  }
-
-  if(usejack) {
-#ifdef JACK_SUPPORT
-    aubio_jack_t * jack_setup;
-    debug("Jack init ...\n");
-    jack_setup = new_aubio_jack(channels, channels,
-          (aubio_process_func_t)aubio_process);
-    debug("Jack activation ...\n");
-    aubio_jack_activate(jack_setup);
-    debug("Processing (Ctrl+C to quit) ...\n");
-    pause();
-    aubio_jack_close(jack_setup);
-#else
-    outmsg("Compiled without jack output, exiting.");
-#endif
-
-  } else {
-    /* phasevoc */
-    debug("Processing ...\n");
-
-    frames = 0;
-
-    while (overlap_size == file_read(file, overlap_size, ibuf))
-    {
-      isonset=0;
-      aubio_process(ibuf->data, obuf->data, overlap_size);
+void process_print (void);
+void process_print (void) {
       /* output times in seconds, taking back some 
        * delay to ensure the label is _before_ the
@@ -181 +77 @@
         }
       }
-      if (output_filename != NULL) {
-        file_write(fileout,overlap_size,obuf);
-      }
-      frames++;
-    }
+}
 
-    debug("Processed %d frames of %d samples.\n", frames, buffer_size);
-    del_file(file);
-
-    if (output_filename != NULL)
-      del_file(fileout);
-
-  }
-
-  del_aubio_pvoc(pv);
-  del_fvec(obuf);
-  del_fvec(ibuf);
-  del_cvec(fftgrain);
-  del_fvec(onset);
-
+int main(int argc, char **argv) {
+  examples_common_init(argc,argv);
+  examples_common_process(aubio_process,process_print);
+  examples_common_del();
   debug("End of program.\n");
   fflush(stderr);