Changeset 882:d2125824428f in roaraudio

Timestamp:

11/19/08 21:18:27 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added filter AMP to libroardsp

Files:

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

include/libroardsp/libroardsp.h

@@ -77 +77 @@
 };
 
+struct roardsp_amp {
+ int32_t  mul;
+ int32_t  div;
+};
+
 // funcs:
 int    roardsp_filter_str2id(char * str);
@@ -103 +108 @@
 int roardsp_highp_ctl   (struct roardsp_filter * filter, int cmd, void * data);
 
+int roardsp_amp_init  (struct roardsp_filter * filter, struct roar_stream * stream, int id);
+int roardsp_amp_uninit(struct roardsp_filter * filter);
+int roardsp_amp_calc16(struct roardsp_filter * filter, void * data, size_t samples);
+int roardsp_amp_calc8 (struct roardsp_filter * filter, void * data, size_t samples);
+int roardsp_amp_ctl   (struct roardsp_filter * filter, int cmd, void * data);
+
 // 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
 OLDROAR=midi.o
-FILTER=lowp.o highp.o
+FILTER=lowp.o highp.o amp.o
 
 #DEFINES        = -DDEBUG

libroardsp/filter.c

@@ -33 +33 @@
  int (*calc  [5][3])(struct roardsp_filter * filter, void * data, size_t samples);
 } _roardsp_filterlist[] = {
- {ROARDSP_FILTER_AMP, "AMP", NULL, NULL, NULL, {
-           {NULL, NULL, NULL},{NULL, NULL, NULL},{NULL, NULL, NULL},{NULL, NULL, NULL},{NULL, NULL, NULL}}},
+ {ROARDSP_FILTER_AMP, "AMP", roardsp_amp_init, roardsp_amp_uninit, roardsp_amp_ctl, {
+           {NULL, NULL, NULL},{roardsp_amp_calc8, NULL, NULL},{roardsp_amp_calc16, NULL, NULL},{NULL, NULL, NULL},{NULL, NULL, NULL}}},
  {ROARDSP_FILTER_LOWP, "Lowpass", roardsp_lowp_init, roardsp_lowp_uninit, roardsp_lowp_ctl, {
            {NULL, NULL, NULL},{NULL, NULL, NULL},{roardsp_lowp_calc16, NULL, NULL},{NULL, NULL, NULL},{NULL, NULL, NULL}}},