Changeset 845:21845f9f414c in roaraudio

Timestamp:

09/28/08 03:01:57 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added roar_conv_bits_AtoB() with A,B element 8,16,32 :)

File:

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

libroardsp/convert.c

@@ -36 +36 @@
 
 int roar_conv_bits (void * out, void * in, int samples, int from, int to) {
+ int format;
+
  if ( from == to ) {
   if ( in == out )
@@ -44 +46 @@
  }
 
- if ( from ==  8 && to == 16 )
-  return roar_conv_bits_8to16(out, in, samples);
-
- if ( from == 16 && to ==  8 )
-  return roar_conv_bits_16to8(out, in, samples);
+ format = ((from / 8) << 4) + (to / 8);
+
+ switch (format) {
+  case 0x12: return roar_conv_bits_8to16(out, in, samples);
+  case 0x14: return roar_conv_bits_8to32(out, in, samples);
+  case 0x21: return roar_conv_bits_16to8(out, in, samples);
+  case 0x24: return roar_conv_bits_16to32(out, in, samples);
+  case 0x41: return roar_conv_bits_32to8(out, in, samples);
+  case 0x42: return roar_conv_bits_32to16(out, in, samples);
+  default:
+   errno = ENOSYS;
+   return -1;
+ }
 
  return -1;
@@ -64 +74 @@
 }
 
+int roar_conv_bits_8to32  (void * out, void * in, int samples) {
+ char    * ip = (char   *)in;
+ int32_t * op = (int32_t*)out;
+ int i;
+
+ for (i = samples - 1; i >= 0; i--)
+  op[i] = ip[i] << 24;
+
+ return 0;
+}
+
 int roar_conv_bits_16to8 (void * out, void * in, int samples) {
  int16_t * ip = (int16_t*)in;
@@ -77 +98 @@
 }
 
+int roar_conv_bits_16to32 (void * out, void * in, int samples) {
+ int16_t * ip = (int16_t*)in;
+ int32_t * op = (int32_t*)out;
+ int i;
+
+ for (i = samples - 1; i >= 0; i--)
+  op[i] = ip[i] << 16;
+
+ return 0;
+}
+
+int roar_conv_bits_32to8 (void * out, void * in, int samples) {
+ int32_t * ip = (int32_t*)in;
+ char    * op = (char   *)out;
+ int i;
+
+ for (i = 0; i < samples; i++)
+  op[i] = ip[i] >> 24;
+
+ return 0;
+}
+
+int roar_conv_bits_32to16 (void * out, void * in, int samples) {
+ int32_t * ip = (int32_t*)in;
+ int16_t * op = (int16_t*)out;
+ int i;
+
+ for (i = 0; i < samples; i++)
+  op[i] = ip[i] >> 16;
+
+ return 0;
+}
 
 int roar_conv_chans (void * out, void * in, int samples, int from, int to, int bits) {