Changeset 1061:b91fe3c6f1e8 in roaraudio

Timestamp:

12/24/08 13:21:36 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

wrote zoh resampler, fixed a bug with output size calulation

Files:

• include/libroardsp/convert.h (modified) (1 diff)
• libroardsp/convert.c (modified) (1 diff)
• roard/include/output.h (modified) (1 diff)

include/libroardsp/convert.h

@@ -66 +66 @@
 int roar_conv_chans_2to116 (void * out, void * in, int samples);           // yes          yes
 
-int roar_conv_rate    (void * out, void * in, int samples, int from, int to, int bits, int channels);
-int roar_conv_rate_8  (void * out, void * in, int samples, int from, int to, int channels);
-int roar_conv_rate_16 (void * out, void * in, int samples, int from, int to, int channels);
+int roar_conv_rate       (void * out, void * in, int samples, int from, int to, int bits, int channels);
+int roar_conv_rate_8     (void * out, void * in, int samples, int from, int to, int channels);
+int roar_conv_rate_16    (void * out, void * in, int samples, int from, int to, int channels);
+int roar_conv_rate_161zoh(void * out, void * in, int samples, int from, int to);
+int roar_conv_rate_162zoh(void * out, void * in, int samples, int from, int to);
+int roar_conv_rate_16nzoh(void * out, void * in, int samples, int from, int to, int channels);
 
 int roar_conv_codec (void * out, void * in, int samples, int from, int to, int bits);

libroardsp/convert.c

@@ -322 +322 @@
 
 int roar_conv_rate_16 (void * out, void * in, int samples, int from, int to, int channels) {
- if ( channels == 1 ) {
-  printf("roar_conv_rate_16(): samples=%i -> %i, rate=%i -> %i\n", samples*from/to, samples, from, to);
-  return roar_conv_poly4_16s((int16_t*) out, (int16_t*) in, samples, samples*from/to, (float)from/to);
-//  return roar_conv_poly4_16((int16_t*) out, (int16_t*) in, samples*to/from, samples);
+ if ( from > to ) {
+  switch (channels) {
+   case 1:
+     return roar_conv_rate_161zoh(out, in, samples, from, to);
+   case 2:
+   default:
+     return -1;
+  }
+ } else {
+  if ( channels == 1 ) {
+   printf("roar_conv_rate_16(): samples=%i -> %i, rate=%i -> %i\n", samples*from/to, samples, from, to);
+   return roar_conv_poly4_16s((int16_t*) out, (int16_t*) in, samples, samples*from/to, (float)from/to);
+ //  return roar_conv_poly4_16((int16_t*) out, (int16_t*) in, samples*to/from, samples);
+  }
  }
 
  return -1;
+}
+
+int roar_conv_rate_161zoh(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;
+
+ for (i= 0; i < samples; i++) {
+  op[(int)t] = ip[i];
+  t += step;
+ }
+
+ return 0;
 }
 

roard/include/output.h

@@ -38 +38 @@
 #define ROAR_OUTPUT_WRITE_SIZE     1024
 
-#define ROAR_OUTPUT_CALC_OUTBUFSIZE(x)   (ROAR_OUTPUT_BUFFER_SAMPLES * (x)->channels * ((x)->bits / 8))
-#define ROAR_OUTPUT_CALC_OUTBUFSAMP(x,y) ((y) / ((x)->channels * ((x)->bits / 8)))
+#define ROAR_OUTPUT_CALC_OUTBUFSIZE(x)   (ROAR_OUTPUT_BUFFER_SAMPLES * (x)->channels * ((x)->bits / 8) * ((float)(x)->rate/g_sa->rate))
+#define ROAR_OUTPUT_CALC_OUTBUFSAMP(x,y) ((y) / ((x)->channels * ((x)->bits / 8)*((float)(x)->rate/g_sa->rate)))
 
 void         * g_output_buffer;