/*
- Copyright (C) 2003 Paul Brossier
+ Copyright (C) 2003-2009 Paul Brossier <piem@aubio.org>
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ This file is part of aubio.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ aubio is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ aubio is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with aubio. If not, see <http://www.gnu.org/licenses/>.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <getopt.h>
-#include <unistd.h>
-#include "aubio.h"
-#include "aubioext.h"
#include "utils.h"
-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*/
+aubio_onset_t *o;
+fvec_t *onset;
+
+static int aubio_process(smpl_t **input, smpl_t **output, int nframes) {
unsigned int j; /*frames*/
- for (j=0;j<nframes;j++) {
+ for (j=0;j<(unsigned)nframes;j++) {
if(usejack) {
- for (i=0;i<channels;i++) {
- /* write input to datanew */
- fvec_write_sample(ibuf, input[i][j], i, pos);
- /* put synthnew in output */
- output[i][j] = fvec_read_sample(obuf, i, pos);
- }
+ /* write input to datanew */
+ fvec_write_sample(ibuf, input[0][j], pos);
+ /* put synthnew in output */
+ output[0][j] = fvec_read_sample(obuf, pos);
}
/*time for fft*/
- if (pos == overlap_size-1) {
+ if (pos == overlap_size-1) {
/* block loop */
- aubio_pvoc_do (pv,ibuf, fftgrain);
- aubio_onsetdetection(o,fftgrain, onset);
- if (usedoubled) {
- aubio_onsetdetection(o2,fftgrain, onset2);
- onset->data[0][0] *= onset2->data[0][0];
- }
- isonset = aubio_peakpick_pimrt(onset,parms);
- if (isonset) {
- /* test for silence */
- if (aubio_silence_detection(ibuf, threshold2)==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) ) {
+ fvec_copy (woodblock, obuf);
} else {
- for (pos = 0; pos < overlap_size; pos++)
- obuf->data[0][pos] = 0.;
+ fvec_zeros (obuf);
}
- //aubio_pvoc_rdo(pv,fftgrain, obuf);
/* end of block loop */
pos = -1; /* so it will be zero next j loop */
}
return 1;
}
-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);
+static void
+process_print (void)
+{
+ /* output times in seconds, taking back some delay to ensure the label is
+ * _before_ the actual onset */
+ if (!verbose && usejack)
+ return;
+ smpl_t onset_found = fvec_read_sample (onset, 0);
+ if (onset_found) {
+ outmsg ("%f\n", aubio_onset_get_last_onset_s (o) );
}
+}
- 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);
- /* output times in seconds, taking back some
- * delay to ensure the label is _before_ the
- * actual onset */
- if (isonset && output_filename == NULL) {
- if(frames >= 4) {
- outmsg("%f\n",(frames-4)*overlap_size/(float)samplerate);
- } else if (frames < 4) {
- outmsg("%f\n",0.);
- }
- }
- 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);
+int main(int argc, char **argv) {
+ frames_delay = 3;
+ examples_common_init(argc,argv);
- if (output_filename != NULL)
- del_file(fileout);
+ o = new_aubio_onset (onset_mode, buffer_size, overlap_size, samplerate);
+ if (threshold != 0.) aubio_onset_set_threshold (o, threshold);
+ onset = new_fvec (1);
- }
+ examples_common_process(aubio_process,process_print);
- del_aubio_pvoc(pv);
- del_fvec(obuf);
- del_fvec(ibuf);
- del_cvec(fftgrain);
- del_fvec(onset);
+ del_aubio_onset (o);
+ del_fvec (onset);
+ examples_common_del();
debug("End of program.\n");
fflush(stderr);
return 0;