Changeset 876:b8c42b09b8f7 in roaraudio

Timestamp:

10/21/08 22:59:07 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

renamed raor_conv_codec() to roar_conv_codec(), got bo conv working on non 16 bit audio :))

Files:

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

include/libroardsp/convert.h

@@ -70 +70 @@
 int roar_conv_rate_16 (void * out, void * in, int samples, int from, int to, int channels);
 
-int raor_conv_codec (void * out, void * in, int samples, int from, int to, int bits);
+int roar_conv_codec (void * out, void * in, int samples, int from, int to, int bits);
 
 int roar_conv_signedness  (void * out, void * in, int samples, int from, int to, int bits);

libroardsp/convert.c

@@ -353 +353 @@
    }
   } else {
-   if ( out == in )
-    return 0;
-
-   memcpy(out, in, samples * bits / 8);
+   return -1;
+  }
+ } else {
+  if ( out == in )
    return 0;
-  }
- }
-
- return -1;
-}
-
-int raor_conv_codec (void * out, void * in, int samples, int from, int to, int bits) {
+
+  memcpy(out, in, samples * bits / 8);
+  return 0;
+ }
+
+ return 0;
+}
+
+int roar_conv_codec (void * out, void * in, int samples, int from, int to, int bits) {
  int inbo = ROAR_CODEC_BYTE_ORDER(from), outbo = ROAR_CODEC_BYTE_ORDER(to);
  int ins  = ROAR_CODEC_IS_SIGNED(from),  outs  = ROAR_CODEC_IS_SIGNED(to);
@@ -370 +372 @@
 
 
- ROAR_DBG("raor_conv_codec(out=%p, in=%p, samples=%i, from=%i(%s), to=%i(%s), bits=%i) = ?",
+ ROAR_DBG("roar_conv_codec(out=%p, in=%p, samples=%i, from=%i(%s), to=%i(%s), bits=%i) = ?",
               out, in, samples, from, roar_codec2str(from), to, roar_codec2str(to), bits);
 
@@ -458 +460 @@
  }
 
+ ROAR_DBG("roar_conv_endian(out=%p, in=%p, samples=%i, from=%i, to=%i, bits=%i) = ?", out, in, samples, from, to, bits);
+
  if ( from == to ) {
   if ( in != out ) {
    memcpy(out, in, samples * bits / 8);
-   return 0;
-  }
-
+  }
+  return 0;
+ } else {
   if ( bits == 16 ) {
    // in this case we can only have LE vs. BE, so, only need to swap:
+   ROAR_DBG("roar_conv_endian(*): Doing 16 bit byteswap");
    return roar_conv_endian_16(out, in, samples);
   } else if ( bits == 24 ) {
@@ -574 +579 @@
  //       for the moment: guess out >= in
 
+ ROAR_DBG("roar_conv(*): bo conv: %i->%i(native)", ROAR_CODEC_BYTE_ORDER(from->codec), ROAR_CODEC_NATIVE_ENDIAN);
+
  if ( ROAR_CODEC_BYTE_ORDER(from->codec) != ROAR_CODEC_NATIVE_ENDIAN ) {
-  if ( roar_conv_endian(out, ip, samples, ROAR_CODEC_BYTE_ORDER(from->codec), ROAR_CODEC_NATIVE_ENDIAN, to->bits) == -1 )
+  ROAR_DBG("roar_conv(*): doing bo input conv");
+  if ( roar_conv_endian(out, ip, samples, ROAR_CODEC_BYTE_ORDER(from->codec), ROAR_CODEC_NATIVE_ENDIAN, from->bits) == -1 )
    return -1;
   else
@@ -597 +605 @@
 /*
  if ( from->codec != to->codec ) {
-  if ( raor_conv_codec (out, ip, samples, from->codec, to->codec, to->bits) == -1 )
+  if ( roar_conv_codec (out, ip, samples, from->codec, to->codec, to->bits) == -1 )
    return -1;
   else