Changeset 8eecb9f

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:

• src/spectral/filterbank_mel.c (modified) (2 diffs)

src/spectral/filterbank_mel.c

@@ -171 +171 @@
     smpl_t samplerate)
 {
-  uint_t retval;
+  /* Malcolm Slaney parameters */
+  const smpl_t lowestFrequency = 133.3333;
+  const smpl_t linearSpacing = 66.66666666;
+  const smpl_t logSpacing = 1.0711703;
+
+  const uint_t linearFilters = 13;
+  const uint_t logFilters = 27;
+  const uint_t n_filters = linearFilters + logFilters;
+
+  uint_t fn, retval;
+  smpl_t lastlinearCF;
+
+  /* buffers to compute filter frequencies */
+  fvec_t *freqs;
 
   if (samplerate <= 0) {
@@ -178 +191 @@
   }
 
-  /* Malcolm Slaney parameters */
-  smpl_t lowestFrequency = 133.3333;
-  smpl_t linearSpacing = 66.66666666;
-  smpl_t logSpacing = 1.0711703;
-
-  uint_t linearFilters = 13;
-  uint_t logFilters = 27;
-  uint_t n_filters = linearFilters + logFilters;
-
-  uint_t fn;                    /* filter counter */
-
-  smpl_t lastlinearCF;
-
-  /* buffers to compute filter frequencies */
-  fvec_t *freqs = new_fvec (n_filters + 2);
+  freqs = new_fvec (n_filters + 2);
 
   /* first step: fill all the linear filter frequencies */