Changeset f19db54


Ignore:
Timestamp:
Dec 3, 2018, 3:23:54 PM (5 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'

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • python/tests/test_mfcc.py

    rbde4f641 rf19db54  
    117117        buf_size, n_filters, n_coeffs, samplerate = 512, 20, 10, 16000
    118118        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
    120121        m(cvec(buf_size))
    121122
     
    123124        buf_size, n_filters, n_coeffs, samplerate = 512, 20, 10, 16000
    124125        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
    126128        m(cvec(buf_size))
    127129
  • src/spectral/filterbank.c

    rbde4f641 rf19db54  
    131131aubio_filterbank_get_power (aubio_filterbank_t *f)
    132132{
    133   return f->norm;
     133  return f->power;
    134134}
  • src/spectral/mfcc.c

    rbde4f641 rf19db54  
    144144}
    145145
    146 uint_t aubio_mfcc_get_power (aubio_mfcc_t *mf)
     146smpl_t aubio_mfcc_get_power (aubio_mfcc_t *mf)
    147147{
    148148  return aubio_filterbank_get_power(mf->fb);
     
    155155}
    156156
    157 uint_t aubio_mfcc_get_scale (aubio_mfcc_t *mf)
     157smpl_t aubio_mfcc_get_scale (aubio_mfcc_t *mf)
    158158{
    159159  return mf->scale;
  • src/spectral/mfcc.h

    rbde4f641 rf19db54  
    9393
    9494 */
    95 uint_t aubio_mfcc_get_power (aubio_mfcc_t *mf);
     95smpl_t aubio_mfcc_get_power (aubio_mfcc_t *mf);
    9696
    9797/** set scaling parameter
     
    112112
    113113 */
    114 uint_t aubio_mfcc_get_scale (aubio_mfcc_t *mf);
     114smpl_t aubio_mfcc_get_scale (aubio_mfcc_t *mf);
    115115
    116116/** Mel filterbank initialization
Note: See TracChangeset for help on using the changeset viewer.