[examples] remove unneeded cast

[aubio.git] / examples / aubiomfcc.c

diff --git a/examples/aubiomfcc.c b/examples/aubiomfcc.c
index d7d1ebf..f333d63 100644 (file)
--- a/examples/aubiomfcc.c
+++ b/examples/aubiomfcc.c
@@ -1,111 +1,81 @@
 /*
-   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-2013 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"
+#include "parse_args.h"
 
-/* mfcc objects */
-fvec_t * mfcc_out;
-aubio_mfcc_t * mfcc;
-aubio_pvoc_t *pv;
-cvec_t *fftgrain;
+aubio_pvoc_t *pv;    // a phase vocoder
+cvec_t *fftgrain;    // outputs a spectrum
+aubio_mfcc_t * mfcc; // which the mfcc will process
+fvec_t * mfcc_out;   // to get the output coefficients
 
 uint_t n_filters = 40;
 uint_t n_coefs = 13;
 
-unsigned int pos = 0; /*frames%dspblocksize*/
-
-static int aubio_process(smpl_t **input, smpl_t **output, int nframes) {
-  unsigned int i;       /*channels*/
-  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);
-      }
-    }
-    /*time for fft*/
-    if (pos == overlap_size-1) {         
-      /* block loop */
-      
-      //compute mag spectrum
-      aubio_pvoc_do (pv,ibuf, fftgrain);
-     
-      //compute mfccs
-      aubio_mfcc_do(mfcc, fftgrain, mfcc_out);
-      
-      /* end of block loop */
-      pos = -1; /* so it will be zero next j loop */
-    }
-    pos++;
-  }
-  return 1;
+void process_block (fvec_t *ibuf, fvec_t *obuf)
+{
+  fvec_zeros(obuf);
+  //compute mag spectrum
+  aubio_pvoc_do (pv, ibuf, fftgrain);
+  //compute mfccs
+  aubio_mfcc_do(mfcc, fftgrain, mfcc_out);
 }
 
-static void process_print (void) {
-      /* output times in seconds
-         write extracted mfccs
-      */
-      
-      uint_t coef_cnt;
-      if (output_filename == NULL) {
-        outmsg("%f\t",frames*overlap_size/(float)samplerate);
-        for (coef_cnt = 0; coef_cnt < n_coefs; coef_cnt++) {
-            outmsg("%f ",mfcc_out->data[0][coef_cnt]);
-        }
-        outmsg("\n");
-      }
+void process_print (void)
+{
+  /* output times in selected format */
+  print_time (blocks * hop_size);
+  outmsg ("\t");
+  /* output extracted mfcc */
+  fvec_print (mfcc_out);
 }
 
 int main(int argc, char **argv) {
-  // params
+  int ret = 0;
+  // change some default params
   buffer_size  = 512;
-  overlap_size = 256;
-  
-  examples_common_init(argc,argv);
+  hop_size = 256;
 
-  /* phase vocoder */
-  pv = new_aubio_pvoc (buffer_size, overlap_size, channels);
+  examples_common_init(argc,argv);
 
-  fftgrain = new_cvec (buffer_size, channels);
+  verbmsg ("using source: %s at %dHz\n", source_uri, samplerate);
+  verbmsg ("buffer_size: %d, ", buffer_size);
+  verbmsg ("hop_size: %d\n", hop_size);
 
-  //populating the filter
+  pv = new_aubio_pvoc (buffer_size, hop_size);
+  fftgrain = new_cvec (buffer_size);
   mfcc = new_aubio_mfcc(buffer_size, n_filters, n_coefs, samplerate);
-  
-  mfcc_out = new_fvec(n_coefs,channels);
-  
-  //process
-  examples_common_process(aubio_process,process_print);
-  
-  //destroying mfcc 
+  mfcc_out = new_fvec(n_coefs);
+  if (pv == NULL || fftgrain == NULL || mfcc == NULL || mfcc_out == NULL) {
+    ret = 1;
+    goto beach;
+  }
+
+  examples_common_process(process_block, process_print);
+
   del_aubio_pvoc (pv);
   del_cvec (fftgrain);
   del_aubio_mfcc(mfcc);
   del_fvec(mfcc_out);
 
+beach:
   examples_common_del();
-  debug("End of program.\n");
-  fflush(stderr);
-  
-  return 0;
+  return ret;
 }
-