Changeset a7667ce for src

Timestamp:

Dec 1, 2007, 10:59:25 PM (17 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:

6913434

Parents:

2b6144dd

Message:

filter.c: add denormal, make multichannel using lvecs, update adsgn, cdsgn, pitchdetection

Location:

src

Files:

• pitch/pitchdetection.c (modified) (2 diffs)
• temporal/adesign.c (modified) (2 diffs)
• temporal/adesign.h (modified) (1 diff)
• temporal/cdesign.c (modified) (2 diffs)
• temporal/cdesign.h (modified) (1 diff)
• temporal/filter.c (modified) (2 diffs)
• temporal/filter.h (modified) (1 diff)
• temporal/filter_priv.h (modified) (1 diff)

src/pitch/pitchdetection.c

@@ -22 +22 @@
 #include "spectral/phasevoc.h"
 #include "mathutils.h"
-#include "temporal/filter.h"
+#include "temporal/cdesign.h"
 #include "pitch/pitchmcomb.h"
 #include "pitch/pitchyin.h"
@@ -103 +103 @@
       p->fftgrain = new_cvec(bufsize, channels);
       p->mcomb    = new_aubio_pitchmcomb(bufsize,hopsize,channels,samplerate);
-      p->filter   = new_aubio_cdsgn_filter(samplerate);
+      p->filter   = new_aubio_cdsgn_filter(samplerate, channels);
       p->callback = aubio_pitchdetection_mcomb;
       break;

src/temporal/adesign.c

@@ -26 +26 @@
 #include "temporal/adesign.h"
 
-aubio_filter_t * new_aubio_adsgn_filter(uint_t samplerate) {
-  aubio_filter_t * f = new_aubio_filter(samplerate, 7);
-  lsmp_t * a = f->a;
-  lsmp_t * b = f->b;
+aubio_filter_t * new_aubio_adsgn_filter(uint_t samplerate, uint_t channels) {
+  aubio_filter_t * f = new_aubio_filter(samplerate, 7, channels);
+  lsmp_t * a = f->a->data[0];
+  lsmp_t * b = f->b->data[0];
   /* uint_t l; */
   /* for now, 44100, adsgn */
@@ -52 +52 @@
   }
   */
-  f->a = a;
-  f->b = b;
+  f->a->data[0] = a;
+  f->b->data[0] = b;
   return f;
 }

src/temporal/adesign.h

@@ -23 +23 @@
 
 */
-aubio_filter_t * new_aubio_adsgn_filter(uint_t samplerate);
+aubio_filter_t * new_aubio_adsgn_filter(uint_t samplerate, uint_t channels);
 
 #define aubio_adsgn_filter_do aubio_filter_do

src/temporal/cdesign.c

@@ -26 +26 @@
 #include "temporal/adesign.h"
 
-aubio_filter_t * new_aubio_cdsgn_filter(uint_t samplerate) {
-  aubio_filter_t * f = new_aubio_filter(samplerate, 5);
-  lsmp_t * a = f->a;
-  lsmp_t * b = f->b;
+aubio_filter_t * new_aubio_cdsgn_filter(uint_t samplerate, uint_t channels) {
+  aubio_filter_t * f = new_aubio_filter(samplerate, 5, channels);
+  lsmp_t * a = f->a->data[0];
+  lsmp_t * b = f->b->data[0];
   /* uint_t l; */
   /* for now, 44100, cdsgn */
@@ -48 +48 @@
   }
   */
-  f->a = a;
-  f->b = b;
+  f->a->data[0] = a;
+  f->b->data[0] = b;
   return f;
 }

src/temporal/cdesign.h

@@ -25 +25 @@
 
 */
-aubio_filter_t * new_aubio_cdsgn_filter(uint_t samplerate);
+aubio_filter_t * new_aubio_cdsgn_filter(uint_t samplerate, uint_t channels);
 
 #define aubio_cdsgn_filter_do aubio_filter_do

src/temporal/filter.c

@@ -24 +24 @@
 #include "aubio_priv.h"
 #include "fvec.h"
+#include "lvec.h"
 #include "mathutils.h"
 #include "temporal/filter.h"
 #include "temporal/filter_priv.h"
 
-/* bug: mono only */
 void aubio_filter_do(aubio_filter_t * f, fvec_t * in) {
-  uint_t i,j,l, order = f->order;
-  lsmp_t *x = f->x;
-  lsmp_t *y = f->y;
-  lsmp_t *a = f->a;
-  lsmp_t *b = f->b;
-  i=0;//for (i=0;i<in->channels;i++) {
-  for (j = 0; j < in->length; j++) {
-    /* new input */
-    //AUBIO_DBG("befor %f\t", in->data[i][j]);
-    x[0] = in->data[i][j];
-    y[0] = b[0] * x[0];
-    for (l=1;l<order; l++) {
-      y[0] += b[l] * x[l];
-      y[0] -= a[l] * y[l];
-    } /* + 1e-37; for denormal ? */
-    /* new output */
-    in->data[i][j] = y[0];
-    //AUBIO_DBG("after %f\n", in->data[i][j]);
-    /* store states for next sample */
-    for (l=order-1; l>0; l--){
-      x[l] = x[l-1];
-      y[l] = y[l-1];
-    }
-  }
-  /* store states for next buffer */
-  f->x = x;
-  f->y = y;
-  //}   
+  aubio_filter_do_outplace(f, in, in);
 }
 
 void aubio_filter_do_outplace(aubio_filter_t * f, fvec_t * in, fvec_t * out) {
   uint_t i,j,l, order = f->order;
-  lsmp_t *x = f->x;
-  lsmp_t *y = f->y;
-  lsmp_t *a = f->a;
-  lsmp_t *b = f->b;
+  lsmp_t *x;
+  lsmp_t *y;
+  lsmp_t *a = f->a->data[0];
+  lsmp_t *b = f->b->data[0];
 
-  i=0; // works in mono only !!!
-  //for (i=0;i<in->channels;i++) {
-  for (j = 0; j < in->length; j++) {
-    /* new input */
-    x[0] = in->data[i][j];
-    y[0] = b[0] * x[0];
-    for (l=1;l<order; l++) {
-      y[0] += b[l] * x[l];
-      y[0] -= a[l] * y[l];
+  for (i = 0; i < in->channels; i++) {
+    x = f->x->data[i];
+    y = f->y->data[i];
+    for (j = 0; j < in->length; j++) {
+      /* new input */
+      if (ISDENORMAL(in->data[i][j])) {
+        x[0] = y[0] = 0.;
+      } else {
+        x[0] = in->data[i][j];
+        y[0] = b[0] * x[0];
+        for (l=1;l<order; l++) {
+          y[0] += b[l] * x[l];
+          y[0] -= a[l] * y[l];
+        }
+      }
+      /* new output */
+      out->data[i][j] = y[0];
+      /* store for next sample */
+      for (l=order-1; l>0; l--){
+        x[l] = x[l-1];
+        y[l] = y[l-1];
+      }
     }
-    // + 1e-37;
-    /* new output */
-    out->data[i][j] = y[0];
-    /* store for next sample */
-    for (l=order-1; l>0; l--){
-      x[l] = x[l-1];
-      y[l] = y[l-1];
-    }
+    /* store for next run */
+    f->x->data[i] = x;
+    f->y->data[i] = y;
   }
-  /* store for next run */
-  f->x = x;
-  f->y = y;
-  //}
 }
 
@@ -126 +103 @@
 }
 
-aubio_filter_t * new_aubio_filter(uint_t samplerate UNUSED, uint_t order) {
+aubio_filter_t * new_aubio_filter(uint_t samplerate UNUSED, uint_t order, uint_t channels) {
   aubio_filter_t * f = AUBIO_NEW(aubio_filter_t);
-  lsmp_t * x = f->x;
-  lsmp_t * y = f->y;
-  lsmp_t * a = f->a;
-  lsmp_t * b = f->b;
-  uint_t l;
+  f->x = new_lvec(order, channels);
+  f->y = new_lvec(order, channels);
+  f->a = new_lvec(order, 1);
+  f->b = new_lvec(order, 1);
+  f->a->data[0][1] = 1.;
   f->order = order;
-  a = AUBIO_ARRAY(lsmp_t,f->order);
-  b = AUBIO_ARRAY(lsmp_t,f->order);
-  x = AUBIO_ARRAY(lsmp_t,f->order);
-  y = AUBIO_ARRAY(lsmp_t,f->order);
-  /* initial states to zeros */
-  for (l=0; l<f->order; l++){
-    x[l] = 0.;
-    y[l] = 0.;
-  }
-  f->x = x;
-  f->y = y;
-  f->a = a;
-  f->b = b;
   return f;
 }

src/temporal/filter.h

@@ -69 +69 @@
   \param samplerate signal sampling rate
   \param order order of the filter (number of coefficients)
+  \param channels number of channels to allocate
 
 */
-aubio_filter_t * new_aubio_filter(uint_t samplerate, uint_t order);
+aubio_filter_t * new_aubio_filter(uint_t samplerate, uint_t order, uint_t channels);
 /** delete a filter object
  

src/temporal/filter_priv.h

@@ -18 +18 @@
 */
 
+#include "lvec.h"
 struct _aubio_filter_t {
   uint_t order;
-  lsmp_t * a;
-  lsmp_t * b;
-  lsmp_t * y;
-  lsmp_t * x;
+  lvec_t * a;
+  lvec_t * b;
+  lvec_t * y;
+  lvec_t * x;
 };