Changeset 088760e for src/spectral

Timestamp:

Oct 31, 2018, 10:26:52 PM (6 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/constantq

Children:

c03d191

Parents:

45c2c5c (diff), 7a54b37 (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 'master' into feature/constantq

Location:

src/spectral

Files:

• filterbank_mel.h (modified) (1 diff)
• mfcc.c (modified) (1 diff)
• mfcc.h (modified) (1 diff)
• phasevoc.c (modified) (1 diff)
• phasevoc.h (modified) (1 diff)

src/spectral/filterbank_mel.h

@@ -59 +59 @@
 
   The filter coefficients are built according to Malcolm Slaney's Auditory
-  Toolbox, available at http://engineering.purdue.edu/~malcolm/interval/1998-010/
-  (see file mfcc.m).
+  Toolbox, available online at the following address (see file mfcc.m):
+
+  https://engineering.purdue.edu/~malcolm/interval/1998-010/
 
 */

src/spectral/mfcc.c

@@ -32 +32 @@
 #include "spectral/mfcc.h"
 
-#undef HAVE_SLOW_DCT
+#ifdef HAVE_NOOPT
+#define HAVE_SLOW_DCT 1
+#endif
 
 /** Internal structure for mfcc object */

src/spectral/mfcc.h

@@ -27 +27 @@
 
   The implementation follows the specifications established by Malcolm Slaney
-  in its Auditory Toolbox, available online (see file mfcc.m).
+  in its Auditory Toolbox, available online at the following address (see
+  file mfcc.m):
 
-  http://engineering.ecn.purdue.edu/~malcolm/interval/1998-010/
+  https://engineering.purdue.edu/~malcolm/interval/1998-010/
 
   \example spectral/test-mfcc.c

src/spectral/phasevoc.c

@@ -213 +213 @@
     synthold[i] += synth[i + pv->hop_s] * pv->scale;
 }
+
+uint_t aubio_pvoc_get_win(aubio_pvoc_t* pv)
+{
+  return pv->win_s;
+}
+
+uint_t aubio_pvoc_get_hop(aubio_pvoc_t* pv)
+{
+  return pv->hop_s;
+}

src/spectral/phasevoc.h

@@ -89 +89 @@
 */
 uint_t aubio_pvoc_get_win(aubio_pvoc_t* pv);
+
 /** get hop size