Changeset f19db54 for src

Timestamp:

Dec 3, 2018, 3:23: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:

213bf0f, 633400d, d726526, e14f7a7

Parents:

bde4f641 (diff), 117465d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'fix/mfcc_params'

Location:

src/spectral

Files:

• filterbank.c (modified) (1 diff)
• mfcc.c (modified) (2 diffs)
• mfcc.h (modified) (2 diffs)

src/spectral/filterbank.c

@@ -131 +131 @@
 aubio_filterbank_get_power (aubio_filterbank_t *f)
 {
-  return f->norm;
+  return f->power;
 }

src/spectral/mfcc.c

@@ -144 +144 @@
 }
 
-uint_t aubio_mfcc_get_power (aubio_mfcc_t *mf)
+smpl_t aubio_mfcc_get_power (aubio_mfcc_t *mf)
 {
   return aubio_filterbank_get_power(mf->fb);
@@ -155 +155 @@
 }
 
-uint_t aubio_mfcc_get_scale (aubio_mfcc_t *mf)
+smpl_t aubio_mfcc_get_scale (aubio_mfcc_t *mf)
 {
   return mf->scale;

src/spectral/mfcc.h

@@ -93 +93 @@
 
  */
-uint_t aubio_mfcc_get_power (aubio_mfcc_t *mf);
+smpl_t aubio_mfcc_get_power (aubio_mfcc_t *mf);
 
 /** set scaling parameter
@@ -112 +112 @@
 
  */
-uint_t aubio_mfcc_get_scale (aubio_mfcc_t *mf);
+smpl_t aubio_mfcc_get_scale (aubio_mfcc_t *mf);
 
 /** Mel filterbank initialization