Changeset 2099:858f02f3765e in roaraudio

Timestamp:

07/21/09 13:20:23 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

got it working :) (samples vs. frames)

File:

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

libroardsp/convert.c

@@ -33 +33 @@
  */
 
+#define DEBUG
 #include "libroardsp.h"
 //#define free(p) {ROAR_WARN("free(%p) = ?", (p)); free((p)); ROAR_WARN("free(%p): OK", (p));}
@@ -745 +746 @@
 
  // calcumate number of input samples:
- samples = (inlen * 8) / (from->channels * from->bits);
+ samples = (inlen * 8) / (from->bits);
+
+ ROAR_WARN("roar_conv2(*): input samples: %i", samples);
 
  // calculate size per frame
@@ -751 +754 @@
 
  needed_buffer *= samples;
+ needed_buffer /= from->channels;
 
  if ( from->rate < to->rate )
@@ -797 +801 @@
  if ( to->channels > from->channels ) {
   ROAR_WARN("roar_conv2(*): channels: %i->%i", from->channels, to->channels);
-  if ( roar_conv_chans(out, cin, samples, from->channels, to->channels, cinfo.bits) == -1 )
+  if ( roar_conv_chans(out, cin, samples/from->channels, from->channels, to->channels, cinfo.bits) == -1 )
    return -1;