Changeset 8eecb9f


Ignore:
Timestamp:
Nov 17, 2018, 3:27:32 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:
2eb52bd
Parents:
1c1dae7 (diff), c5de692 (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 'feature/melfilterbank' into feature/mfccparams

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/spectral/filterbank_mel.c

    r1c1dae7 r8eecb9f  
    171171    smpl_t samplerate)
    172172{
    173   uint_t retval;
     173  /* Malcolm Slaney parameters */
     174  const smpl_t lowestFrequency = 133.3333;
     175  const smpl_t linearSpacing = 66.66666666;
     176  const smpl_t logSpacing = 1.0711703;
     177
     178  const uint_t linearFilters = 13;
     179  const uint_t logFilters = 27;
     180  const uint_t n_filters = linearFilters + logFilters;
     181
     182  uint_t fn, retval;
     183  smpl_t lastlinearCF;
     184
     185  /* buffers to compute filter frequencies */
     186  fvec_t *freqs;
    174187
    175188  if (samplerate <= 0) {
     
    178191  }
    179192
    180   /* Malcolm Slaney parameters */
    181   smpl_t lowestFrequency = 133.3333;
    182   smpl_t linearSpacing = 66.66666666;
    183   smpl_t logSpacing = 1.0711703;
    184 
    185   uint_t linearFilters = 13;
    186   uint_t logFilters = 27;
    187   uint_t n_filters = linearFilters + logFilters;
    188 
    189   uint_t fn;                    /* filter counter */
    190 
    191   smpl_t lastlinearCF;
    192 
    193   /* buffers to compute filter frequencies */
    194   fvec_t *freqs = new_fvec (n_filters + 2);
     193  freqs = new_fvec (n_filters + 2);
    195194
    196195  /* first step: fill all the linear filter frequencies */
Note: See TracChangeset for help on using the changeset viewer.