Changeset 4122:e1c8cefe15f6 in roaraudio

Timestamp:

08/08/10 17:32:14 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

updated converters so work better in most cases

File:

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

libroardsp/convert.c

@@ -354 +354 @@
  ROAR_DBG("roar_conv_chans_2to116(out=%p, in=%p, samples=%i) = ?", out, in, samples);
 
- samples -= 2;
-
- for (h = (i = samples) / 2; i >= 0; i -= 2, h--) {
+ for (h = i = 0; i < samples; i += 2, h++) {
   ROAR_DBG("roar_conv_chans_2to116(out=%p, in=%p, samples=%i): op[%i] = (ip[%i] + ip[%i])/2", out, in, samples, h, i, i+1);
   op[h] = ((int)ip[i + 0] + (int)ip[i + 1]) / 2;
@@ -1094 +1092 @@
   outsamples = bufsize/(cinfo.bits/8);
 
+  ROAR_DBG("roar_conv2(*): outsamples=%llu", (long long unsigned int)outsamples);
+
+  if ( cinfo.channels != to->channels ) {
+   outsamples *= cinfo.channels;
+   outsamples /= to->channels;
+  }
+
+  if ( cinfo.bits != to->bits ) {
+   outsamples *= cinfo.bits;
+   outsamples /= to->bits;
+  }
+
+  ROAR_DBG("roar_conv2(*): outsamples=%llu", (long long unsigned int)outsamples);
+
   if ( roar_conv_rate2(out, cin, samples, outsamples, cinfo.bits, cinfo.channels) == -1 )
    return -1;
@@ -1140 +1152 @@
   cin = out;
  }
+
+ ROAR_DBG("roar_conv2(*): samples=%llu", (long long unsigned int)samples);
 
  ROAR_DBG("roar_conv2(*) = 0");