Changeset 852:de662ac08ef4 in roaraudio for libroardsp/convert.c

Timestamp:

09/28/08 14:59:37 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

got roar_conv_chans_AtoB*() with a or B = 2 working, realigned some spaces, convert codec bevore channels

File:

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

libroardsp/convert.c

@@ -203 +203 @@
 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];
+ int i, h;
+
+ samples--;
+
+ for (i = (h = samples) * 2; i >= 0; i -= 2, h--) {
+  op[i + 0] = ip[h];
+  op[i + 1] = ip[h];
  }
 
@@ -229 +229 @@
 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];
+ int i, h;
+
+ samples--;
+
+ for (i = (h = samples) * 2; i >= 0; i -= 2, h--) {
+  op[i + 0] = ip[h];
+  op[i + 1] = ip[h];
  }
 
@@ -264 +264 @@
 int roar_conv_chans_2to18  (void * out, void * in, int samples) {
  int8_t * ip = (int8_t*) in, * op = (int8_t*) out;
- int i;
+ int i, h;
 
  samples -= 2;
 
- for (i = samples; i >= 0; i -= 2)
-  op[i] = ((int)ip[i + 0] + (int)ip[i + 1]) / 2;
+ for (h = (i = samples) / 2; i >= 0; i -= 2, h--)
+  op[h] = ((int)ip[i + 0] + (int)ip[i + 1]) / 2;
 
  return 0;
@@ -297 +297 @@
 int roar_conv_chans_2to116  (void * out, void * in, int samples) {
  int16_t * ip = (int16_t*) in, * op = (int16_t*) out;
- int i;
+ int i, h;
 
  samples -= 2;
 
- for (i = samples; i >= 0; i -= 2)
-  op[i] = ((int)ip[i + 0] + (int)ip[i + 1]) / 2;
+ for (h = (i = samples) / 2; i >= 0; i -= 2, h--)
+  op[h] = ((int)ip[i + 0] + (int)ip[i + 1]) / 2;
 
  return 0;
@@ -341 +341 @@
   if ( ins && !outs ) {
    switch (bits) {
-    case  8: roar_conv_codec_s2u8( out, in, samples);  break;
+    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;
@@ -350 +350 @@
   } else if ( !ins && outs ) {
    switch (bits) {
-    case  8: roar_conv_codec_u2s8( out, in, samples);  break;
+    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;
@@ -445 +445 @@
  }
 
+ if ( from->codec != to->codec ) {
+  if ( raor_conv_codec (out, ip, samples, from->codec, to->codec, to->bits) == -1 )
+   return -1;
+  else
+   ip = out;
+ }
+
  if ( from->rate != to->rate ) {
   if ( roar_conv_rate(out, ip, samples, from->rate, to->rate, to->bits, from->channels) == -1 )
@@ -454 +461 @@
  if ( from->channels != to->channels ) {
   if ( roar_conv_chans(out, ip, samples, from->channels, to->channels, to->bits) == -1 )
-   return -1;
-  else
-   ip = out;
- }
-
- if ( from->codec != to->codec ) {
-  if ( raor_conv_codec (out, ip, samples, from->codec, to->codec, to->bits) == -1 )
    return -1;
   else