Changeset 1100:aac17d20aea1 in roaraudio

Timestamp:

01/02/09 23:18:26 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added DC block with f_e=~5Hz

Files:

• include/libroardsp/libroardsp.h (modified) (4 diffs)
• libroardsp/Makefile (modified) (1 diff)
• libroardsp/filter.c (modified) (1 diff)
• libroardsp/filter_dcblock.c (added)

include/libroardsp/libroardsp.h

@@ -44 +44 @@
 #define ROARDSP_FILTER_ADD            7
 #define ROARDSP_FILTER_DOWNMIX        8
+#define ROARDSP_FILTER_DCBLOCK        9
 
 // filter CTLs:
@@ -62 +63 @@
 #define ROARDSP_DOWNMIX_ARITHMETIC    3
 #define ROARDSP_DOWNMIX_RMS           4
+
+#define ROARDSP_DCBLOCK_NUMBLOCKS     100
 
 // types:
@@ -96 +99 @@
  int32_t  mul;
  int32_t  div;
+};
+
+struct roardsp_dcblock {
+ int cur;
+ int32_t dc[ROARDSP_DCBLOCK_NUMBLOCKS];
 };
 
@@ -146 +154 @@
 int roardsp_downmix_ctl    (struct roardsp_filter * filter, int cmd, void * data);
 
+int roardsp_dcblock_init   (struct roardsp_filter * filter, struct roar_stream * stream, int id);
+int roardsp_dcblock_uninit (struct roardsp_filter * filter);
+int roardsp_dcblock_calc16 (struct roardsp_filter * filter, void * data, size_t samples);
+
 // codecs:
 int roardsp_conv_alaw2pcm16 (int16_t * out, char * in, size_t len);

libroardsp/Makefile

@@ -4 +4 @@
 OBJS=libroardsp.o filter.o filterchain.o alaw.o mulaw.o
 OLDROAR=midi.o
-FILTER=lowp.o highp.o amp.o quantify.o add.o clip.o downmix.o
+FILTER=lowp.o highp.o amp.o quantify.o add.o clip.o downmix.o dcblock.o
 
 #DEFINES        = -DDEBUG

libroardsp/filter.c

@@ -47 +47 @@
  {ROARDSP_FILTER_DOWNMIX, "downmix", roardsp_downmix_init, NULL, roardsp_downmix_ctl, {
            {NULL, NULL, NULL},{NULL, NULL, NULL},{NULL, NULL, roardsp_downmix_calc162},{NULL, NULL, NULL},{NULL, NULL, NULL}}},
+ {ROARDSP_FILTER_DCBLOCK, "DCBlock", roardsp_dcblock_init, NULL, NULL, {
+           {NULL, NULL, NULL},{NULL, NULL, NULL},{roardsp_dcblock_calc16, NULL, NULL},{NULL, NULL, NULL},{NULL, NULL, NULL}}},
  {-1, NULL, NULL, NULL, NULL, {
       // ?                  8Bit               16Bit              24Bit              32Bit