src/pitch/pitch.{c,h}: add silence gate, default at -50dB

[aubio.git] / examples / aubiomfcc.c

diff --git a/examples/aubiomfcc.c b/examples/aubiomfcc.c
index d1cd64dd060ecfa3a92a9c0e64ec4c5b4e914172..c5422e0b785854a45825497d34ab878f7e424525 100644 (file)
--- a/examples/aubiomfcc.c
+++ b/examples/aubiomfcc.c
@@ -1,20 +1,21 @@
 /*
-   Copyright (C) 2007 Amaury Hazan <ahazan@iua.upf.edu>
-                  and Paul Brossier <piem@piem.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 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.
-
-   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.
+  Copyright (C) 2007-2009 Paul Brossier <piem@aubio.org>
+
+  This file is part of aubio.
+
+  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/>.
+
 */
 
 #include "utils.h"
@@ -22,43 +23,34 @@
 /* mfcc objects */
 fvec_t * mfcc_out;
 aubio_mfcc_t * mfcc;
+aubio_pvoc_t *pv;
+cvec_t *fftgrain;
 
 uint_t n_filters = 40;
-uint_t n_coefs = 20;
+uint_t n_coefs = 13;
 
 unsigned int pos = 0; /*frames%dspblocksize*/
-uint_t usepitch = 0;
 
-int aubio_process(float **input, float **output, int nframes);
-int aubio_process(float **input, float **output, int nframes) {
-  unsigned int i;       /*channels*/
+static int aubio_process(smpl_t **input, smpl_t **output, int nframes) {
   unsigned int j;       /*frames*/
   
   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 */
       
       //compute mag spectrum
-      aubio_pvoc_do (pv,ibuf, fftgrain);
+      aubio_pvoc_do (pv, ibuf, fftgrain);
      
       //compute mfccs
       aubio_mfcc_do(mfcc, fftgrain, mfcc_out);
       
-      uint_t coef_cnt;
-      for (coef_cnt = 0; coef_cnt < n_coefs; coef_cnt++) {
-          outmsg("%f ",mfcc_out->data[0][coef_cnt]);
-      }
-      outmsg("\n");
-      
       /* end of block loop */
       pos = -1; /* so it will be zero next j loop */
     }
@@ -67,44 +59,37 @@ int aubio_process(float **input, float **output, int nframes) {
   return 1;
 }
 
-void process_print (void);
-void process_print (void) {
-      /* output times in seconds
-         write extracted mfccs
-      */
-      
-      uint_t coef_cnt;
-      if (output_filename == NULL) {
-//         if(frames >= 4) {
-//           outmsg("%f\t",(frames-4)*overlap_size/(float)samplerate);
-//         } 
-//         else if (frames < 4) {
-//           outmsg("%f\t",0.);
-//         }
-        //outmsg("%f ",mfcc_out->data[0][0]);
-        
-        
-      }
+static void process_print (void) {
+  /* output times in seconds and extracted mfccs */
+  if (sink_uri == NULL) {
+    outmsg("%f\t",frames*overlap_size/(float)samplerate);
+    fvec_print(mfcc_out);
+  }
 }
 
 int main(int argc, char **argv) {
   // params
+  buffer_size  = 512;
+  overlap_size = 256;
   
   examples_common_init(argc,argv);
-  smpl_t lowfreq = 133.333f;
-  smpl_t highfreq = 44100.f;
-  mfcc_out = new_fvec(n_coefs,channels);
-  
-  
+
+  /* phase vocoder */
+  pv = new_aubio_pvoc (buffer_size, overlap_size);
+
+  fftgrain = new_cvec (buffer_size);
+
   //populating the filter
-  mfcc = new_aubio_mfcc(buffer_size, samplerate, n_filters, n_coefs , lowfreq, highfreq, channels);
-  dump_filterbank(mfcc);
+  mfcc = new_aubio_mfcc(buffer_size, n_filters, n_coefs, samplerate);
   
+  mfcc_out = new_fvec(n_coefs);
   
   //process
   examples_common_process(aubio_process,process_print);
   
   //destroying mfcc 
+  del_aubio_pvoc (pv);
+  del_cvec (fftgrain);
   del_aubio_mfcc(mfcc);
   del_fvec(mfcc_out);