/*
- 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 <aubio.h>
#include "utils.h"
-#include "beattracking.h"
-
-unsigned int pos = 0; /* frames%dspblocksize */
-unsigned int pos2 = 0; /* frames%dspblocksize */
-uint_t usepitch = 0;
-fvec_t * dfframe = NULL;
-fvec_t * out = NULL;
-aubio_beattracking_t * bt = NULL;
-uint_t winlen = 512;
-uint_t step = 0;
-uint_t istactus = 0;
-
-int aubio_process(float **input, float **output, int nframes);
-int aubio_process(float **input, float **output, int nframes) {
- unsigned int i; /*channels*/
+
+uint_t pos = 0; /* frames%dspblocksize */
+fvec_t * tempo_out = NULL;
+aubio_tempo_t * bt = NULL;
+smpl_t istactus = 0;
+smpl_t isonset = 0;
+
+static int aubio_process(smpl_t **input, smpl_t **output, int nframes) {
unsigned int j; /*frames*/
- smpl_t * btoutput = out->data[0];
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) {
/* 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];
- }
- /* execute every overlap_size*step */
- if (pos2 == step -1 ) {
-
- /* check dfframe */
- /*
- outmsg("\n");
- for (i = 0; i < winlen; i++ )
- outmsg("%f,", dfframe->data[0][i]);
- outmsg("\n");
- */
-
- aubio_beattracking_do(bt,dfframe,out);
-
- /* rotate dfframe */
- for (i = 0 ; i < winlen - step; i++ )
- dfframe->data[0][i] = dfframe->data[0][i+step];
- for (i = winlen - step ; i < winlen; i++ )
- dfframe->data[0][i] = 0.;
-
- pos2 = -1;
- }
- pos2++;
- isonset = aubio_peakpick_pimrt_wt(onset,parms,&(dfframe->data[0][winlen - step + pos2]));
- /* end of second level loop */
- istactus = 0;
- i=0;
- for (i = 1; i < btoutput[0]; i++ ) {
- if (pos2 == btoutput[i]) {
- //printf("pos2: %d\n", pos2);
- //printf("tempo:\t%3.5f bpm \n",
- //60.*44100./overlap_size/abs(btoutput[2]-btoutput[1]));
- /* test for silence */
- if (aubio_silence_detection(ibuf, threshold2)==1) {
- isonset = 0;
- istactus = 0;
- } else {
- istactus = 1;
- }
- }
- }
-
- if (istactus ==1) {
- for (pos = 0; pos < overlap_size; pos++)
- obuf->data[0][pos] = woodblock->data[0][pos];
+ aubio_tempo_do (bt,ibuf,tempo_out);
+ istactus = fvec_read_sample (tempo_out, 0);
+ isonset = fvec_read_sample (tempo_out, 1);
+ if (istactus > 0.) {
+ fvec_copy (woodblock, obuf);
} else {
- for (pos = 0; pos < overlap_size; pos++)
- obuf->data[0][pos] = 0.;
+ fvec_zeros (obuf);
}
/* end of block loop */
pos = -1; /* so it will be zero next j loop */
return 1;
}
-void process_print (void);
-void process_print (void) {
- if (output_filename == NULL) {
- if (istactus)
- outmsg("%f\n",(frames)*overlap_size/(float)samplerate);
+static void process_print (void) {
+ if (sink_uri == NULL) {
+ if (istactus) {
+ outmsg("%f\n",((smpl_t)(frames*overlap_size)+(istactus-1.)*overlap_size)/(smpl_t)samplerate);
+ }
if (isonset && verbose)
outmsg(" \t \t%f\n",(frames)*overlap_size/(float)samplerate);
}
overlap_size = 512;
/* override default settings */
examples_common_init(argc,argv);
- /* configure peak picker */
- //aubio_peakpicker_set_thresholdfn(parms,vec_mean);
- //aubio_peakpicker_set_threshold(parms,0.);
- winlen = SQR(512)/overlap_size;
- dfframe = new_fvec(winlen,channels);
- step = winlen/4;
- out = new_fvec(step,channels);
-
- /* test input : impulses starting from 15, at intervals of 50 samples */
- //for(i=0;i<16;i++){
- // dfframe->data[0][50*i+14] = 1.;
- //}
-
- bt = new_aubio_beattracking(winlen,channels);
+ tempo_out = new_fvec(2);
+ bt = new_aubio_tempo(onset_mode,buffer_size,overlap_size, samplerate);
+ if (threshold != 0.) aubio_tempo_set_threshold (bt, threshold);
examples_common_process(aubio_process,process_print);
+ del_aubio_tempo(bt);
+ del_fvec(tempo_out);
+
examples_common_del();
debug("End of program.\n");
projects / aubio.git / blobdiff