Changeset 5181:ca57e34b2a35 in roaraudio for libroardsp/filter_lowp.c

Timestamp:

10/22/11 16:17:35 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

updated filters to support 8 and 32 bit as well as 16 bit

File:

• libroardsp/filter_lowp.c (modified) (3 diffs)

libroardsp/filter_lowp.c

@@ -30 +30 @@
 int roardsp_lowp_init  (struct roardsp_filter * filter, struct roar_stream * stream, int id) {
  struct roardsp_lowp * self = roar_mm_malloc(sizeof(struct roardsp_lowp));
- float freq = filter->rate/2.45;
 
  ROAR_DBG("roardsp_lowp_init(*): self=%p", self);
@@ -41 +40 @@
  filter->inst = (void*) self;
 
- roardsp_lowp_ctl(filter, ROARDSP_FCTL_FREQ, &freq);
-
- return 0;
+ return roardsp_filter_reset(filter, ROARDSP_RESET_FULL);
 }
 
 int roardsp_lowp_uninit(struct roardsp_filter * filter) {
-
  roar_mm_free(filter->inst);
  return 0;
 }
 
-int roardsp_lowp_calc16  (struct roardsp_filter * filter, void * data, size_t samples) {
- struct roardsp_lowp * self = (struct roardsp_lowp *) filter->inst;
- int16_t * samp = (int16_t *) data;
- register int32_t s;
- int i, c;
- int channels = filter->channels;
+#define _calcX(bits,twobits) \
+int roardsp_lowp_calc##bits  (struct roardsp_filter * filter, void * data, size_t samples) { \
+ struct roardsp_lowp * self = (struct roardsp_lowp *) filter->inst; \
+ int##bits##_t * samp = (int##bits##_t *) data; \
+ register int##twobits##_t s; \
+ int i, c; \
+ int channels = filter->channels; \
+\
+ if ( channels > ROAR_MAX_CHANNELS ) \
+  return -1; \
+\
+ samples /= channels; \
+\
+ ROAR_DBG("roardsp_lowp_calc16(*): filtering %i frames of %i channels...", samples, channels); \
+\
+/*  *      output[N] = input[N] * A + output[N-1] * B */ \
+\
+ for (i = 0; i < samples; i++) { \
+  for (c = 0; c < channels; c++) { \
+   s = (int##twobits##_t)samp[i*channels + c] * self->a + (int##twobits##_t)self->old[c] * self->b; \
+\
+   s /= 65536; \
+\
+   samp[i*channels + c] = s; \
+   self->old[        c] = s; \
+  } \
+ } \
+\
+ return 0; \
+}
 
- if ( channels > ROAR_MAX_CHANNELS )
-  return -1;
-
- samples /= channels;
-
- ROAR_DBG("roardsp_lowp_calc16(*): filtering %i frames of %i channels...", samples, channels);
-
-//  *      output[N] = input[N] * A + output[N-1] * B
-
- for (i = 0; i < samples; i++) {
-  for (c = 0; c < channels; c++) {
-   s = samp[i*channels + c] * self->a + self->old[c] * self->b;
-
-   s /= 65536;
-
-   samp[i*channels + c] = s;
-   self->old[        c] = s;
-  }
- }
-
- return 0;
-}
+_calcX(8,32) /* we need 32 bit not 16 bit here as we multiplay with 65536 internally */
+_calcX(16,32)
+_calcX(32,64)
 
 int roardsp_lowp_ctl   (struct roardsp_filter * filter, int cmd, void * data) {
@@ -88 +89 @@
  float newfreq;
 
- if ( cmd != ROARDSP_FCTL_FREQ )
+ if ( cmd != ROARDSP_FCTL_FREQ ) {
+  roar_err_set(ROAR_ERROR_BADRQC);
   return -1;
+ }
 
  newfreq = *(float*)data;
 
- lp = exp(-2 * M_PI * newfreq / filter->rate) * 65536;
+ lp = exp(-2. * M_PI * newfreq / filter->rate) * 65536.;
 
  self->b = lp;
- self->a = 65536 - lp;
+ self->a = 65536. - lp;
 
- oldfreq = self->freq / 1000;
- self->freq = newfreq * 1000;
+ oldfreq = self->freq / 1000.;
+ self->freq = newfreq * 1000.;
 
  *(float*)data = oldfreq;