Changeset 979:2d5a48c15b5f in roaraudio

Timestamp:

12/17/08 21:10:55 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added new filter: Add, Quantifier, Clip

Files:

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

include/libroardsp/libroardsp.h

@@ -39 +39 @@
 #define ROARDSP_FILTER_LOWP           2
 #define ROARDSP_FILTER_HIGHP          3
+#define ROARDSP_FILTER_MODULATE       4
+#define ROARDSP_FILTER_QUANTIFY       5
+#define ROARDSP_FILTER_CLIP           6
+#define ROARDSP_FILTER_ADD            7
 
 // filter CTLs:
@@ -46 +50 @@
 #define ROARDSP_FCTL_MUL              3
 #define ROARDSP_FCTL_DIV              4
+#define ROARDSP_FCTL_N                5
+#define ROARDSP_FCTL_LIMIT            6
+#define ROARDSP_FCTL_PHASE            7
 
 // types:
@@ -114 +121 @@
 int roardsp_amp_ctl   (struct roardsp_filter * filter, int cmd, void * data);
 
+int roardsp_add_init  (struct roardsp_filter * filter, struct roar_stream * stream, int id);
+int roardsp_add_calc16(struct roardsp_filter * filter, void * data, size_t samples);
+
+int roardsp_quantify_init  (struct roardsp_filter * filter, struct roar_stream * stream, int id);
+int roardsp_quantify_uninit(struct roardsp_filter * filter);
+int roardsp_quantify_calc16(struct roardsp_filter * filter, void * data, size_t samples);
+int roardsp_quantify_ctl   (struct roardsp_filter * filter, int cmd, void * data);
+
+int roardsp_clip_init  (struct roardsp_filter * filter, struct roar_stream * stream, int id);
+int roardsp_clip_calc16(struct roardsp_filter * filter, void * data, size_t samples);
+int roardsp_clip_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 mulaw.o
 OLDROAR=midi.o
-FILTER=lowp.o highp.o amp.o
+FILTER=lowp.o highp.o amp.o quantify.o add.o clip.o
 
 #DEFINES        = -DDEBUG

libroardsp/filter.c

@@ -35 +35 @@
  {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_ADD, "Add", roardsp_add_init, roardsp_amp_uninit, roardsp_amp_ctl, {
+           {NULL, NULL, NULL},{NULL, NULL, NULL},{roardsp_add_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}}},
  {ROARDSP_FILTER_HIGHP, "Highpass", roardsp_highp_init, roardsp_highp_uninit, roardsp_highp_ctl, {
            {NULL, NULL, NULL},{NULL, NULL, NULL},{roardsp_highp_calc16, NULL, NULL},{NULL, NULL, NULL},{NULL, NULL, NULL}}},
+ {ROARDSP_FILTER_QUANTIFY, "Quantifier", roardsp_quantify_init, NULL, roardsp_quantify_ctl, {
+           {NULL, NULL, NULL},{NULL, NULL, NULL},{roardsp_quantify_calc16, NULL, NULL},{NULL, NULL, NULL},{NULL, NULL, NULL}}},
+ {ROARDSP_FILTER_CLIP, "Clip", roardsp_clip_init, NULL, roardsp_clip_ctl, {
+           {NULL, NULL, NULL},{NULL, NULL, NULL},{roardsp_clip_calc16, NULL, NULL},{NULL, NULL, NULL},{NULL, NULL, NULL}}},
  {-1, NULL, NULL, NULL, NULL, {
       // ?                  8Bit               16Bit              24Bit              32Bit