Changeset 2145:ad5260b8af44 in roaraudio

Timestamp:

07/24/09 14:48:19 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

updated structs and prototypes, implemented a first 16 bit version

Files:

• include/libroardsp/remove.h (modified) (1 diff)
• libroardsp/remove.c (modified) (1 diff)

include/libroardsp/remove.h

@@ -40 +40 @@
 struct roar_remove_state {
  uint16_t a, b;
- int32_t  old;
+ uint16_t  old;
 };
 
 int roar_remove_init (struct roar_remove_state * state);
-int roar_remove      (void * inout, void * subs, int samples, int bits, struct roar_remove_state * state);
+int roar_remove      (void    * inout, void    * subs, int samples, int bits, struct roar_remove_state * state);
+int roar_remove_8    (int8_t  * inout, int8_t  * subs, int samples, struct roar_remove_state * state);
+int roar_remove_16   (int8_t  * inout, int8_t  * subs, int samples, struct roar_remove_state * state);
+int roar_remove_32   (int8_t  * inout, int8_t  * subs, int samples, struct roar_remove_state * state);
 
 #endif

libroardsp/remove.c

@@ -25 +25 @@
 #include "libroardsp.h"
 
+int roar_remove_init (struct roar_remove_state * state) {
+ if ( state == NULL )
+  return -1;
+
+ memset(state, 0, sizeof(struct roar_remove_state));
+
+ state->old = 65535;
+
+ return 0;
+}
+
+int roar_remove      (void * inout, void * subs, int samples, int bits, struct roar_remove_state * state) {
+ if ( inout == NULL || subs == NULL || samples < 0 )
+  return -1;
+
+ switch (bits) {
+  case 8:  return roar_remove_8 (inout, subs, samples, state); break;
+  case 16: return roar_remove_16(inout, subs, samples, state); break;
+  case 32: return roar_remove_32(inout, subs, samples, state); break;
+ }
+
+ return -1;
+}
+
+int roar_remove_8    (int8_t  * inout, int8_t  * subs, int samples, struct roar_remove_state * state) {
+ return -1;
+}
+int roar_remove_16   (int8_t  * inout, int8_t  * subs, int samples, struct roar_remove_state * state) {
+ int i;
+ register int32_t s;
+ register int32_t peak;
+
+ if ( state == NULL ) {
+  for (i = 0; i < samples; i++) {
+   s  = inout[i];
+   s -= subs[i];
+   inout[i] = s;
+  }
+ } else {
+  peak = 65535;
+  for (i = 0; i < samples; i++) {
+   s  = inout[i];
+   s -= subs[i];
+   s  = s < 0 ? -s : s; // we true 32 bit, not int operation here
+   if ( s > peak )
+    peak = s;
+  }
+
+  for (i = 0; i < samples; i++) {
+   s  = -subs[i];
+   s *=  65535;
+   s /=  peak;
+   s +=  inout[i];
+   inout[i] = s;
+  }
+ }
+
+ return 0;
+}
+int roar_remove_32   (int8_t  * inout, int8_t  * subs, int samples, struct roar_remove_state * state) {
+ return -1;
+}
 
 //ll