Changeset 5181:ca57e34b2a35 in roaraudio for libroardsp/filter_quantify.c

Timestamp:

10/22/11 16:17:35 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

updated filters to support 8 and 32 bit as well as 16 bit

File:

• libroardsp/filter_quantify.c (modified) (1 diff)

libroardsp/filter_quantify.c

@@ -33 +33 @@
 }
 
-int roardsp_quantify_calc16  (struct roardsp_filter * filter, void * data, size_t samples) {
- int16_t * samp = (int16_t *) data;
- register float s;
- size_t i;
+static inline int16_t _calc(int16_t val, void * inst) {
+ register float s = val;
+ s       /= 32768;
+ s       *= (ROAR_INSTINT)inst;
+ s        = (int16_t)s;
+ s       /= (ROAR_INSTINT)inst;
+ s       *= 32768;
+ return s;
+}
 
- for (i = 0; i < samples; i++) {
-  s        = samp[i];
-  s       /= 32768;
-  s       *= (ROAR_INSTINT)filter->inst;
-  s        = (int16_t)s;
-//  ROAR_WARN("roardsp_quantify_calc16(*): s=%f", s);
-  s       /= (ROAR_INSTINT)filter->inst;
-  s       *= 32768;
-  samp[i]  = s;
- };
+#define _calcX(bits,rshift,lshift) \
+/* this code is buggy for 8 bit filters */ \
+int roardsp_quantify_calc##bits  (struct roardsp_filter * filter, void * data, size_t samples) { \
+ int##bits##_t * samp = (int##bits##_t *) data; \
+ size_t i; \
+\
+ for (i = 0; i < samples; i++) { \
+  samp[i]  = _calc(samp[i] rshift, filter->inst) lshift; \
+ } \
+\
+ ROAR_DBG("roardsp_quantify_calc%i(*) = 0", bits); \
+ return 0; \
+}
 
- ROAR_DBG("roardsp_quantify_calc16(*) = 0");
- return 0;
-}
+/* look at our nice parameters ;) */
+_calcX(8,<< 8,>> 8)
+_calcX(16,,)
+_calcX(32,>> 16,<< 16)
 
 int roardsp_quantify_ctl   (struct roardsp_filter * filter, int cmd, void * data) {