Changeset a4364b8 for src/temporal/filter.c

Timestamp:

Sep 29, 2009, 7:43:12 AM (15 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:

c159aeb

Parents:

d9c45df

Message:

src/temporal: revamp filter object, clarify API for A- and C-weighting filters,
add coefficients for 8000 16000 22050 44100 96000 192000, improve documentation,
remove unneeded filter_priv.h, add A and C weighting tests.

File:

• src/temporal/filter.c (modified) (3 diffs)

src/temporal/filter.c

@@ -27 +27 @@
 #include "mathutils.h"
 #include "temporal/filter.h"
-#include "temporal/filter_priv.h"
+
+struct _aubio_filter_t {
+  uint_t order;
+  uint_t samplerate;
+  lvec_t * a;
+  lvec_t * b;
+  lvec_t * y;
+  lvec_t * x;
+};
 
 void aubio_filter_do(aubio_filter_t * f, fvec_t * in) {
@@ -103 +111 @@
 }
 
-aubio_filter_t * new_aubio_filter(uint_t samplerate UNUSED, uint_t order, uint_t channels) {
+lvec_t * aubio_filter_get_feedback ( aubio_filter_t *f ) {
+  return f->a;
+}
+
+lvec_t * aubio_filter_get_feedforward ( aubio_filter_t *f ) {
+  return f->b;
+}
+
+uint_t aubio_filter_get_order ( aubio_filter_t *f ) {
+  return f->order;
+}
+
+uint_t aubio_filter_get_samplerate ( aubio_filter_t *f ) {
+  return f->samplerate;
+}
+
+aubio_filter_t * new_aubio_filter(uint_t samplerate, 
+    uint_t order, uint_t channels) {
   aubio_filter_t * f = AUBIO_NEW(aubio_filter_t);
   f->x = new_lvec(order, channels);
@@ -109 +134 @@
   f->a = new_lvec(order, 1);
   f->b = new_lvec(order, 1);
+  f->samplerate = samplerate; 
+  f->order = order;
+  /* set default to identity */
   f->a->data[0][1] = 1.;
-  f->order = order;
   return f;
 }
 
 void del_aubio_filter(aubio_filter_t * f) {
-  AUBIO_FREE(f->a);
-  AUBIO_FREE(f->b);
-  AUBIO_FREE(f->x);
-  AUBIO_FREE(f->y);
+  del_lvec(f->a);
+  del_lvec(f->b);
+  del_lvec(f->x);
+  del_lvec(f->y);
   AUBIO_FREE(f);
   return;