Changeset 0316feb

Timestamp:

Nov 17, 2018, 1:24:48 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:

6d41dac

Parents:

992e0ff

Message:

[filterbank] check input samplerate, not n_bands

File:

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

src/spectral/filterbank_mel.c

@@ -220 +220 @@
   uint_t n_bands = coeffs->height;
 
+  if (samplerate <= 0) {
+    AUBIO_ERR("filterbank: set_mel_coeffs samplerate should be > 0\n");
+    return AUBIO_FAIL;
+  }
   if (freq_max < 0) {
     AUBIO_ERR("filterbank: set_mel_coeffs freq_max should be > 0\n");
@@ -233 +237 @@
   } else {
     start = aubio_hztomel(freq_min);
-  }
-  if (n_bands <= 0) {
-    AUBIO_ERR("filterbank: set_mel_coeffs n_bands should be > 0\n");
-    return AUBIO_FAIL;
   }
 
@@ -264 +264 @@
   uint_t n_bands = coeffs->height;
 
+  if (samplerate <= 0) {
+    AUBIO_ERR("filterbank: set_mel_coeffs samplerate should be > 0\n");
+    return AUBIO_FAIL;
+  }
   if (freq_max < 0) {
     AUBIO_ERR("filterbank: set_mel_coeffs freq_max should be > 0\n");
@@ -277 +281 @@
   } else {
     start = aubio_hztomel_htk(freq_min);
-  }
-  if (n_bands <= 0) {
-    AUBIO_ERR("filterbank: set_mel_coeffs n_bands should be > 0\n");
-    return AUBIO_FAIL;
   }