Changeset f19db54
- Timestamp:
- Dec 3, 2018, 3:23:54 PM (6 years ago)
- 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. - Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
python/tests/test_mfcc.py
rbde4f641 rf19db54 117 117 buf_size, n_filters, n_coeffs, samplerate = 512, 20, 10, 16000 118 118 m = mfcc(buf_size, n_filters, n_coeffs, samplerate) 119 m.set_scale(10.) 119 m.set_scale(10.5) 120 assert m.get_scale() == 10.5 120 121 m(cvec(buf_size)) 121 122 … … 123 124 buf_size, n_filters, n_coeffs, samplerate = 512, 20, 10, 16000 124 125 m = mfcc(buf_size, n_filters, n_coeffs, samplerate) 125 m.set_power(2.) 126 m.set_power(2.5) 127 assert m.get_power() == 2.5 126 128 m(cvec(buf_size)) 127 129 -
src/spectral/filterbank.c
rbde4f641 rf19db54 131 131 aubio_filterbank_get_power (aubio_filterbank_t *f) 132 132 { 133 return f-> norm;133 return f->power; 134 134 } -
src/spectral/mfcc.c
rbde4f641 rf19db54 144 144 } 145 145 146 uint_t aubio_mfcc_get_power (aubio_mfcc_t *mf)146 smpl_t aubio_mfcc_get_power (aubio_mfcc_t *mf) 147 147 { 148 148 return aubio_filterbank_get_power(mf->fb); … … 155 155 } 156 156 157 uint_t aubio_mfcc_get_scale (aubio_mfcc_t *mf)157 smpl_t aubio_mfcc_get_scale (aubio_mfcc_t *mf) 158 158 { 159 159 return mf->scale; -
src/spectral/mfcc.h
rbde4f641 rf19db54 93 93 94 94 */ 95 uint_t aubio_mfcc_get_power (aubio_mfcc_t *mf);95 smpl_t aubio_mfcc_get_power (aubio_mfcc_t *mf); 96 96 97 97 /** set scaling parameter … … 112 112 113 113 */ 114 uint_t aubio_mfcc_get_scale (aubio_mfcc_t *mf);114 smpl_t aubio_mfcc_get_scale (aubio_mfcc_t *mf); 115 115 116 116 /** Mel filterbank initialization
Note: See TracChangeset
for help on using the changeset viewer.