From: Paul Brossier <piem@piem.org>
Date: Sat, 17 Nov 2018 12:24:48 +0000 (+0100)
Subject: [filterbank] check input samplerate, not n_bands
X-Git-Tag: 0.4.8~42
X-Git-Url: https://git.aubio.org/?a=commitdiff_plain;h=0316feb35fa29adc9c1f035d56d5b500e1be3626;p=aubio.git

[filterbank] check input samplerate, not n_bands
---

diff --git a/src/spectral/filterbank_mel.c b/src/spectral/filterbank_mel.c
index 6a521af2..3da2e639 100644
--- a/src/spectral/filterbank_mel.c
+++ b/src/spectral/filterbank_mel.c
@@ -219,6 +219,10 @@ aubio_filterbank_set_mel_coeffs (aubio_filterbank_t * fb, smpl_t samplerate,
   fmat_t *coeffs = aubio_filterbank_get_coeffs(fb);
   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");
     return AUBIO_FAIL;
@@ -233,10 +237,6 @@ aubio_filterbank_set_mel_coeffs (aubio_filterbank_t * fb, smpl_t samplerate,
   } 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;
-  }
 
   freqs = new_fvec(n_bands + 2);
   step = (end - start) / (n_bands + 1);
@@ -263,6 +263,10 @@ aubio_filterbank_set_mel_coeffs_htk (aubio_filterbank_t * fb, smpl_t samplerate,
   fmat_t *coeffs = aubio_filterbank_get_coeffs(fb);
   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");
     return AUBIO_FAIL;
@@ -277,10 +281,6 @@ aubio_filterbank_set_mel_coeffs_htk (aubio_filterbank_t * fb, smpl_t samplerate,
   } 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;
-  }
 
   freqs = new_fvec (n_bands + 2);
   step = (end - start) / (n_bands + 1);