src/mathutils.c: rename fvec_dc_removal to fvec_min_removal

diff --git a/src/mathutils.c b/src/mathutils.c
index c92155e512340ff453c6c7cbc8591dd5e020672a..8e2a65a5727cf858fbdbec115ec3ac5b08e939fd 100644 (file)
--- a/src/mathutils.c
+++ b/src/mathutils.c
@@ -180,13 +180,16 @@ smpl_t fvec_alpha_norm(fvec_t * DF, smpl_t alpha) {
   return POW(tmp/DF->length,1./alpha);
 }
 
-void fvec_dc_removal(fvec_t * mag) {
-    smpl_t mini = 0.;
-    uint_t length = mag->length, i=0, j;
-    mini = fvec_min(mag);
-    for (j=0;j<length;j++) {
+void
+fvec_min_removal (fvec_t * o)
+{
+  uint_t i, j;
+  smpl_t mini = fvec_min (mag);
+  for (i = 0; i < o->channels; i++) {
+    for (j = 0; j < o->length; j++) {
       mag->data[i][j] -= mini;
     }
+  }
 }
 
 void fvec_alpha_normalise(fvec_t * mag, uint_t alpha) {

diff --git a/src/mathutils.h b/src/mathutils.h
index 295de4b153b9d2122b91400dd7658b39360c0b58..f01bee127b52bc535d164f89fe2b3871a08a8709 100644 (file)
--- a/src/mathutils.h
+++ b/src/mathutils.h
@@ -119,8 +119,8 @@ smpl_t fvec_local_hfc(fvec_t * f);
  * \bug should not use POW :(
  */
 smpl_t fvec_alpha_norm(fvec_t * DF, smpl_t alpha);
-/**  dc(min) removal */
-void fvec_dc_removal(fvec_t * mag);
+/**  min removal */
+void fvec_min_removal(fvec_t * mag);
 /**  alpha normalisation */
 void fvec_alpha_normalise(fvec_t * mag, uint_t alpha);
 /** add a constant to all members of a vector */

diff --git a/src/pitch/pitchmcomb.c b/src/pitch/pitchmcomb.c
index 68964a103b4a5ebb9a505fe64bab765c004c7e2d..cf284b7ac3ba6e9d9c5807e675a723422ecfbb70 100644 (file)
--- a/src/pitch/pitchmcomb.c
+++ b/src/pitch/pitchmcomb.c
@@ -158,9 +158,9 @@ void aubio_pitchmcomb_spectral_pp(aubio_pitchmcomb_t * p, fvec_t * newmag) {
   for (j=0;j<length;j++) {
     mag->data[i][j] = newmag->data[i][j];
   }
-  fvec_dc_removal(mag);               /* dc removal           */
+  fvec_min_removal(mag);              /* min removal          */
   fvec_alpha_normalise(mag,p->alpha); /* alpha normalisation  */
-  /* skipped */                      /* low pass filtering   */
+  /* skipped */                       /* low pass filtering   */
   /** \bug fvec_moving_thres may write out of bounds */
   fvec_adapt_thres(mag,tmp,p->win_post,p->win_pre); /* adaptative threshold */
   fvec_add(mag,-p->threshold);        /* fixed threshold      */

diff --git a/swig/aubio.i b/swig/aubio.i
index 651f24928c8381a0c72c473d293b50e9c26a556d..3a437fa9075c1f87d473c68584d675eba356a344 100644 (file)
--- a/swig/aubio.i
+++ b/swig/aubio.i
@@ -139,7 +139,7 @@ smpl_t fvec_sum(fvec_t *s);
 smpl_t fvec_local_energy(fvec_t * f);
 smpl_t fvec_local_hfc(fvec_t * f);
 smpl_t fvec_alpha_norm(fvec_t * DF, smpl_t alpha);
-void fvec_dc_removal(fvec_t * mag);
+void fvec_min_removal(fvec_t * mag);
 void fvec_alpha_normalise(fvec_t * mag, uint_t alpha);
 void fvec_add(fvec_t * mag, smpl_t threshold);
 void fvec_adapt_thres(fvec_t * vec, fvec_t * tmp, uint_t post, uint_t pre);