Changeset bbfa9a4 for src/spectral/dct.c

Timestamp:

Nov 26, 2018, 6:53:43 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/timestretch, fix/ffmpeg5, master

Children:

adc6e02

Parents:

8a11e2f (diff), db3eb5c (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/pytest

File:

• src/spectral/dct.c (modified) (6 diffs)

src/spectral/dct.c

@@ -82 +82 @@
 aubio_dct_t* new_aubio_dct (uint_t size) {
   aubio_dct_t * s = AUBIO_NEW(aubio_dct_t);
-  if ((sint_t)size <= 0) goto beach;
 #if defined(HAVE_ACCELERATE)
   // vDSP supports sizes = f * 2 ** n, where n >= 4 and f in [1, 3, 5, 15]
@@ -89 +88 @@
     uint_t radix = size;
     uint_t order = 0;
-    while ((radix / 2) * 2 == radix) {
+    while ((radix >= 1) && ((radix / 2) * 2 == radix)) {
       radix /= 2;
       order++;
@@ -113 +112 @@
     return s;
   } else {
-    AUBIO_WRN("dct: unexcepected error while creating dct_fftw with size %d",
+    AUBIO_WRN("dct: unexpected error while creating dct_fftw with size %d\n",
         size);
     goto plain;
@@ -126 +125 @@
     return s;
   } else {
-    AUBIO_WRN("dct: unexcepected error while creating dct_ipp with size %d",
+    AUBIO_WRN("dct: unexpected error while creating dct_ipp with size %d\n",
         size);
     goto plain;
@@ -144 +143 @@
 #endif
   // falling back to plain mode
-  AUBIO_WRN("dct: d no optimised implementation could be created for size %d",
+  AUBIO_WRN("dct: no optimised implementation could be created for size %d\n",
       size);
 plain:
@@ -157 +156 @@
   }
 beach:
-  AUBIO_ERROR("dct: failed creating with size %d, should be > 0", size);
-  AUBIO_FREE (s);
+  AUBIO_ERROR("dct: failed creating with size %d, should be > 0\n", size);
+  del_aubio_dct(s);
   return NULL;
 }