Changeset 383:56f41c54f169 in roaraudio

Timestamp:

08/06/08 04:03:43 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added working 16 bit mono resampling code

Files:

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

include/libroardsp/convert.h

@@ -26 +26 @@
 int roar_conv       (void * out, void * in, int samples, struct roar_audio_info * from, struct roar_audio_info * to);
 
+
+int roar_conv_poly4_16 (int16_t * out, int16_t * in, size_t olen, size_t ilen);
+
 #endif
 

include/libroardsp/poly.h

@@ -13 +13 @@
 int roar_math_mkpoly_5x5 (float * poly, float * data);
 
+float roar_math_cvpoly_4x4 (float * poly, float t);
 
 #endif

libroardsp/convert.c

@@ -222 +222 @@
 }
 
+
+
+int roar_conv_poly4_16 (int16_t * out, int16_t * in, size_t olen, size_t ilen) {
+ float poly[4];
+ float data[4];
+ float t    = 0;
+ float step = (float)ilen/olen;
+ int16_t * ci = in;
+ int io, ii = 0;
+ int i;
+
+ // we can not make a poly4 with less than 4 points ;)
+ if ( ilen < 4 )
+  return -1;
+
+ for (i = 0; i < 4; i++)
+  data[i] = ci[i];
+ roar_math_mkpoly_4x4(poly, data);
+/*
+ printf("new poly: data[4] = {%f, %f, %f, %f}, poly[4] = {%f, %f, %f, %f}\n",
+         data[0], data[1], data[2], data[3],
+         poly[0], poly[1], poly[2], poly[3]
+       );
+*/
+
+ //0 1 2 3
+
+ for (io = 0; io < olen; io++) {
+//  printf("t=%f\n", t);
+  out[io] = roar_math_cvpoly_4x4(poly, t);
+  t += step;
+  if ( t > 2 ) { // we need a new ploynome
+ //  printf("t > 2, need new data\n");
+   if ( (ii + 4) < ilen ) { // else: end of block.
+    t -= 1;
+//    printf("new data: ii=%i\n", ii);
+    ii++;
+    ci++;
+    for (i = 0; i < 4; i++)
+     data[i] = ci[i];
+    roar_math_mkpoly_4x4(poly, data);
+/* 
+   printf("new poly: data[4] = {%f, %f, %f, %f}, poly[4] = {%f, %f, %f, %f}\n",
+           data[0], data[1], data[2], data[3],
+           poly[0], poly[1], poly[2], poly[3]
+          );
+*/
+   }
+  }
+ }
+
+ return 0;
+}
+
 //ll

libroardsp/poly.c

@@ -72 +72 @@
 }
 
+
+float roar_math_cvpoly_4x4 (float * poly, float t) {
+ float ret = poly[0];
+ float ct  = t;
+
+ ret += poly[1] * ct;
+ ct  *= t;
+ ret += poly[2] * ct;
+ ct  *= t;
+ ret += poly[3] * ct;
+
+// printf("ret=%f\n", ret);
+
+ return ret;
+}
+
 //ll