Changeset 1064:cc490b4af5df in roaraudio

Timestamp:

12/25/08 17:06:29 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

ha, seems that I got downsampling code working, ha, zoh even for 2 channel

File:

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

libroardsp/convert.c

@@ -34 +34 @@
 
 #include "libroar.h"
+//#define free(p) {ROAR_WARN("free(%p) = ?", (p)); free((p)); ROAR_WARN("free(%p): OK", (p));}
 
 int roar_conv_bits (void * out, void * in, int samples, int from, int to) {
@@ -299 +300 @@
  int i, h;
 
+ 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 = samples) / 2; i >= 0; 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;
+ }
 
  return 0;
@@ -327 +332 @@
      return roar_conv_rate_161zoh(out, in, samples, from, to);
    case 2:
+     return roar_conv_rate_162zoh(out, in, samples, from, to);
    default:
      return -1;
@@ -350 +356 @@
  for (i= 0; i < samples; i++) {
   op[(int)t] = ip[i];
+  t += step;
+ }
+
+ return 0;
+}
+
+int roar_conv_rate_162zoh(void * out, void * in, int samples, int from, int to) {
+ int16_t * ip = in;
+ int16_t * op = out;
+ float t = 0;
+ float step = (float)to/from;
+ int i;
+
+ ROAR_DBG("roar_conv_rate_162zoh(*): samples=%i", samples);
+ samples /= 2;
+ samples -= 1;
+ ROAR_DBG("roar_conv_rate_162zoh(*): samples=%i", samples);
+
+ for (i= 0; i < samples; i++) {
+  ROAR_DBG("roar_conv_rate_162zoh(*): t=%f, i=%i // op[%i] = ip[%i]", t, i, 2*(int)t, 2*i);
+  op[2*(int)t    ] = ip[2*i    ];
+  op[2*(int)t + 1] = ip[2*i + 1];
   t += step;
  }
@@ -607 +635 @@
 
  from_size = (from->bits * samples) / 8;
- to_size   = (  to->bits * samples) / 8;
+ to_size   = (  to->bits * samples * to->rate * to->channels) / (8 * from->rate * from->channels);
+
+ ROAR_DBG("roar_conv(*): size: %i->%i", from_size, to_size);
 
  if ( to_size < from_size ) {
@@ -663 +693 @@
   if ( roar_conv_rate(out, ip, samples, from->rate, to->rate, to->bits, from->channels) == -1 ) {
    ROAR_DBG("roar_conv(*): failed to convert rate %i->%i (%ich%ibits)", from->rate, to->rate, to->bits, from->channels);
+   if ( to_size < from_size )
+    free(out);
    return -1;
   } else {
    ip = out;
+   samples = (samples * to->rate) / from->rate;
   }
  }
@@ -693 +726 @@
   memcpy(real_out, out, to_size);
   free(out);
+  ROAR_DBG("roar_conv(*): free(%p): OK!", out);
  }