Changeset 3c6f584

Timestamp:

Aug 20, 2015, 1:15:54 PM (9 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, pitchshift, sampler, timestretch, yinfft+

Children:

0309a22

Parents:

e3e8e9d

Message:

src/spectral/fft.c: if Ooura is used, make sure the fft size is a power of two

Files:

• src/spectral/fft.c (modified) (1 diff)
• tests/src/spectral/test-fft.c (modified) (3 diffs)

src/spectral/fft.c

@@ -168 +168 @@
 #endif
 #else                         // using OOURA
+  if (aubio_is_power_of_two(winsize) != 1) {
+    AUBIO_ERR("fft: can only create with sizes power of two,"
+              " requested %d\n", winsize);
+    return NULL;
+  }
   s->winsize = winsize;
   s->fft_size = winsize / 2 + 1;

tests/src/spectral/test-fft.c

@@ -3 +3 @@
 int main (void)
 {
+  int return_code = 0;
   uint_t i, n_iters = 100; // number of iterations
   uint_t win_s = 500; // window size
@@ -10 +11 @@
   // create fft object
   aubio_fft_t * fft = new_aubio_fft(win_s);
+
+  if (!fft) {
+    return_code = 1;
+    goto beach;
+  }
 
   // fill input with some data
@@ -34 +40 @@
   //fvec_print(out);
   del_aubio_fft(fft);
+beach:
   del_fvec(in);
   del_cvec(fftgrain);
   del_fvec(out);
   aubio_cleanup();
-  return 0;
+  return return_code;
 }