Changeset d66d2ac for src

Timestamp:

Nov 17, 2018, 2:59:54 PM (6 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

Children:

11c899b

Parents:

d8eedfa

Message:

[mfcc] remove note about power, add scale

File:

• src/spectral/mfcc.c (modified) (5 diffs)

src/spectral/mfcc.c

@@ -52 +52 @@
   fvec_t *output;
 #endif
+  smpl_t scale;
 };
 
@@ -98 +99 @@
 #endif
 
+  mfcc->scale = 1.;
+
   return mfcc;
 }
@@ -128 +131 @@
   fvec_t tmp;
 #endif
+
   /* compute filterbank */
   aubio_filterbank_do (mf->fb, in, mf->in_dct);
@@ -134 +138 @@
   fvec_log10 (mf->in_dct);
 
-  /* raise power */
-  //fvec_pow (mf->in_dct, 3.);
+  if (mf->scale != 1) fvec_mul (mf->in_dct, mf->scale);
 
   /* compute mfccs */
@@ -162 +165 @@
 }
 
+uint_t aubio_mfcc_set_scale (aubio_mfcc_t *mf, smpl_t scale)
+{
+  mf->scale = scale;
+  return AUBIO_OK;
+}
+
+uint_t aubio_mfcc_get_scale (aubio_mfcc_t *mf)
+{
+  return mf->scale;
+}
+
 uint_t aubio_mfcc_set_mel_coeffs (aubio_mfcc_t *mf, smpl_t freq_min,
     smpl_t freq_max)