Changeset 2501:b7965573ae61 in roaraudio

Timestamp:

08/24/09 14:52:12 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

start of roar_conv_bits_24to32()

Files:

• include/libroardsp/convert.h (modified) (1 diff)
• libroardsp/convert.c (modified) (2 diffs)

include/libroardsp/convert.h

@@ -49 +49 @@
 int roar_conv_bits_24to8  (void * out, void * in, int samples);
 int roar_conv_bits_24to16 (void * out, void * in, int samples);
-int roar_conv_bits_24to32 (void * out, void * in, int samples);
+int roar_conv_bits_24to32 (void * out, void * in, int samples);  // yes
 int roar_conv_bits_32to8  (void * out, void * in, int samples);  // yes
 int roar_conv_bits_32to16 (void * out, void * in, int samples);  // yes

libroardsp/convert.c

@@ -54 +54 @@
   case 0x21: return roar_conv_bits_16to8( out, in, samples);
   case 0x24: return roar_conv_bits_16to32(out, in, samples);
+  case 0x34: return roar_conv_bits_24to32(out, in, samples);
   case 0x41: return roar_conv_bits_32to8( out, in, samples);
   case 0x42: return roar_conv_bits_32to16(out, in, samples);
@@ -107 +108 @@
   op[i] = (int32_t) ip[i] << 16;
 
+ return 0;
+}
+
+int roar_conv_bits_24to32 (void * out, void * in, int samples) {
+ uint8_t * ip = (uint8_t*)in;
+ int32_t * op = (int32_t*)out;
+ int i;
+ union {
+  int32_t i;
+  uint8_t c[4];
+ } t;
+
+ ROAR_DBG("roar_conv_bits_24to32(out=%p, in=%p, samples=%i) = ?", out, in, samples);
+
+#if (BYTE_ORDER == BIG_ENDIAN) || (BYTE_ORDER == LITTLE_ENDIAN)
+ t.i = 0;
+#else
+  ROAR_DBG("roar_conv_bits_24to32(out=%p, in=%p, samples=%i) = -1", out, in, samples);
+  return -1;
+#endif
+
+ samples--;
+ ip += 3 * samples;
+
+ for (i = samples; i >= 0; i--) {
+#if BYTE_ORDER == BIG_ENDIAN
+  t.c[0] = *(ip--);
+  t.c[1] = *(ip--);
+  t.c[2] = *(ip--);
+#elif BYTE_ORDER == LITTLE_ENDIAN
+  t.c[2] = *(ip--);
+  t.c[3] = *(ip--);
+  t.c[1] = *(ip--);
+#endif
+  ROAR_DBG("roar_conv_bits_24to32(*): i=%i, t.i=0x%.8X", i, t.i);
+  op[i] = t.i;
+ }
+
+ ROAR_DBG("roar_conv_bits_24to32(out=%p, in=%p, samples=%i) = 0", out, in, samples);
  return 0;
 }