Changeset 4115:c3fb01959302 in roaraudio

Timestamp:

08/06/10 19:26:28 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

ha, got resampling with wrong number of channels working!

File:

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

libroardsp/convert.c

@@ -627 +627 @@
 
 int roar_conv_rate2      (void * out, void * in, int samples, int outsamples, int bits, int channels) {
+ ROAR_DBG("roar_conv_rate2(out=%p, in=%p, samples=%i, outsamples=%i, bits=%i, channels=%i) = ?", out, in, samples, outsamples, bits, channels);
  switch (bits) {
   case 16:
@@ -1008 +1009 @@
  struct roar_audio_info cinfo;
  int    need_signed = 0;
+ size_t outsamples;
 
  memcpy(&cinfo, from, sizeof(cinfo));
@@ -1084 +1086 @@
 
   cin            = out;
+  samples        = (samples * to->channels) / cinfo.channels;
   cinfo.channels = to->channels;
  }
@@ -1089 +1092 @@
 //--//
  if ( from->rate != to->rate ) {
-  if ( roar_conv_rate2(out, cin, samples, bufsize/(cinfo.bits/8), cinfo.bits, cinfo.channels) == -1 )
+  outsamples = bufsize/(cinfo.bits/8);
+
+  if ( roar_conv_rate2(out, cin, samples, outsamples, cinfo.bits, cinfo.channels) == -1 )
    return -1;
 
   cin            = out;
-  samples        = bufsize/(cinfo.bits/8);
+  samples        = outsamples;
   cinfo.rate     = to->rate;
  }
@@ -1103 +1108 @@
 
   cin            = out;
+  samples        = (samples * to->channels) / cinfo.channels;
   cinfo.channels = to->channels;
  }