Changeset 858:5ef1c551785f in roaraudio

Timestamp:

09/30/08 03:24:22 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added eddines converting for 16 bit

Files:

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

include/libroardsp/convert.h

@@ -79 +79 @@
 int roar_conv_codec_u2s32 (void * out, void * in, int samples);
 
-int roar_conv_endian_16   (void * out, void * in, int samples);
+                                                                // implemnted?
+int roar_conv_endian_16   (void * out, void * in, int samples); // yes
+int roar_conv_endian_24   (void * out, void * in, int samples);
+int roar_conv_endian_32   (void * out, void * in, int samples);
 
 int roar_conv       (void * out, void * in, int samples, struct roar_audio_info * from, struct roar_audio_info * to);

libroardsp/convert.c

@@ -334 +334 @@
  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);
-
- if ( inbo != outbo )
-  return -1;
+ void * nin = in;
+
+ if ( bits == 8 || bits == 16 ) {
+  if ( inbo  == ROAR_CODEC_PDP )
+   inbo  = ROAR_CODEC_LE;
+  if ( outbo == ROAR_CODEC_PDP )
+   outbo = ROAR_CODEC_LE;
+ }
+
+ if ( inbo != outbo ) {
+  if ( bits != 8 ) { // there is no need to talk about eddines on 8 bit data streams
+   if ( bits == 16 ) {
+    // in this case we can only have LE vs. BE, so, only need to swap:
+    roar_conv_endian_16(out, nin, samples);
+    nin = out;
+   } else {
+    return -1;
+   }
+  }
+ }
 
  if ( ins != outs ) {
   if ( ins && !outs ) {
    switch (bits) {
-    case  8: roar_conv_codec_s2u8( out, in, samples); break;
-    case 16: roar_conv_codec_s2u16(out, in, samples); break;
-    case 32: roar_conv_codec_s2u32(out, in, samples); break;
+    case  8: roar_conv_codec_s2u8( out, nin, samples); break;
+    case 16: roar_conv_codec_s2u16(out, nin, samples); break;
+    case 32: roar_conv_codec_s2u32(out, nin, samples); break;
     default:
      errno = ENOSYS;
@@ -350 +367 @@
   } else if ( !ins && outs ) {
    switch (bits) {
-    case  8: roar_conv_codec_u2s8( out, in, samples); break;
-    case 16: roar_conv_codec_u2s16(out, in, samples); break;
-    case 32: roar_conv_codec_u2s32(out, in, samples); break;
+    case  8: roar_conv_codec_u2s8( out, nin, samples); break;
+    case 16: roar_conv_codec_u2s16(out, nin, samples); break;
+    case 32: roar_conv_codec_u2s32(out, nin, samples); break;
     default:
      errno = ENOSYS;
@@ -440 +457 @@
 
  if ( out != in ) {
+//  printf("out != in\n");
   for(i = 0; i < samples; i += 2) {
+//   printf("op[%i] = ip[%i]\nop[%i] = ip[%i]\n", i, i+1, i+1, i);
    op[i  ] = ip[i+1];
    op[i+1] = ip[i  ];
   }
  } else {
+//  printf("out == in\n");
   for(i = 0; i < samples; i += 2) {
    c       = ip[i+1];