Changeset 624:b07ec9408d64 in roaraudio

Timestamp:

08/20/08 13:00:12 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added support fro 16 bit downmixing

File:

• libroardsp/convert.c (modified) (3 diffs)

libroardsp/convert.c

@@ -36 +36 @@
  char    * op = (char   *)out;
  int i;
+
+ ROAR_DBG("roar_conv_bits_16to8(out=%p, in=%p, samples=%i) = ?", out, in, samples);
 
  for (i = 0; i < samples; i++)
@@ -53 +55 @@
    return -1;
   }
+ } else if ( to == 1 ) {
+  if ( bits == 8 ) {
+   return -1;
+  } else if ( bits == 16 ) {
+   return roar_conv_chans_nto116(out, in, samples, from);
+  } else {
+   return -1;
+  }
  }
 
@@ -78 +88 @@
   for (c = to - 1; c >= 0; c--)
    op[i*to + c] = ip[i];
+
+ return 0;
+}
+
+int roar_conv_chans_nto116 (void * out, void * in, int samples, int from) {
+ int16_t * ip = (int16_t*) in, * op = (int16_t*) out;
+ int i;
+ int c;
+ register int s;
+
+ samples /= from;
+
+ for (i = samples - 1; i >= 0; i--) {
+  s  = 0;
+
+  for (c = 0; c < from; c++)
+   s += ip[i*from + c];
+
+  s /= from;
+  op[i] = s;
+ }
 
  return 0;