Changeset 3010:f853cab15d30 in roaraudio

Timestamp:

10/28/09 15:33:12 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

started with AGC filter

Files:

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

include/libroardsp/libroardsp.h

@@ -181 +181 @@
 struct roardsp_agc {
  struct roardsp_filter * amp;
+ uint32_t target_amp;
 };
 
@@ -196 +197 @@
 char * roardsp_filter_id2str(int id);
 int    roardsp_filter_new   (struct roardsp_filter ** filter, struct roar_stream * stream, int id);
-#define roardsp_filter_free(x) roar_dsp_filter_uninit((x))
+#define roardsp_filter_free(x) roardsp_filter_uninit((x))
 int    roardsp_filter_init  (struct roardsp_filter *  filter, struct roar_stream * stream, int id);
 int    roardsp_filter_uninit(struct roardsp_filter *  filter);
@@ -263 +264 @@
 int roardsp_swap_reset  (struct roardsp_filter * filter, int what);
 
+int roardsp_agc_init   (struct roardsp_filter * filter, struct roar_stream * stream, int id);
+int roardsp_agc_uninit (struct roardsp_filter * filter);
+int roardsp_agc_ctl    (struct roardsp_filter * filter, int cmd, void * data);
+int roardsp_agc_reset  (struct roardsp_filter * filter, int what);
+
 #ifdef _SPEEX_TYPES_H
 int roardsp_speex_prep_init   (struct roardsp_filter * filter, struct roar_stream * stream, int id);

libroardsp/Makefile

@@ -7 +7 @@
 OBJS=libroardsp.o convert.o midside.o poly.o filter.o filterchain.o remove.o transcode.o vio_transcode.o rms.o fader.o mixer.o amp.o
 OLDROAR=midi.o
-FILTER=filter_lowp.o filter_highp.o filter_amp.o filter_quantify.o filter_add.o filter_clip.o filter_downmix.o filter_dcblock.o filter_swap.o filter_speex_prep.o
+FILTER=filter_lowp.o filter_highp.o filter_amp.o filter_quantify.o filter_add.o filter_clip.o filter_downmix.o filter_dcblock.o filter_swap.o filter_agc.o filter_speex_prep.o
 MIDI=synth.o
 CODECS=alaw.o mulaw.o

libroardsp/filter.c

@@ -54 +54 @@
  {ROARDSP_FILTER_SWAP, "Swap", roardsp_swap_init, roardsp_swap_uninit, roardsp_swap_ctl, roardsp_swap_reset, {
            {NULL, NULL, NULL},{NULL, NULL, NULL},{NULL, NULL, roardsp_swap_calc162},{NULL, NULL, NULL},{NULL, NULL, NULL}}},
+ {ROARDSP_FILTER_AGC, "AGC", roardsp_agc_init, roardsp_agc_uninit, roardsp_agc_ctl, roardsp_agc_reset, {
+           {NULL, NULL, NULL},{NULL, NULL, NULL},{NULL, NULL, NULL},{NULL, NULL, NULL},{NULL, NULL, NULL}}},
  {ROARDSP_FILTER_SPEEX_PREP, "SpeexPrep", roardsp_speex_prep_init, roardsp_speex_prep_uninit,
                                           roardsp_speex_prep_ctl,  roardsp_speex_prep_reset, {