Latest psychoacoustics work -- still highly experimental
[opus.git] / tests / cwrs64-test.c
index 5fa1ee2..548fa22 100644 (file)
@@ -4,48 +4,44 @@
 
 #include <stdio.h>
 #include "cwrs.h"
+#include <string.h>
+
 #define NMAX (32)
 #define MMAX (16)
 
 int main(int _argc,char **_argv){
   int n;
-  for(n=0;n<=NMAX;n+=3){
+  for(n=2;n<=NMAX;n+=3){
     int m;
-    for(m=0;m<=MMAX;m++){
+    for(m=1;m<=MMAX;m++){
+      celt_uint64_t uu[MMAX+2];
       celt_uint64_t inc;
       celt_uint64_t nc;
       celt_uint64_t i;
-      nc=ncwrs64(n,m);
-      /* Testing all cases just wouldn't work! */
-      inc = nc/1000;
-      if (inc<1)
-         inc = 1;
+      nc=ncwrs_u64(n,m,uu);
+      /*Testing all cases just wouldn't work!*/
+      inc=nc/1000;
+      if(inc<1)inc=1;
       /*printf("%d/%d: %llu",n,m, nc);*/
       for(i=0;i<nc;i+=inc){
-        int x[MMAX];
-        int s[MMAX];
-        int x2[MMAX];
-        int s2[MMAX];
-        int y[NMAX];
-        int k;
-        cwrsi64(n,m,i,x,s);
+        celt_uint64_t u[MMAX+2];
+        int           y[NMAX];
+        celt_uint64_t v;
+        int           k;
+        memcpy(u,uu,(m+2)*sizeof(*u));
+        cwrsi64(n,m,i,y,u);
         /*printf("%llu of %llu:",i,nc);
-        for(k=0;k<m;k++){
-          printf(" %c%i",k>0&&x[k]==x[k-1]?' ':s[k]?'-':'+',x[k]);
-        }
+        for(k=0;k<n;k++)printf(" %+3i",y[k]);
         printf(" ->");*/
-        if(icwrs64(n,m,x,s, NULL)!=i){
+        if(icwrs64(n,m,&v,y,u)!=i){
           fprintf(stderr,"Combination-index mismatch.\n");
           return 1;
         }
-        comb2pulse(n,m,y,x,s);
-        /*for(j=0;j<n;j++)printf(" %c%i",y[j]?y[j]<0?'-':'+':' ',abs(y[j]));
-        printf("\n");*/
-        pulse2comb(n,m,x2,s2,y);
-        for(k=0;k<m;k++)if(x[k]!=x2[k]||s[k]!=s2[k]){
-          fprintf(stderr,"Pulse-combination mismatch.\n");
-          return 1;
+        if(v!=nc){
+          fprintf(stderr,"Combination count mismatch.\n");
+          return 2;
         }
+        /*printf(" %6llu\n",i);*/
       }
       /*printf("\n");*/
     }