Changeset 1004:15b43935d30b in roaraudio

Timestamp:

12/19/08 15:58:46 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added new filter: downmix

Files:

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

include/libroardsp/libroardsp.h

@@ -43 +43 @@
 #define ROARDSP_FILTER_CLIP           6
 #define ROARDSP_FILTER_ADD            7
+#define ROARDSP_FILTER_DOWNMIX        8
 
 // filter CTLs:
@@ -55 +56 @@
 #define ROARDSP_FCTL_Q                8
 #define ROARDSP_FCTL_MODE             9
+
+// filter specific constants:
+#define ROARDSP_DOWNMIX_LEFT          1
+#define ROARDSP_DOWNMIX_RIGHT         2
+#define ROARDSP_DOWNMIX_ARITHMETIC    3
+#define ROARDSP_DOWNMIX_RMS           4
 
 // types:
@@ -135 +142 @@
 int roardsp_clip_ctl   (struct roardsp_filter * filter, int cmd, void * data);
 
+int roardsp_downmix_init   (struct roardsp_filter * filter, struct roar_stream * stream, int id);
+int roardsp_downmix_calc162(struct roardsp_filter * filter, void * data, size_t samples);
+int roardsp_downmix_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 quantify.o add.o clip.o
+FILTER=lowp.o highp.o amp.o quantify.o add.o clip.o downmix.o
 
 #DEFINES        = -DDEBUG

libroardsp/filter.c

@@ -45 +45 @@
  {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}}},
+ {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}}},
  {-1, NULL, NULL, NULL, NULL, {
       // ?                  8Bit               16Bit              24Bit              32Bit