Changeset c9ca2608 for src

Timestamp:

Sep 15, 2018, 5:34:21 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:

3aa60b2

Parents:

3aac194 (diff), ad3770f (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/fastmfcc

Location:

src

Files:

• io/source_avcodec.c (modified) (1 diff)
• spectral/dct.c (modified) (3 diffs)

src/io/source_avcodec.c

@@ -144 +144 @@
   strncpy(s->path, path, strnlen(path, PATH_MAX) + 1);
 
+#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(58,0,0)
   // register all formats and codecs
   av_register_all();
+#endif
 
   if (aubio_source_avcodec_has_network_url(s)) {

src/spectral/dct.c

@@ -41 +41 @@
 
 #if defined(HAVE_ACCELERATE)
-typedef struct _aubio_dct_opt_t aubio_dct_accelerate_t;
+typedef struct _aubio_dct_accelerate_t aubio_dct_accelerate_t;
 extern aubio_dct_accelerate_t * new_aubio_dct_accelerate (uint_t size);
 extern void aubio_dct_accelerate_do(aubio_dct_accelerate_t *s, const fvec_t *input, fvec_t *output);
@@ -47 +47 @@
 extern void del_aubio_dct_accelerate (aubio_dct_accelerate_t *s);
 #elif defined(HAVE_FFTW3)
-typedef struct _aubio_dct_opt_t aubio_dct_fftw_t;
+typedef struct _aubio_dct_fftw_t aubio_dct_fftw_t;
 extern aubio_dct_fftw_t * new_aubio_dct_fftw (uint_t size);
 extern void aubio_dct_fftw_do(aubio_dct_fftw_t *s, const fvec_t *input, fvec_t *output);
@@ -84 +84 @@
   if ((sint_t)size <= 0) goto beach;
 #if defined(HAVE_ACCELERATE)
-  // TODO check
   // vDSP supports sizes = f * 2 ** n, where n >= 4 and f in [1, 3, 5, 15]
   // see https://developer.apple.com/documentation/accelerate/1449930-vdsp_dct_createsetup
-  if (aubio_is_power_of_two(size/16) != 1
-      || (size/16 != 3 && size/16 != 5 && size/16 != 15)) {
-    goto plain;
+  {
+    uint_t radix = size;
+    uint_t order = 0;
+    while ((radix / 2) * 2 == radix) {
+      radix /= 2;
+      order++;
+    }
+    if (order < 4 || (radix != 1 && radix != 3 && radix != 5 && radix != 15)) {
+      goto plain;
+    }
   }
   s->dct = (void *)new_aubio_dct_accelerate (size);