Changeset 850:b498ce53df3a in roaraudio for libroardsp/convert.c

Timestamp:

09/28/08 12:45:25 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added new more optimized roar_conv_chans_*() funcs

File:

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

libroardsp/convert.c

@@ -132 +132 @@
 
 int roar_conv_chans (void * out, void * in, int samples, int from, int to, int bits) {
- if ( from == 1 ) {
-  if ( bits == 8 ) {
-   return roar_conv_chans_1ton8(out, in, samples, to);
-  } else if ( bits == 16 ) {
-   return roar_conv_chans_1ton16(out, in, samples, to);
-  } else {
-   return -1;
-  }
- } else if ( to == 1 ) {
-  if ( bits == 8 ) {
-   return roar_conv_chans_nto18(out, in, samples, from);
-  } else if ( bits == 16 ) {
-   return roar_conv_chans_nto116(out, in, samples, from);
-  } else {
-   return -1;
-  }
+ if ( from == to ) {
+  if ( in == out )
+   return 0;
+
+  memcpy(out, in, samples * from * bits / 8);
+  return 0;
+ }
+
+ switch (bits) {
+  case 8:
+   switch (from) {
+    case 1:
+     switch (to) {
+      case  2: return roar_conv_chans_1to28(out, in, samples);
+      default: return roar_conv_chans_1ton8(out, in, samples, to);
+     }
+     break;
+    case 2:
+     switch (to) {
+      case  1: return roar_conv_chans_2to18(out, in, samples);
+      default: return -1;
+     }
+     break;
+    default:
+     switch (to) {
+      case  1: return roar_conv_chans_nto18(out, in, samples, from);
+      default: return -1;
+     }
+   }
+  break;
+  case 16:
+   switch (from) {
+    case 1:
+     switch (to) {
+      case  2: return roar_conv_chans_1to216(out, in, samples);
+      default: return roar_conv_chans_1ton16(out, in, samples, to);
+     }
+     break;
+    case 2:
+     switch (to) {
+      case  1: return roar_conv_chans_2to116(out, in, samples);
+      default: return -1;
+     }
+     break;
+    default:
+     switch (to) {
+      case  1: return roar_conv_chans_nto116(out, in, samples, from);
+      default: return -1;
+     }
+   }
+  break;
+  default: return -1;
  }
 
@@ -165 +201 @@
 }
 
+int roar_conv_chans_1to28  (void * out, void * in, int samples) {
+ char * ip = (char*) in, * op = (char*) out;
+ int i;
+
+ samples = (samples - 1) * 2;
+
+ for (i = samples; i >= 0; i -= 2) {
+  op[i + 0] = ip[i];
+  op[i + 1] = ip[i];
+ }
+
+ return 0;
+}
+
 int roar_conv_chans_1ton16 (void * out, void * in, int samples, int to) {
  int16_t * ip = (int16_t*) in, * op = (int16_t*) out;
@@ -177 +227 @@
 }
 
+int roar_conv_chans_1to216 (void * out, void * in, int samples) {
+ int16_t * ip = (int16_t*) in, * op = (int16_t*) out;
+ int i;
+
+ samples = (samples - 1) * 2;
+
+ for (i = samples; i >= 0; i -= 2) {
+  op[i + 0] = ip[i];
+  op[i + 1] = ip[i];
+ }
+
+ return 0;
+}
+
 int roar_conv_chans_nto18  (void * out, void * in, int samples, int from) {
  int8_t * ip = (int8_t*) in, * op = (int8_t*) out;
@@ -198 +262 @@
 }
 
+int roar_conv_chans_2to18  (void * out, void * in, int samples) {
+ int8_t * ip = (int8_t*) in, * op = (int8_t*) out;
+ int i;
+
+ samples -= 2;
+
+ for (i = samples; i >= 0; i -= 2)
+  op[i] = ((int)ip[i + 0] + (int)ip[i + 1]) / 2;
+
+ 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;
@@ -215 +291 @@
   op[i] = s;
  }
+
+ return 0;
+}
+
+int roar_conv_chans_2to116  (void * out, void * in, int samples) {
+ int16_t * ip = (int16_t*) in, * op = (int16_t*) out;
+ int i;
+
+ samples -= 2;
+
+ for (i = samples; i >= 0; i -= 2)
+  op[i] = ((int)ip[i + 0] + (int)ip[i + 1]) / 2;
 
  return 0;