Changeset d84d19e

Timestamp:

Sep 25, 2009, 4:20:27 AM (15 years ago)

Author:

Paul Brossier <piem@piem.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:

ff9d00c

Parents:

e4284c9

Message:

src/mathutils.{c,h}: change prototype from aubio_window to new_aubio_window, allocating an fvec, use new function everywhere

Files:

• src/mathutils.c (modified) (2 diffs)
• src/mathutils.h (modified) (1 diff)
• src/pitch/pitchfcomb.c (modified) (1 diff)
• src/pitch/pitchyinfft.c (modified) (1 diff)
• src/spectral/phasevoc.c (modified) (4 diffs)
• swig/aubio.i (modified) (1 diff)

src/mathutils.c

@@ -25 +25 @@
 #include "config.h"
 
-void aubio_window(smpl_t *w, uint_t size, aubio_window_type wintype) {
+fvec_t * new_aubio_window(uint_t size, aubio_window_type wintype) {
+  // create fvec of size x 1 channel
+  fvec_t * win = new_fvec( size, 1);
+  smpl_t * w = win->data[0];
   uint_t i;
   switch(wintype) {
@@ -72 +75 @@
       break;
   }
+  return win;
 }
 

src/mathutils.h

@@ -56 +56 @@
 
 /** create window */
-void aubio_window(smpl_t *w, uint_t size, aubio_window_type wintype);
+fvec_t * new_aubio_window(uint_t size, aubio_window_type wintype);
 
 /** principal argument

src/pitch/pitchfcomb.c

@@ -54 +54 @@
   p->fftLastPhase = new_fvec(bufsize,1);
   p->fft = new_aubio_fft(bufsize, 1);
-  p->win = new_fvec(bufsize,1);
-  aubio_window(p->win->data[0], bufsize, aubio_win_hanning);
+  p->win = new_aubio_window(bufsize, aubio_win_hanning);
   return p;
 }

src/pitch/pitchyinfft.c

@@ -55 +55 @@
   p->res    = new_cvec(bufsize,1);
   p->yinfft = new_fvec(bufsize/2+1,1);
-  p->win    = new_fvec(bufsize,1);
-  aubio_window(p->win->data[0], bufsize, aubio_win_hanningz);
+  p->win    = new_aubio_window(bufsize, aubio_win_hanningz);
   p->weight      = new_fvec(bufsize/2+1,1);
   {

src/spectral/phasevoc.c

@@ -35 +35 @@
   fvec_t * data;      /** current input grain [win_s] */
   fvec_t * dataold;   /** last input frame [win_s-hop_s] */
-  smpl_t * w;         /** grain window [win_s] */
+  fvec_t * w;         /** grain window [win_s] */
 };
 
@@ -54 +54 @@
         datanew->data[i],pv->win_s,pv->hop_s);
     /* windowing */
-    for (j=0; j<pv->win_s; j++) pv->data->data[i][j] *= pv->w[j];
+    fvec_weight(pv->data, pv->w);
   }
   /* shift */
@@ -96 +96 @@
   pv->dataold  = new_fvec  (win_s-hop_s, channels);
   pv->synthold = new_fvec (win_s-hop_s, channels);
-  pv->w        = AUBIO_ARRAY(smpl_t,win_s);
-  aubio_window(pv->w,win_s,aubio_win_hanningz);
+  pv->w        = new_aubio_window (win_s, aubio_win_hanningz);
 
   pv->channels = channels;
@@ -111 +110 @@
   del_fvec(pv->dataold);
   del_fvec(pv->synthold);
+  del_fvec(pv->w);
   del_aubio_fft(pv->fft);
-  AUBIO_FREE(pv->w);
   AUBIO_FREE(pv);
 }

swig/aubio.i

@@ -128 +128 @@
 } aubio_window_type;
 
-void aubio_window(smpl_t *w, uint_t size, aubio_window_type wintype);
+fvec_t * new_aubio_window(uint_t size, aubio_window_type wintype);
 smpl_t aubio_unwrap2pi (smpl_t phase);
 smpl_t vec_mean(fvec_t *s);