Changeset 9590e81 for src/temporal

Timestamp:

Feb 9, 2016, 3:24:53 PM (8 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:

1175883

Parents:

a33d406

Message:

src/temporal/filter.c: check parameters

Location:

src/temporal

Files:

• a_weighting.c (modified) (2 diffs)
• c_weighting.c (modified) (2 diffs)
• filter.c (modified) (2 diffs)

src/temporal/a_weighting.c

@@ -30 +30 @@
 {
   uint_t order; lsmp_t *a, *b; lvec_t *as, *bs;
+
+  if ((sint_t)samplerate <= 0) {
+    AUBIO_ERROR("aubio_filter: failed setting A-weighting with samplerate %d\n", samplerate);
+    return AUBIO_FAIL;
+  }
+  if (f == NULL) {
+    AUBIO_ERROR("aubio_filter: failed setting A-weighting with filter NULL\n");
+    return AUBIO_FAIL;
+  }
+
+  order = aubio_filter_get_order (f);
+  if (order != 7) {
+    AUBIO_ERROR ("aubio_filter: order of A-weighting filter must be 7, not %d\n", order);
+    return 1;
+  }
+
   aubio_filter_set_samplerate (f, samplerate);
   bs = aubio_filter_get_feedforward (f);
   as = aubio_filter_get_feedback (f);
   b = bs->data, a = as->data;
-  order = aubio_filter_get_order (f);
-
-  if (order != 7) {
-    AUBIO_ERROR ("order of A-weighting filter must be 7, not %d\n", order);
-    return 1;
-  }
 
   /* select coefficients according to sampling frequency */
@@ -245 +255 @@
 {
   aubio_filter_t *f = new_aubio_filter (7);
-  aubio_filter_set_a_weighting (f, samplerate);
+  if (aubio_filter_set_a_weighting(f,samplerate) != AUBIO_OK) {
+    del_aubio_filter(f);
+    return NULL;
+  }
   return f;
 }

src/temporal/c_weighting.c

@@ -30 +30 @@
 {
   uint_t order; lsmp_t *a, *b; lvec_t *as, *bs;
+
+  if ((sint_t)samplerate <= 0) {
+    AUBIO_ERROR("aubio_filter: failed setting C-weighting with samplerate %d\n", samplerate);
+    return AUBIO_FAIL;
+  }
+  if (f == NULL) {
+    AUBIO_ERROR("aubio_filter: failed setting C-weighting with filter NULL\n");
+    return AUBIO_FAIL;
+  }
+
+  order = aubio_filter_get_order (f);
+  if ( order != 5 ) {
+    AUBIO_ERROR ("aubio_filter: order of C-weighting filter must be 5, not %d\n", order);
+    return 1;
+  }
+
   aubio_filter_set_samplerate (f, samplerate);
   bs = aubio_filter_get_feedforward (f);
   as = aubio_filter_get_feedback (f);
   b = bs->data, a = as->data;
-  order = aubio_filter_get_order (f);
-
-  if ( order != 5 ) {
-    AUBIO_ERROR ("order of C-weighting filter must be 5, not %d\n", order);
-    return 1;
-  }
 
   /* select coefficients according to sampling frequency */
@@ -200 +210 @@
 aubio_filter_t * new_aubio_filter_c_weighting (uint_t samplerate) {
   aubio_filter_t * f = new_aubio_filter(5);
-  aubio_filter_set_c_weighting (f, samplerate);
+  if (aubio_filter_set_c_weighting(f,samplerate) != AUBIO_OK) {
+    del_aubio_filter(f);
+    return NULL;
+  }
   return f;
 }
-

src/temporal/filter.c

@@ -135 +135 @@
 {
   aubio_filter_t *f = AUBIO_NEW (aubio_filter_t);
+  if ((sint_t)order < 1) {
+    AUBIO_FREE(f);
+    return NULL;
+  }
   f->x = new_lvec (order);
   f->y = new_lvec (order);
@@ -143 +147 @@
   f->order = order;
   /* set default to identity */
-  f->a->data[1] = 1.;
+  f->a->data[0] = 1.;
+  f->b->data[0] = 1.;
   return f;
 }