Big changes in both narrowband and wideband. Retrained LSP codebook,
authorjmvalin <jmvalin@0101bb08-14d6-0310-b084-bc0e0c8e3800>
Tue, 14 May 2002 03:25:47 +0000 (03:25 +0000)
committerjmvalin <jmvalin@0101bb08-14d6-0310-b084-bc0e0c8e3800>
Tue, 14 May 2002 03:25:47 +0000 (03:25 +0000)
replaced pseudo-multi-pulse by split codebook (no gain) for narrowband.
Changed gain-shape approach to gain-only split-VQ for wideband. Wideband
bit-rate goes down (31.3 kbps to 26.9 kbps). Narrowband is about the same
(now 15.1 kbps).

git-svn-id: http://svn.xiph.org/trunk/speex@3298 0101bb08-14d6-0310-b084-bc0e0c8e3800

27 files changed:
libspeex/Makefile.am
libspeex/cb_search.c
libspeex/cb_search.h
libspeex/exc_5_256_table.c [new file with mode: 0644]
libspeex/exc_5_64_table.c [new file with mode: 0644]
libspeex/exc_8_256_table.c [new file with mode: 0644]
libspeex/exc_gains_table.c [deleted file]
libspeex/exc_gains_wb2_table.c [deleted file]
libspeex/exc_gains_wb_table.c [deleted file]
libspeex/exc_sb_table.c [deleted file]
libspeex/exc_table.c [deleted file]
libspeex/exc_wb_table.c [deleted file]
libspeex/hexc_table.c [deleted file]
libspeex/lsp_tables_nb.c
libspeex/matrix.c [deleted file]
libspeex/matrix.h [deleted file]
libspeex/modes.c
libspeex/mpulse.c [deleted file]
libspeex/mpulse.h [deleted file]
libspeex/nb_celp.c
libspeex/quant_lsp.c
libspeex/speex.h
libspeex/stoc.c [deleted file]
libspeex/testenc.c
libspeex/testenc_wb.c
src/speexdec.c
src/speexenc.c

index a32261e..fff0d86 100644 (file)
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in. -*-Makefile-*-
 
-# $Id: Makefile.am,v 1.26 2002/05/03 19:27:52 jmvalin Exp $
+# $Id: Makefile.am,v 1.27 2002/05/14 03:25:47 jmvalin Exp $
 
 # Disable automatic dependency tracking if using other tools than gcc and gmake
 #AUTOMAKE_OPTIONS = no-dependencies
@@ -18,22 +18,16 @@ libspeex_la_SOURCES = nb_celp.c \
        lsp_tables_wb.c \
        gain_table.c \
        cb_search.c \
-       stoc.c \
        filters.c \
        bits.c \
        modes.c \
-       exc_table.c \
-       exc_wb_table.c \
-       exc_gains_table.c \
-       exc_gains_wb_table.c \
-       exc_gains_wb2_table.c \
        vq.c \
-       matrix.c \
-       mpulse.c \
-       exc_sb_table.c \
        high_lsp_tables.c \
        vbr.c \
-       hexc_table.c
+       hexc_table.c \
+       exc_5_256_table.c \
+       exc_8_256_table.c \
+       exc_5_64_table.c
 
 
 include_HEADERS =  speex.h \
@@ -48,8 +42,6 @@ noinst_HEADERS = lsp.h \
        filters.h \
        stack_alloc.h \
        vq.h \
-       matrix.h \
-       mpulse.h \
        modes.h \
        sb_celp.h \
        vbr.h
index fb82777..5010ee1 100644 (file)
@@ -38,7 +38,6 @@
 #include <stdio.h>
 #include "stack_alloc.h"
 #include "vq.h"
-#include "matrix.h"
 
 #define min(a,b) ((a) < (b) ? (a) : (b))
 #define max(a,b) ((a) > (b) ? (a) : (b))
@@ -435,6 +434,178 @@ float *stack
 }
 
 
+void split_cb_search_nogain2(
+float target[],                        /* target vector */
+float ak[],                    /* LPCs for this subframe */
+float awk1[],                  /* Weighted LPCs for this subframe */
+float awk2[],                  /* Weighted LPCs for this subframe */
+void *par,                      /* Codebook/search parameters*/
+int   p,                        /* number of LPC coeffs */
+int   nsf,                      /* number of samples in subframe */
+float *exc,
+FrameBits *bits,
+float *stack
+)
+{
+   int i,j;
+   float *resp;
+   float *t, *r, *e, *E;
+   int *ind;
+   float *shape_cb;
+   int shape_cb_size, subvect_size, nb_subvect;
+   split_cb_params *params;
+
+   params = (split_cb_params *) par;
+   subvect_size = params->subvect_size;
+   nb_subvect = params->nb_subvect;
+   shape_cb_size = 1<<params->shape_bits;
+   shape_cb = params->shape_cb;
+   resp = PUSH(stack, shape_cb_size*subvect_size);
+   t = PUSH(stack, nsf);
+   r = PUSH(stack, nsf);
+   e = PUSH(stack, nsf);
+   E = PUSH(stack, shape_cb_size);
+   ind = (int*)PUSH(stack, nb_subvect);
+
+   for (i=0;i<nsf;i++)
+      t[i]=target[i];
+
+   e[0]=1;
+   for (i=1;i<nsf;i++)
+      e[i]=0;
+   residue_zero(e, awk1, r, nsf, p);
+   syn_filt_zero(r, ak, r, nsf, p);
+   syn_filt_zero(r, awk2, r, nsf,p);
+   
+   /* Pre-compute codewords response and energy */
+   for (i=0;i<shape_cb_size;i++)
+   {
+      float *res = resp+i*subvect_size;
+
+      /* Compute codeword response */
+      int k;
+      for(j=0;j<subvect_size;j++)
+         res[j]=0;
+      for(j=0;j<subvect_size;j++)
+      {
+         for (k=j;k<subvect_size;k++)
+            res[k]+=shape_cb[i*subvect_size+j]*r[k-j];
+      }
+      E[i]=0;
+      for(j=0;j<subvect_size;j++)
+         E[i]+=res[j]*res[j];
+   }
+
+   for (i=0;i<nb_subvect;i++)
+   {
+      int best_index[2]={0,0}, k, m;
+      float g, dist, best_dist[2]={-1,-1};
+      float *a, *x;
+      float energy=0;
+      x=t+subvect_size*i;
+      for (k=0;k<subvect_size;k++)
+         energy+=x[k]*x[k];
+      /* Find best codeword for current sub-vector */
+      for (j=0;j<shape_cb_size;j++)
+      {
+         dist=0;
+         a=resp+j*subvect_size;
+         dist=energy+E[j];
+         for (k=0;k<subvect_size;k++)
+            dist -= 2*a[k]*x[k];
+         if (dist<best_dist[0] || best_dist[0]<0)
+         {
+            best_dist[1]=best_dist[0];
+            best_index[1]=best_index[0];
+            best_dist[0]=dist;
+            best_index[0]=j;
+         } else if (dist<best_dist[1] || best_dist[1]<0)
+         {
+            best_dist[1]=dist;
+            best_index[1]=j;
+         }
+      }
+      if (i<nb_subvect-1)
+      {
+         int nbest;
+         float *tt, err[2];
+         float best_score[2];
+         tt=PUSH(stack,nsf);
+         for (nbest=0;nbest<2;nbest++)
+         {
+            for (j=0;j<nsf;j++)
+               tt[j]=t[j];
+            for (j=0;j<subvect_size;j++)
+            {
+               g=shape_cb[best_index[nbest]*subvect_size+j];
+               for (k=subvect_size*i+j,m=0;k<nsf;k++,m++)
+                  tt[k] -= g*r[m];
+            }
+            
+            {
+               int i2=vq_index(&tt[subvect_size*(i+1)], resp, subvect_size, shape_cb_size);
+               for (j=0;j<subvect_size;j++)
+               {
+                  g=shape_cb[i2*subvect_size+j];
+                  for (k=subvect_size*(i+1)+j,m=0;k<nsf;k++,m++)
+                     tt[k] -= g*r[m];
+               }
+            }
+
+            err[nbest]=0;
+            for (j=subvect_size*i;j<subvect_size*(i+2);j++)
+               err[nbest]-=tt[j]*tt[j];
+            
+            best_score[nbest]=err[nbest];
+         }
+
+         if (best_score[1]>best_score[0])
+         {
+            best_index[0]=best_index[1];
+            best_score[0]=best_score[1];
+         }
+         POP(stack);
+
+      }
+
+      ind[i]=best_index[0];
+
+      /*printf ("best index: %d/%d\n", best_index, shape_cb_size);*/
+      speex_bits_pack(bits,ind[i],params->shape_bits);
+
+      /* Update target for next subvector */
+      for (j=0;j<subvect_size;j++)
+      {
+         g=shape_cb[ind[i]*subvect_size+j];
+         for (k=subvect_size*i+j,m=0;k<nsf;k++,m++)
+            t[k] -= g*r[m];
+      }
+   }
+   
+   /* Put everything back together */
+   for (i=0;i<nb_subvect;i++)
+      for (j=0;j<subvect_size;j++)
+         e[subvect_size*i+j]=shape_cb[ind[i]*subvect_size+j];
+
+   /* Update excitation */
+   for (j=0;j<nsf;j++)
+      exc[j]+=e[j];
+   
+   /* Update target */
+   residue_zero(e, awk1, r, nsf, p);
+   syn_filt_zero(r, ak, r, nsf, p);
+   syn_filt_zero(r, awk2, r, nsf,p);
+   for (j=0;j<nsf;j++)
+      target[j]-=r[j];
+
+   
+
+   POP(stack);
+   POP(stack);
+   POP(stack);
+   POP(stack);
+   POP(stack);
+}
 
 
 void split_cb_search2(
index e7f752b..4938e4c 100644 (file)
@@ -69,6 +69,19 @@ FrameBits *bits,
 float *stack
 );
 
+void split_cb_search_nogain2(
+float target[],                        /* target vector */
+float ak[],                    /* LPCs for this subframe */
+float awk1[],                  /* Weighted LPCs for this subframe */
+float awk2[],                  /* Weighted LPCs for this subframe */
+void *par,                      /* Codebook/search parameters*/
+int   p,                        /* number of LPC coeffs */
+int   nsf,                      /* number of samples in subframe */
+float *exc,
+FrameBits *bits,
+float *stack
+);
+
 
 void split_cb_search2(
 float target[],                        /* target vector */
diff --git a/libspeex/exc_5_256_table.c b/libspeex/exc_5_256_table.c
new file mode 100644 (file)
index 0000000..4c737fd
--- /dev/null
@@ -0,0 +1,258 @@
+float exc_5_256_table[256][5]={
+{0.19028,-1.19216,1.01496,-1.68505,0.530342},
+{1.43114,1.76482,1.13029,0.467325,-0.118456},
+{-1.70027,-1.04753,0.163115,1.78991,0.715999},
+{-0.349082,0.600766,-0.658972,0.00712033,1.10185},
+{0.707736,-0.240468,-0.148016,0.365392,0.15358},
+{-0.291232,-1.29587,0.675609,1.95325,-1.75773},
+{0.384438,0.359208,0.192474,-2.21698,-2.13492},
+{-2.02315,1.29534,-0.48924,1.10493,-1.20365},
+{-0.00809715,-1.94497,1.37629,-0.175045,0.132235},
+{-0.522044,-0.140311,0.604364,2.32491,-0.363157},
+{-0.343704,0.0198448,1.25282,0.0271826,0.834806},
+{0.173456,1.60276,0.679361,-0.165157,0.601343},
+{-0.148854,-0.30341,-0.729362,1.82971,1.2929},
+{0.211454,1.09323,-0.522278,-1.20368,-0.888268},
+{-0.556048,0.717144,-0.452017,-1.42375,1.26429},
+{-0.0674071,0.0814805,-0.0752756,1.66794,-3.07519},
+{0.746281,0.258262,-0.119019,-0.550581,-0.416475},
+{0.223079,0.400795,-0.810151,1.01507,-0.112121},
+{-1.0015,-0.332818,0.126392,0.346198,1.91743},
+{-0.863116,0.986972,-1.59637,1.10265,1.1985},
+{1.16033,1.66989,-2.2818,-0.28701,0.360093},
+{1.11615,-0.873836,0.564808,-0.230663,-1.60369},
+{0.428631,1.18423,-0.289242,-1.18637,0.375181},
+{-0.993522,0.498477,-1.11803,2.11574,-0.534347},
+{0.787547,-1.99658,2.45624,-2.00842,1.20949},
+{0.0421546,-0.396605,0.508831,0.429771,-0.0377948},
+{-0.676053,0.188737,1.03056,0.126578,-0.595505},
+{-1.30631,0.544544,-0.00711868,-0.650046,0.692036},
+{0.448392,-2.11804,-0.28171,-0.241554,0.00506657},
+{-0.419691,-0.408426,-1.1623,-1.48962,-1.32172},
+{0.651377,0.630634,1.27962,-0.633464,1.29209},
+{1.03546,-1.20945,0.223839,1.86249,-2.75887},
+{1.19968,-2.87206,2.23684,-0.278886,-0.377211},
+{0.891759,0.180826,1.56942,-0.00463022,-0.061534},
+{-1.47405,-2.02081,-0.577162,-0.203813,0.274341},
+{-1.81044,2.573,-1.63586,-0.134374,0.956315},
+{2.16886,-1.30587,-0.370774,1.20093,-0.901648},
+{-0.694017,-0.758904,1.73323,-0.138912,-0.614558},
+{-1.09635,0.877675,-0.0840189,-1.45155,-0.257058},
+{-0.941981,1.41089,-1.32564,1.08113,-1.11444},
+{-0.162032,-0.34072,2.31174,-2.18734,-0.643509},
+{-0.3929,0.248084,1.10439,1.62262,1.41702},
+{-1.79664,1.09215,1.89197,-1.58008,-0.130777},
+{-2.6216,0.184975,-0.0914826,0.853891,0.172371},
+{0.888984,0.0274795,-0.555739,0.186501,1.14181},
+{1.37008,0.514867,0.70117,-0.299958,-1.4497},
+{0.251172,0.762633,-1.83227,-1.99544,2.40336},
+{0.0318121,-0.447745,-2.03871,3.26916,-0.440572},
+{-0.0596678,-0.431491,0.830744,-0.646988,-0.231428},
+{-0.333352,0.0783209,0.11058,0.312093,-0.60373},
+{-0.521066,-0.0566533,0.43388,-0.831533,1.054},
+{-0.609329,1.0381,-0.786306,0.504327,-0.182011},
+{0.279684,0.806427,-1.3499,0.231412,-0.478314},
+{1.42834,-2.3633,0.224642,1.83987,-1.20767},
+{0.368394,0.687205,-1.48928,-1.15415,0.342704},
+{0.46995,1.7856,-1.62329,0.723173,-1.44426},
+{0.202997,-0.348456,0.711341,-1.44627,1.64784},
+{-0.823471,-1.8262,0.448283,1.15121,1.67559},
+{-1.69768,1.56435,0.824513,-0.0621726,-1.69301},
+{-1.57452,1.84101,-0.637741,-0.166914,-0.310526},
+{1.48966,-0.462308,-1.88234,0.637998,1.19021},
+{-0.570594,-0.848838,-0.546898,-0.630661,-0.102711},
+{-0.847047,-0.0408755,1.32864,-1.72291,0.787156},
+{0.541875,-1.48094,-0.205537,1.11339,-0.211444},
+{1.96752,0.0807473,0.793642,0.215757,1.03221},
+{0.507011,0.830942,0.312623,0.665426,1.90298},
+{-1.43651,-0.33832,1.35088,1.02514,0.438064},
+{-0.547367,-0.28566,-1.5438,-0.732139,0.871887},
+{1.92317,-1.00872,-0.331481,-0.0963572,-0.647448},
+{-0.635618,-0.325097,1.45627,0.469713,-2.28562},
+{1.32978,-0.357695,1.24993,-1.42685,-0.329201},
+{-2.02894,2.75117,-1.65516,1.02933,-0.732393},
+{0.450553,-1.30463,2.00577,-0.594163,-1.25333},
+{0.038118,-0.359635,-0.482839,0.689927,-0.606359},
+{-1.22328,-0.696521,0.748815,-1.31627,-0.335667},
+{-0.667347,0.867484,-1.062,-0.596875,0.139979},
+{-0.497509,-1.05327,-0.337831,-0.892041,1.54069},
+{1.20125,1.24913,0.503919,-1.33946,-0.497861},
+{-0.234669,0.434697,0.288012,-2.87405,2.67479},
+{-0.11988,0.312599,-1.20657,2.69089,-2.45326},
+{0.540548,-0.660943,-0.0605836,-0.496024,0.70002},
+{-0.00214932,0.431302,0.52739,0.0762017,0.0889467},
+{-0.259553,-0.0276753,0.1063,0.745896,0.907723},
+{1.04164,0.610987,-0.568739,1.19214,0.742597},
+{0.731911,-0.318515,-2.20743,-0.310207,-0.456912},
+{0.981054,-0.960425,0.270429,0.390834,-0.360971},
+{-0.0277036,2.44139,-1.05388,-0.74964,-0.270852},
+{-0.932991,0.517182,-0.407817,0.913109,-0.687894},
+{1.01696,-1.53923,1.72382,-1.04312,0.216397},
+{0.778734,-1.02577,-0.00493828,0.936902,1.26431},
+{-0.0684221,0.441359,0.327278,-0.717768,-0.3262},
+{-0.974972,1.04767,0.574647,0.194013,1.3787},
+{0.381109,-0.869183,-0.931576,0.00152842,0.991125},
+{-0.0443438,-0.108462,-0.556814,-0.578148,-0.670548},
+{0.366094,-0.662259,0.835222,-0.774465,0.76728},
+{0.759677,-0.75612,-0.0181272,1.16358,-1.19526},
+{2.59997,-2.56623,0.557706,0.408959,-0.504487},
+{0.625822,0.526661,0.302188,0.553011,-0.307633},
+{-0.466246,-0.321924,-0.354624,-0.0549628,0.72471},
+{-0.387772,1.75881,-1.72635,-0.679351,1.74729},
+{2.73966,0.387433,0.149282,-0.767636,-0.475763},
+{-0.61366,-1.62708,0.604493,1.27502,-0.296148},
+{-0.582606,2.11498,0.609263,-1.29045,-0.484934},
+{0.520947,0.920302,-3.03009,1.75364,0.390494},
+{0.0677055,-0.155892,1.21549,-0.567356,-1.2364},
+{-1.03823,0.238909,0.409599,0.230183,0.321788},
+{-3.50614,0.573843,1.75049,-0.0776375,0.348235},
+{-0.603445,0.314016,-0.273993,-0.140601,0.03399},
+{0.192533,0.108472,0.0681388,-0.070508,0.679395},
+{0.389971,-0.333753,0.465182,0.591594,-2.09498},
+{0.449983,0.183708,-0.317023,-0.823983,1.1638},
+{1.51877,0.647862,-1.62904,0.925579,-0.477286},
+{1.40308,-0.277546,0.38678,-0.169444,-0.334669},
+{0.111654,-0.837242,-0.0511925,-0.036591,-0.297364},
+{-0.416566,1.0614,0.712534,-1.80311,0.702184},
+{-1.24209,0.477076,-1.90088,0.566501,-0.240059},
+{0.659692,0.0169712,-1.15038,1.3165,-1.56297},
+{1.13619,-1.89708,1.6056,0.634573,-2.20027},
+{0.866701,0.400374,0.00937341,-2.09431,1.25358},
+{-0.483753,1.89332,0.00652508,0.643874,-0.916144},
+{1.40294,-0.724324,-0.278423,-0.971145,1.99646},
+{-1.55145,-2.54094,1.96945,0.408641,0.850295},
+{-1.39758,0.200329,2.30027,-0.404522,-1.31998},
+{-2.30688,1.47142,0.200574,-0.889742,0.777914},
+{1.57892,-0.933662,-0.3776,0.046213,0.642265},
+{-1.2863,-1.40852,-1.30923,-1.12566,-1.07639},
+{0.286342,-0.11991,1.55991,-2.83116,1.19984},
+{0.563194,-0.331787,-0.694438,2.06163,-0.63832},
+{0.809687,-1.09489,0.355407,-0.886394,-0.162859},
+{1.23369,1.30684,1.38779,1.39689,1.17775},
+{-1.2003,0.313085,-0.331041,1.2843,0.574714},
+{0.236435,0.830994,-0.431979,-0.105534,0.16366},
+{0.810472,0.0176487,-0.465491,0.440226,-0.775976},
+{-1.56774,0.243787,0.97205,1.23011,-1.17481},
+{0.105133,0.479514,0.80207,-3.42883,-0.393037},
+{-1.70598,1.4029,-1.18661,1.12237,-0.070917},
+{-0.736219,-0.898515,0.831095,-0.00453536,0.0789794},
+{-0.00649844,-0.367979,0.115022,1.33323,0.0133272},
+{-0.878367,0.428921,0.944957,-0.777181,0.126341},
+{-0.163343,1.67583,-0.049944,1.19347,0.511661},
+{-1.10358,-0.929787,-1.22499,0.679921,1.07709},
+{0.408735,1.67377,0.539616,-0.818885,-1.97843},
+{-0.132753,2.00692,-0.746771,-2.43548,0.781178},
+{-0.928001,0.827395,-0.604006,1.55876,-2.08659},
+{0.0995075,-0.0675411,-0.276552,-1.03479,0.225148},
+{-0.192136,0.330222,-0.232127,0.537886,0.0805576},
+{-1.95953,0.0990088,1.07206,-0.670887,1.07465},
+{0.0223182,0.0236161,-1.25699,0.367047,2.21307},
+{0.379852,1.29189,-1.17325,0.144147,0.821168},
+{1.85473,-1.40522,1.19505,-0.289904,-0.626981},
+{1.55791,1.48283,-0.393811,-0.610646,0.882772},
+{-0.244116,0.505547,-1.05088,1.21014,-1.05128},
+{2.24139,-2.37231,1.57313,-1.19786,0.742049},
+{0.107608,-0.867461,1.43922,1.06761,0.402202},
+{-0.831304,-0.135738,0.1596,-0.480094,-0.64993},
+{-1.64757,0.705436,-0.86111,-0.164398,1.79808},
+{-0.248553,-1.35459,-1.4573,0.160096,-0.116618},
+{0.790895,-1.04686,-0.586939,-1.41923,-0.999843},
+{0.307025,0.145249,0.778719,-1.26754,0.449511},
+{1.15712,-1.06611,-1.12584,2.57872,-1.73128},
+{1.38467,-1.86296,0.687756,0.349266,0.35664},
+{0.219942,1.02723,1.38998,0.630558,-1.47098},
+{-1.57339,-0.704243,0.144248,-0.0198811,0.73625},
+{-1.416,1.81122,-0.488872,-1.65748,2.19069},
+{1.78187,-0.053241,-0.492537,0.845289,-1.69662},
+{-0.863607,-1.54377,2.26269,0.950316,-1.21215},
+{-0.841207,0.788055,0.985189,-1.08145,-1.2181},
+{-1.10495,1.78946,-2.16727,2.20319,-1.45648},
+{-0.162632,-0.52261,1.81161,-1.03098,0.288429},
+{-0.369607,1.07256,2.06284,0.87391,0.0952004},
+{-1.74527,1.42744,1.11355,-2.48317,1.27285},
+{-1.45767,0.713398,-0.119637,0.144398,-0.456656},
+{1.27707,0.399941,-1.4299,-0.613828,1.47831},
+{-0.00619842,0.0938817,0.0171415,-0.636745,-1.79667},
+{-0.259894,-0.0368634,-0.627313,-1.01524,3.54701},
+{0.25873,-0.39802,-1.65095,1.4934,-0.00341877},
+{0.545702,-0.943357,1.12782,-0.227133,-0.31751},
+{-0.153848,0.049658,-0.00749219,1.2402,-1.3001},
+{-0.343917,-0.290318,0.345584,-0.33186,0.316601},
+{-1.36889,1.06432,-0.551676,0.244923,0.551692},
+{-0.0276763,0.584269,-0.42451,0.239586,-0.749546},
+{0.231223,-2.08994,-0.688945,2.3942,0.215306},
+{1.53269,0.574478,-1.05564,-1.79264,-0.452717},
+{0.173909,0.666313,-0.5096,0.49805,-1.92343},
+{0.430774,-1.04565,1.23915,-2.00704,2.6583},
+{-0.462386,-1.22395,0.0105176,0.591751,0.644931},
+{-0.655371,0.664044,0.348365,0.251285,-1.40261},
+{-2.149,3.13084,0.0661202,-0.874691,0.0956278},
+{0.335288,-0.865692,-2.54938,2.02115,1.70326},
+{-0.448381,-0.485002,-0.631383,-2.11612,0.30968},
+{-0.735516,-1.22709,1.15927,-0.704025,1.20259},
+{0.153153,-0.635713,-0.627858,0.760019,0.428093},
+{1.34021,-0.956121,0.744043,-0.559711,0.648136},
+{0.626107,0.510506,0.755866,0.787732,0.642833},
+{-1.89071,-1.10595,0.842442,0.437928,-0.678282},
+{0.870728,-1.19676,-1.52737,-1.19324,0.796867},
+{0.81119,-0.610714,-0.792216,-0.379163,-0.128446},
+{-0.479662,-1.37028,0.345657,-0.519847,-1.13405},
+{0.169647,-0.0563525,0.52336,-1.64669,-0.677671},
+{-0.640391,2.37128,-2.75925,1.16527,0.0695876},
+{-0.3733,-1.82476,2.97421,-1.15691,-0.228234},
+{-0.828448,-0.839076,-0.674098,1.51312,-0.720853},
+{-1.97361,0.292853,0.916762,-0.322976,-0.47707},
+{-0.603522,1.83262,-1.54464,0.315431,0.201071},
+{0.234608,-1.81257,-1.09685,0.611685,1.79785},
+{1.31403,0.421531,-0.823543,-0.583267,-1.39425},
+{-1.14904,0.272896,0.667171,-1.49178,2.01005},
+{0.460527,0.79763,-2.35457,2.21996,-1.37082},
+{0.360818,-1.05239,0.528468,0.0850664,0.54885},
+{0.0445125,-0.0350261,-0.0515455,-0.0346206,-0.0592469},
+{0.239184,-0.47589,0.323468,-0.157084,1.69493},
+{0.27711,0.302142,-1.64066,0.627447,0.747964},
+{1.29571,0.376546,-0.881293,-0.172447,0.128355},
+{0.728564,-0.252627,1.31012,1.03382,-0.863095},
+{1.03741,1.55655,-0.42375,0.0403849,-0.591733},
+{-1.18674,-0.281121,-0.187374,0.337543,-1.63181},
+{1.39033,-1.0686,1.15823,-1.60164,1.2609},
+{1.30579,-0.484485,0.444282,1.58096,0.317492},
+{0.289953,0.94153,0.508968,-0.190116,-0.791474},
+{-0.825431,1.74646,-0.424484,-0.665043,0.862056},
+{0.236474,0.049332,-0.83923,-0.0126438,0.241728},
+{-0.680787,-0.166925,-1.23387,-0.0127659,-0.938279},
+{0.632204,-1.01897,1.68251,-0.269847,1.34398},
+{0.367608,-1.18096,-0.793604,0.225597,-1.46933},
+{2.78323,-1.44366,0.302513,-0.581947,0.664438},
+{1.90105,0.497221,0.102284,0.822388,-0.261319},
+{-0.933907,-0.471725,-0.0232733,0.58765,-0.184327},
+{0.144204,0.855746,-3.07527,0.201719,1.93255},
+{2.62884,-0.248928,-1.31487,-0.0056057,0.212603},
+{-0.379831,-0.705531,0.7224,0.646366,-0.968565},
+{0.142813,1.00255,1.6555,-0.951911,-0.467476},
+{-0.0614304,1.1189,-1.6834,1.39554,-0.180169},
+{0.254685,-0.334372,1.92007,-1.2238,-2.59537},
+{-0.44957,0.698307,0.713511,1.07112,-0.120608},
+{-1.91423,-0.783101,2.45388,-0.619217,0.340919},
+{-0.617196,1.1361,0.057868,-0.225498,-0.232603},
+{1.01345,0.556792,0.311637,-0.259719,0.456758},
+{0.206309,0.0627397,0.203837,-0.0537736,-3.93683},
+{-0.0486324,0.623811,-0.299438,-0.816827,2.12427},
+{1.87226,-0.738473,-2.14884,1.87192,-0.443316},
+{0.558853,-0.270151,0.455833,-0.359485,0.1406},
+{0.365228,-0.232937,0.354605,0.0544514,-0.89841},
+{-0.316966,0.65717,0.0960539,-0.620677,0.609045},
+{-0.654946,0.0752009,-0.96066,0.545351,0.175407},
+{0.657254,1.08245,-0.20363,1.52414,-0.857756},
+{0.563223,-1.68366,0.930438,0.627758,-0.932365},
+{1.47214,-0.227279,-0.0597862,-1.20844,0.499824},
+{-0.801789,1.2829,-0.817963,-0.191834,-1.27485},
+{0.775766,-2.01294,0.576715,-0.571016,1.44615},
+{0.387854,-3.40224,1.19526,1.29251,0.0313001},
+{-1.46059,1.4302,1.03478,0.152466,-0.0199198},
+{-3.06896,2.01041,-0.19494,0.458657,-0.044554},
+{1.68951,-2.0608,-1.1908,1.07823,0.507044},
+{-1.77241,-0.300115,-0.832881,-0.561991,-0.13801},
+{-0.784571,-0.811958,2.34641,-2.23665,1.52917},
+{1.21407,-0.578038,-0.937705,0.885334,-0.134932},
+};
diff --git a/libspeex/exc_5_64_table.c b/libspeex/exc_5_64_table.c
new file mode 100644 (file)
index 0000000..b395d87
--- /dev/null
@@ -0,0 +1,64 @@
+float exc_5_64_table[64][5]={{-0.0973333,0.178432,-0.601172,1.89742,-2.30989},
+{-1.8483,0.335521,1.55043,-1.24492,0.746452},
+{1.24789,0.524048,-0.976269,0.653535,-1.12829},
+{-0.823627,-0.560543,0.459714,1.05323,-1.0344},
+{-1.37095,0.542134,1.41313,0.103543,-1.01795},
+{-0.963277,-1.34539,2.0497,-0.107354,-0.326052},
+{1.18126,1.18711,0.655662,-0.623788,-0.847049},
+{-0.406767,-0.372742,-0.202805,0.601395,0.0477413},
+{-1.34565,1.01231,-0.47733,0.860824,-1.1144},
+{0.609635,-1.56932,2.094,-1.79074,1.02253},
+{-0.583327,1.47747,-1.97201,1.7975,-1.06984},
+{-1.16664,-0.0854779,-0.098075,-0.577273,-0.505967},
+{-1.18478,1.86676,-0.50806,-1.47168,1.29253},
+{0.963191,-2.23947,1.58898,0.0475762,-0.562043},
+{-0.25152,0.530101,-1.02094,0.838639,-0.623916},
+{-0.548056,-0.09046,-0.0639771,0.508831,1.62666},
+{0.76748,1.06137,-0.960383,-1.15317,0.80923},
+{0.565986,-0.701622,-1.41286,1.18456,1.14557},
+{-0.86658,0.778602,-0.165102,0.154966,0.0499164},
+{-0.74766,0.388835,0.115286,-0.953036,0.916808},
+{1.43007,-0.72117,0.342485,-0.205096,-1.00981},
+{-0.105402,-0.0428089,0.497009,-1.98782,2.401},
+{0.334982,-0.145939,0.118251,-0.53406,1.08765},
+{-2.38854,1.36543,0.175537,-0.0465703,0.351541},
+{0.00721192,1.6192,-0.906122,-0.239555,-0.459826},
+{-1.02974,0.078106,-0.852912,1.61492,0.233392},
+{-0.174771,-1.05761,1.01984,-0.611167,1.19224},
+{0.524598,1.0895,-2.4416,0.672587,0.632776},
+{1.26701,0.846419,0.969735,0.930293,0.799436},
+{0.0318987,-0.219377,1.58288,-1.36858,-1.14528},
+{0.79763,-0.380618,-1.71051,2.25003,-0.710723},
+{0.603795,-0.595349,-1.2425,-0.282374,-0.16075},
+{-0.0492163,0.204775,-0.079854,0.0334282,-0.751745},
+{-1.79543,2.38483,-1.36753,0.634718,-0.32093},
+{2.05278,0.0737022,-0.717423,-0.214518,0.190423},
+{-0.724955,1.44464,0.564552,-1.08432,-0.556555},
+{0.564067,0.423427,-0.642245,0.569679,0.44192},
+{0.913815,-1.52742,0.288179,1.65154,-1.6786},
+{0.837433,-0.876355,0.154768,0.285161,0.359109},
+{-0.459512,0.00986829,0.920758,-0.502616,0.0503464},
+{0.410356,0.289731,-0.553426,-1.6683,-0.904018},
+{-0.108048,0.542804,-1.33618,-0.589215,2.32569},
+{0.152471,1.05566,0.5173,0.915216,-0.577427},
+{0.783937,-0.684775,1.11417,-0.652885,0.265146},
+{-0.00840562,0.413891,0.0655512,-0.0465592,-2.17946},
+{0.627793,0.24361,0.0485797,-0.518829,-0.0912497},
+{-0.163037,-1.82413,0.29276,1.40467,0.363785},
+{-0.0518913,-1.0434,0.202549,-0.56384,-0.291985},
+{-0.31421,0.220815,-0.882671,-0.345301,0.481232},
+{1.94186,-1.56429,-0.586202,0.982648,-0.258558},
+{-0.400186,0.134464,1.10521,1.23818,0.655885},
+{-1.77482,-0.661518,0.502121,0.446352,0.46729},
+{2.00423,-1.77768,0.925443,-0.678358,0.598855},
+{0.542383,-0.474195,-0.292672,0.983825,-0.712478},
+{0.130237,1.23794,0.599625,-0.145036,0.772077},
+{-0.914536,-1.04875,-1.16803,-0.878548,-0.940863},
+{-0.947659,1.30248,-1.23304,0.34647,0.866395},
+{0.292906,-0.492186,0.958206,0.334719,-0.596865},
+{-0.68864,-1.38423,-0.80474,-0.0646713,0.821493},
+{1.19545,-0.909322,-0.623307,-0.424572,1.55574},
+{-0.229777,0.250926,1.23844,-2.26703,0.623464},
+{0.167444,-0.707621,1.35753,0.340287,-2.27245},
+{1.11752,-0.399492,0.43343,-1.54536,0.785914},
+{0.0120329,-0.0217694,0.10678,0.0193752,0.161495}};
diff --git a/libspeex/exc_8_256_table.c b/libspeex/exc_8_256_table.c
new file mode 100644 (file)
index 0000000..42422ec
--- /dev/null
@@ -0,0 +1,257 @@
+float exc_8_256_table[256][8]={
+{0.853195,0.635126,-0.502438,0.0133588,0.0837618,-0.962236,-0.197057,1.17151},
+{0.0683993,0.694669,-1.5482,-0.387333,-0.708581,0.498885,0.420732,1.16184},
+{-0.467472,0.692174,0.306498,-0.684962,-0.865795,1.33008,1.01606,-1.76467},
+{-0.0682523,0.362195,0.348389,0.0620224,-0.681785,-0.22013,0.587155,0.323996},
+{1.77973,-2.76219,1.26976,0.234656,-0.488763,0.444082,-0.378954,0.337703},
+{0.726156,0.348987,-1.80167,1.10259,0.671964,-1.66385,0.734199,0.631231},
+{0.366888,0.282228,-0.0900351,-0.543205,-1.19662,0.601094,1.82931,-0.445298},
+{0.0633687,-0.0655516,-0.0948645,1.43009,-2.62561,2.05439,-0.849971,0.150859},
+{0.469367,-1.8172,-0.00816176,-0.352532,0.976246,0.349978,0.367997,-0.209233},
+{-0.257761,0.404174,-0.430788,0.660993,-1.60614,2.52745,-1.97782,0.87592},
+{1.12882,0.607438,-0.31838,-1.04276,-1.30471,-0.878038,-0.371095,0.198174},
+{0.16057,0.118312,0.262357,0.552484,0.876083,1.09817,1.29274,1.0469},
+{-0.832043,1.0857,0.660385,-2.61829,1.49545,-0.179743,0.00597762,0.124985},
+{-0.0871844,-1.47205,2.69818,-0.438939,-1.20504,0.83376,-0.818761,0.730231},
+{-0.290202,0.11803,-0.0492812,0.635533,0.11175,-2.48428,1.10737,1.28673},
+{-2.20447,2.60287,-1.3895,0.667922,-0.382782,0.239637,-0.217506,0.142067},
+{0.0193638,-0.172709,0.103152,-0.323688,1.586,-1.56986,-1.44789,2.28745},
+{0.0396514,-0.126503,0.550377,-1.38608,1.45768,0.489597,-2.40867,1.67278},
+{-2.02291,-0.532289,0.371417,0.685684,0.466835,-0.445217,0.179244,0.172275},
+{0.420613,-0.923231,-0.831141,-1.16849,-0.155897,0.444604,1.08175,0.97058},
+{1.40913,-1.38038,1.19461,-1.20659,1.25867,-1.34034,1.27305,-1.02312},
+{0.879549,-0.0474264,-1.03106,0.67492,0.20324,0.187644,-0.163739,-0.673377},
+{-0.779741,1.05109,-0.489324,-0.17037,0.0560228,-0.362523,1.70129,-1.8773},
+{-1.44962,0.542537,0.00323379,0.988829,-1.58607,1.14998,-0.458336,0.255077},
+{-0.620437,-1.05608,0.43687,-0.0760243,-0.438974,0.302221,0.923081,0.0141922},
+{0.417113,-0.59235,0.921316,-0.900113,-0.24693,2.10189,-2.43087,1.04235},
+{-1.48051,1.07387,0.563522,-0.726343,0.672561,-0.719604,-0.536092,1.11495},
+{1.40224,1.4278,0.570088,0.299338,-0.304374,-0.527514,-0.701361,-0.584558},
+{-1.10181,0.565258,-0.046916,-0.564778,1.07159,-0.947574,0.387944,0.242788},
+{1.48909,-2.14137,-0.271786,1.98008,-0.588984,-0.330102,-0.0370806,0.384467},
+{-1.08744,2.50882,-1.13373,-1.11937,0.668299,-0.160662,0.373516,-0.253323},
+{-1.08761,1.85839,-1.68691,1.04895,-0.428102,-0.226015,0.99934,-1.1827},
+{-0.440357,0.71973,-0.784965,-0.510719,1.5052,0.463193,-0.725056,-0.951447},
+{-0.0819614,-0.0668912,0.837224,-0.334058,-0.403736,0.189867,-0.215343,-0.00905965},
+{-0.150855,0.958455,0.131594,-0.191852,-1.62671,1.40823,-0.327728,-0.3343},
+{-1.48561,-0.0596313,1.77581,-0.236246,-1.07889,0.62629,0.0638739,-0.214229},
+{0.684132,-0.203794,0.740094,-1.24298,0.458659,0.404525,-0.778385,0.532621},
+{0.922302,-0.993246,-0.0689253,0.37021,-0.0226465,-0.179474,0.0637674,0.297146},
+{-0.11572,0.357396,-0.609294,1.47489,-2.30659,1.18849,0.806545,-1.30969},
+{-0.202428,0.831288,-1.66376,2.14437,-2.05607,1.53565,-0.901928,0.549538},
+{2.83629,-1.51378,-0.0873779,-0.171747,0.321364,-0.335863,0.0185452,0.133253},
+{-0.475851,0.485982,-0.637318,1.02483,-1.17568,1.05486,-1.45107,1.74927},
+{0.0729638,1.59905,-0.413808,-0.233604,-0.204818,-0.959441,0.846003,-0.0376334},
+{-0.455141,0.0399365,-0.795101,0.815942,0.138884,-0.600891,0.484386,-0.0285506},
+{1.07645,-0.414715,-0.322934,-0.89848,1.69979,-0.935356,0.726857,-0.742921},
+{0.106435,-0.944523,1.07234,0.298534,-2.01207,1.38319,0.731478,-1.17806},
+{-0.334966,0.316995,-0.192494,-0.372761,1.59441,-2.76524,2.2221,-0.670006},
+{-0.954641,0.977754,-0.864633,0.106651,0.358407,0.0734411,-0.375308,0.334489},
+{1.34187,-0.693512,-1.16502,0.734778,0.962698,-0.816442,-0.685375,0.918279},
+{-0.725236,0.486302,-0.317483,0.0995601,-0.123323,0.438063,-0.785216,1.55132},
+{0.0923508,-0.0945719,0.347854,0.164426,0.622929,0.531388,-1.97677,-1.27624},
+{0.54771,0.780566,-0.700793,-0.0941897,-0.249153,0.86415,-0.526145,-0.158947},
+{0.85722,-1.13864,1.22327,-1.00657,0.853839,-0.500176,0.387834,-0.441136},
+{1.68742,-0.550748,-0.00496669,-0.248964,-1.09646,0.764707,-0.0581457,0.983536},
+{-0.707666,0.235561,0.177931,-0.0723507,0.046967,-0.68158,1.07559,-0.559047},
+{-0.958209,1.92612,-2.4095,1.96718,-1.04427,0.421013,-0.146408,0.0179443},
+{0.438816,-1.08438,0.371133,1.90331,-2.0377,-0.144749,1.0836,-0.514162},
+{-0.27433,0.352857,-0.27637,0.235397,1.16675,-0.45787,-1.69686,0.482386},
+{-0.00931343,1.00833,0.280995,-0.778772,-0.0865933,0.289307,0.117455,-0.700368},
+{0.00978616,-0.45048,-0.751424,-0.831772,-0.713027,-0.428945,-0.117405,0.0312913},
+{-1.23622,-1.30226,1.90109,-0.480832,0.517627,-0.283442,0.161226,-0.257945},
+{-0.403327,-1.86558,0.96299,0.602585,0.268939,0.312367,-0.831423,0.241979},
+{-1.52462,1.4828,-0.139471,-1.2987,2.08741,-1.83485,0.801501,-0.199372},
+{-1.7087,1.05622,-0.719034,0.595955,0.150102,-0.418227,0.378855,-0.298962},
+{-0.831553,1.26435,-0.817759,0.136107,0.633434,-1.27355,0.14499,1.14746},
+{-0.0548873,0.0629688,-0.007443,-0.402829,-0.611543,-0.355323,1.03612,1.97612},
+{0.208204,-0.318556,-0.78472,-0.210038,0.550049,0.577961,0.849291,-1.50292},
+{-0.826247,1.52588,1.15734,-0.695025,-1.02353,-0.444536,0.316225,0.524036},
+{0.496715,-1.84044,2.34137,-0.732666,-0.506386,0.115263,0.519602,-0.464887},
+{-0.152798,-0.288771,-0.224395,1.79601,0.156122,-1.73107,-0.614727,0.900547},
+{-0.0570198,-0.45008,-0.201055,1.33692,-0.00818177,-1.754,1.37879,-0.802225},
+{0.251855,-0.661135,0.102358,1.18683,-1.01203,0.950089,-0.660648,-0.877133},
+{0.419742,-0.550721,0.782043,-0.999856,0.00661946,0.355032,0.457561,-0.651773},
+{-1.19472,0.768997,0.314892,-0.452807,-0.285333,1.36792,-1.52001,0.50124},
+{1.46558,0.248533,-0.281515,-1.22668,-0.202785,1.08679,0.289808,-0.405711},
+{0.691927,0.629623,0.719731,0.576126,0.363307,0.24202,-0.0248906,-0.355947},
+{0.0793808,-0.45343,0.693865,-0.414973,1.25837,-1.95039,0.990986,-0.526408},
+{0.355989,-0.767646,1.20443,-0.33776,-1.78109,2.48755,-1.279,0.25911},
+{0.167765,-0.239271,-0.118447,-0.00356239,0.471051,-0.963292,0.599332,0.852801},
+{-0.557152,2.0999,-0.6467,0.0094419,-0.856616,0.36529,-0.353258,0.300339},
+{0.0287632,-0.101162,0.389587,-0.946843,1.7299,-2.30151,0.713646,1.21695},
+{0.369546,-0.484798,0.627001,-0.656153,0.0350266,0.0813163,-0.810768,2.10609},
+{0.236748,-0.484631,0.27403,0.921822,0.138623,-0.426377,-0.902665,-0.269194},
+{-1.19224,-0.962501,-0.529275,-0.0519859,0.428208,1.1053,1.03534,1.22154},
+{0.460549,-0.572452,1.27545,-2.25733,1.55997,-0.1403,0.0640424,-0.405826},
+{1.93621,-0.407378,-1.91993,1.60298,-0.598263,0.453523,-0.594346,0.316522},
+{0.363193,-0.528015,0.377832,0.00387076,-0.307826,-0.374493,1.95376,-1.75422},
+{-1.61188,1.6703,-1.35452,1.24154,-1.23192,1.17797,-1.07811,0.914753},
+{0.235385,-1.66247,1.53514,-0.152079,0.693066,-1.32379,0.352427,0.342918},
+{0.205656,-0.63306,1.6765,-2.6087,0.973021,1.20355,-1.24018,0.795465},
+{-1.61788,1.64629,0.74972,-1.64132,0.247926,0.788011,-0.277731,-0.564425},
+{-0.178542,0.975865,1.36504,0.605202,0.279049,-0.702686,-0.782991,-0.955907},
+{-1.09634,0.235237,1.45837,-1.52366,0.538037,0.448417,-1.00686,0.8179},
+{1.72211,-1.58925,0.124151,0.78588,-1.01043,1.4449,-1.50575,1.00148},
+{-0.724934,0.979493,-0.574594,-0.187569,0.799744,-0.459896,0.392346,-0.898628},
+{0.367945,1.10301,-2.75296,0.790286,0.909425,-0.324554,0.543948,-0.769149},
+{0.81561,0.612573,-1.78297,-0.0181507,1.15763,0.385052,-1.35976,0.428108},
+{0.358869,-0.190559,0.155686,-0.146829,0.0581433,0.0510073,-0.381384,0.859315},
+{-0.123154,0.637588,-1.27007,1.01945,-0.89072,1.41577,-0.288982,-1.37218},
+{-2.71058,0.709789,1.43599,-0.509717,0.0739017,-0.335023,0.408763,-0.2201},
+{1.30385,-1.51854,0.655852,-0.30197,0.79601,-0.330205,-0.960843,1.18232},
+{-0.173909,-1.27521,0.0589972,1.22446,-0.360459,-0.729865,0.513611,0.56054},
+{-0.0626646,0.451308,-1.52523,2.64031,-1.7183,-0.268473,0.792017,-0.639967},
+{0.870448,0.148502,-1.01141,0.826325,-0.958245,1.36004,-1.20762,0.623577},
+{1.28866,-1.44425,0.0228247,0.485897,0.830735,-1.45109,0.507881,0.105469},
+{0.435497,-0.652784,-0.277197,0.781748,-0.582245,0.357879,-0.645425,1.38356},
+{0.247282,-0.0327218,-0.11161,0.155299,-0.749809,0.746805,0.43272,-0.784231},
+{0.0714005,-0.268582,0.145175,-0.138588,0.255298,-0.114775,0.34768,-0.384949},
+{0.43903,0.130896,0.988891,-1.44683,0.4055,-1.0705,0.989019,-0.131198},
+{0.4577,-0.427607,-0.0614479,-0.146839,0.191822,0.597586,-0.485025,-0.388799},
+{-0.335948,0.353609,-0.747995,0.291055,1.37924,-1.33043,1.15381,-1.67812},
+{-0.989683,0.625074,-0.0778378,-0.340865,-0.33346,0.230002,0.403819,0.477557},
+{0.14565,-0.404904,0.273059,-0.416658,1.95196,-1.42584,-0.49063,0.108328},
+{-1.1262,-0.13939,0.562326,0.727827,-0.567528,-0.504749,-0.270196,1.24925},
+{-0.990142,-1.11542,-0.138835,0.61787,0.908306,0.788817,-0.0957151,-0.918624},
+{-0.0235056,-0.157271,0.063128,0.395148,-0.762091,1.04918,-0.830172,0.316649},
+{0.115378,-0.82175,1.38298,-1.17937,0.747692,-0.697063,1.27943,-1.54769},
+{0.394083,-0.956974,-0.581074,0.691146,0.601444,0.809968,-1.55567,0.307848},
+{0.104302,-0.593964,0.457925,0.024072,1.12012,-0.425938,-0.146674,-1.6005},
+{0.160713,0.234544,-0.794123,0.877319,-0.181354,0.0100382,-0.654582,0.642497},
+{0.524662,-1.23087,-0.373431,1.41874,-0.283687,-0.0486,0.589547,-1.26964},
+{0.471963,1.31828,-0.405811,-1.33217,0.752682,0.128462,-0.726904,0.392052},
+{-0.847461,-0.164374,0.305761,-0.29954,-0.351696,1.3214,-0.22679,-0.591964},
+{-0.764894,-0.829154,-0.928064,-1.01054,-1.06317,-1.05044,-1.05841,-0.827674},
+{-0.468085,-0.395037,2.63392,-2.17959,0.108921,0.0273252,0.1661,-0.0373422},
+{1.02372,-0.85316,0.693515,-0.0577424,-0.362238,0.530536,-0.967208,0.546717},
+{-1.17976,2.00699,-1.78303,0.149285,1.35891,-1.42485,1.10451,-0.846926},
+{-1.27017,1.14332,-1.06758,1.12939,-0.868347,0.467349,0.0736982,-0.233703},
+{0.314298,0.119425,-0.813541,-0.173892,0.727782,-0.0581365,-0.247147,0.289139},
+{0.271921,0.688139,0.0739593,-0.0489587,-0.989966,0.31026,-0.515652,1.22497},
+{-0.0308744,0.137674,-0.383893,0.5618,-0.816922,0.867878,1.24748,-2.98244},
+{0.0232713,-0.099464,1.19157,0.220304,-2.28117,0.240001,0.503178,0.52009},
+{1.73098,-1.36649,0.969228,-0.832226,0.0764266,0.243979,-0.0546312,0.136866},
+{1.42784,-0.537749,-0.98456,1.25826,-0.4914,-0.920662,0.88185,0.10232},
+{-0.914246,-0.393666,1.20398,0.362567,-1.28826,-0.270738,1.66147,-0.95231},
+{0.0128524,0.203289,-0.48053,0.556404,-1.96368,1.25166,0.481317,0.621621},
+{0.650609,-0.792496,0.569234,-0.409774,0.618518,-0.267145,-0.269083,0.00702847},
+{-0.0208627,0.029497,-0.250048,0.360009,-0.52451,2.02831,-2.13705,-0.543912},
+{1.13017,1.12302,0.124345,-1.11406,-0.762453,-0.0612998,0.769054,0.693574},
+{-0.395958,0.185669,0.695053,1.04448,1.03833,0.71477,0.296279,-0.0830649},
+{-0.385025,0.323759,0.199235,-1.8413,2.89012,-0.963096,-0.608427,0.399511},
+{-0.699273,-0.406683,1.01418,-0.380203,-0.550898,0.709438,-0.640517,1.02094},
+{-1.05567,0.856309,0.207669,1.19108,-0.674837,-1.26416,0.511314,-0.154688},
+{-2.45163,1.33761,-0.149024,0.319286,-0.482461,0.446997,-0.383378,0.443883},
+{-0.289696,0.0225092,1.04979,-0.0931446,0.270895,-1.05128,-0.77503,1.0256},
+{0.655452,-0.813847,0.592232,-0.356535,0.398648,0.361587,-2.31318,2.42731},
+{-1.05229,-0.953932,1.54043,1.46279,-0.702191,-0.621411,-0.250451,-0.0984455},
+{0.103785,-0.338051,-1.28018,-0.651623,0.554185,1.47449,0.336593,-0.0415538},
+{2.06049,-2.45557,1.56466,-0.93952,0.758158,-0.644827,0.447731,-0.356249},
+{0.229015,-1.13651,-1.13334,0.800312,-0.0716052,0.880342,0.281838,0.14337},
+{-0.319658,0.374246,-0.391248,0.516895,-0.0891885,-1.58099,2.86921,-1.71883},
+{-0.473221,0.801111,-0.937774,1.0365,-1.01752,0.891192,-0.755388,0.504709},
+{-0.781849,-0.237547,1.49648,-0.141632,-0.772626,-1.13179,0.984911,0.607758},
+{1.2287,-1.70636,1.59547,-0.895932,-0.335896,1.17881,-1.44403,1.34501},
+{-1.39414,1.60416,-0.509648,-1.10052,1.16427,0.362957,-0.952139,0.701684},
+{0.31585,0.655331,0.78357,0.153365,-1.07917,-1.17807,-0.815293,0.214337},
+{-0.236259,0.623321,0.0262398,-0.107734,0.28034,-0.513134,-0.137951,0.204134},
+{2.04232,-1.44013,-0.396428,0.678398,-0.306784,0.598476,-0.477067,-0.152672},
+{-2.55143,1.92957,-0.28986,-0.319236,0.537924,-0.578873,0.727215,-0.724602},
+{-0.445963,1.09034,-1.87403,1.84694,0.0440654,-1.66602,1.56841,-0.856787},
+{0.0833537,0.407029,-0.0462523,-1.3743,0.783863,1.91982,-1.45008,-0.618501},
+{-0.321529,0.423022,0.0285909,-0.568847,0.255271,0.542552,-0.708852,0.120235},
+{0.249996,-0.0468139,-0.175798,0.108097,-1.29759,2.69819,-0.456493,-1.5509},
+{-0.59247,-0.239416,0.893067,0.18686,-0.501434,0.238085,0.135637,-1.38587},
+{0.262328,-1.10677,1.44944,-0.788468,0.128698,-0.164082,-0.136826,0.865241},
+{0.201361,0.0346458,-0.150936,0.245154,-0.25686,0.0270444,-0.0517198,0.146995},
+{-0.326535,0.455698,-0.732582,1.26098,-1.38958,-0.17721,2.26549,-1.93569},
+{0.0758253,-0.375995,-0.627808,2.44457,-1.56262,0.4136,-0.767062,0.558665},
+{1.4014,-0.635891,0.228084,-1.15277,0.968368,-0.678335,0.264089,0.693044},
+{-0.0490561,0.19573,-0.312043,0.278369,-0.427275,1.50248,-2.79131,1.9453},
+{-0.241093,0.946298,-0.774659,0.37548,-0.449473,0.0203474,0.55758,-0.545975},
+{0.497657,0.0504752,-0.441433,0.323508,0.709647,-0.963119,0.17311,-0.312605},
+{0.0359908,0.199813,0.168475,-0.875459,0.981571,-0.541282,0.222532,-0.349164},
+{1.02136,-1.16602,0.805119,0.0808688,-0.3557,0.376157,0.197368,-1.28879},
+{0.0309408,-0.219971,0.383592,-0.527572,0.328179,-1.5434,2.32087,0.485879},
+{-1.42174,0.0387132,-0.846176,1.08978,0.0891616,0.911561,-0.692293,0.154938},
+{-0.361534,-0.959341,-0.300269,0.592439,0.957861,-0.587767,-0.481786,0.95083},
+{0.161472,0.381139,-0.76796,0.420304,0.259453,-0.141063,-1.45148,1.99617},
+{0.0870304,0.132424,-0.0960952,-0.0151293,0.0346649,0.955027,-0.443561,-2.40646},
+{-0.465193,0.413117,-0.601793,0.417383,-0.510929,0.520364,-0.170424,0.243003},
+{0.398663,-0.717644,0.522672,-0.48965,0.58436,-0.714978,0.996939,-0.535405},
+{0.374048,-0.0803236,-0.156354,-0.592202,-0.282134,1.4928,-1.04714,1.12237},
+{0.190523,0.1553,0.205871,-0.371482,0.2495,-0.488019,0.825242,-1.51682},
+{0.796455,1.31509,-1.94596,1.20682,-1.02987,0.433834,0.0484086,-0.0922756},
+{0.861832,-1.97735,1.09111,0.47717,-0.321116,-0.715102,1.09177,-0.491276},
+{0.556855,-0.564641,-0.0529615,-1.09224,2.03057,0.4033,-1.3476,0.219817},
+{0.12204,0.0412989,0.141986,-1.78356,1.0858,0.797611,0.420235,-1.09857},
+{-1.32069,-1.20914,-1.09241,-0.759317,-0.45396,-0.11282,0.107443,0.310919},
+{-1.19673,-0.0905202,1.61845,-1.63183,1.28701,-1.08709,0.483277,-0.0211302},
+{0.564287,-1.5379,1.10191,0.816559,-0.740138,-0.582553,-0.526237,1.44775},
+{-1.30418,1.3012,0.646819,-1.45636,0.613051,-0.87134,1.33934,-0.909473},
+{-0.900878,0.315851,-0.428203,0.937324,-0.167457,-0.113045,0.616898,-1.68079},
+{-0.0669702,1.18952,-1.60053,-0.546622,2.09582,-0.979843,-0.32923,0.520811},
+{1.09128,-0.702257,0.645302,-0.200451,-0.802757,-0.738322,0.826659,0.710714},
+{0.620825,0.400624,-1.13111,0.802342,-0.236524,-0.371856,1.0588,-1.42986},
+{-1.52181,1.04283,0.115272,0.211093,-1.23587,0.28851,1.11643,-0.600859},
+{0.886367,-2.03204,2.15264,-1.56942,0.723948,0.158425,-0.533818,0.465203},
+{0.0948026,-0.0912596,-1.85353,2.46516,0.149148,-0.586156,-0.0527264,-0.310762},
+{-0.0866794,0.317285,-0.385386,0.800917,-1.36774,-1.04078,2.24208,0.0619538},
+{0.987403,-1.72843,1.26182,1.02583,-2.02822,1.12051,-0.462622,0.280553},
+{1.0236,0.00277632,0.0473698,-0.391849,-0.0260833,-0.141368,0.177455,-0.0719747},
+{-0.00215676,-0.0765268,0.366074,-0.0488573,0.10162,0.540837,-1.80472,0.924485},
+{0.719572,1.51266,-1.40617,-0.893601,0.353804,0.659474,0.24891,-0.78639},
+{1.01615,1.20426,1.15431,1.06438,0.94283,0.844864,0.692725,0.587284},
+{0.116462,-0.361194,0.979396,-1.96405,2.42381,-1.76344,1.10846,-0.757678},
+{0.543279,-0.391399,1.47071,-1.5779,-1.18706,1.2103,0.0412517,0.542754},
+{0.0827536,0.251345,-0.607966,-0.50705,0.154363,0.0534162,1.03943,0.0782242},
+{-0.639011,2.18034,-2.33022,0.408001,0.310316,0.216875,-0.340827,0.101468},
+{0.126978,-0.299316,0.349727,-0.280332,0.398372,-1.29703,0.126853,2.71621},
+{-0.0788168,0.0963882,-0.0479059,0.156114,-0.505209,0.537452,-1.46315,3.21756},
+{-1.26663,-0.252486,0.395706,1.27206,0.880052,-0.474248,-1.00664,-0.823162},
+{-1.02777,-0.356383,-0.745411,-0.0231536,0.981643,0.362754,0.821933,-0.186537},
+{0.555239,-1.62077,2.29124,-2.02853,1.44291,-1.06638,0.816186,-0.432567},
+{1.7973,0.348741,-1.59588,-0.105374,0.169774,-0.0817887,0.461951,0.1923},
+{-0.0141573,-0.135093,0.21051,-0.263466,0.534794,-0.667855,1.61824,-3.12629},
+{-0.579172,1.37501,-1.28029,0.277605,-0.245335,1.15783,-1.48849,0.668326},
+{-0.349397,-0.552745,0.638105,0.225481,0.166531,-0.815542,0.108558,-0.0730587},
+{0.0341641,-0.897979,1.33365,-0.868428,0.159274,1.06436,-0.982121,-0.366611},
+{-0.229258,0.905604,0.197496,-1.83561,-0.298277,1.02764,0.403903,0.398066},
+{1.405,-0.0415415,1.40215,-0.441236,0.13259,-0.86658,-0.236737,-0.343177},
+{-0.798341,-0.356562,0.58701,-0.675452,1.14497,0.131345,-0.603211,-0.107221},
+{1.50714,-1.0157,-0.612709,1.73289,-2.08023,1.46185,-0.380682,-0.0204742},
+{-0.094233,0.958528,-0.694363,-1.44011,1.73539,-0.932163,1.07873,-0.780212},
+{-0.0399595,1.18105,-1.42419,0.792929,0.428328,-0.686644,-0.106974,0.0184599},
+{1.66495,-0.302196,-0.844435,-0.584563,1.05909,0.581701,-0.531045,-0.714313},
+{-0.527967,-0.463837,-0.0313296,0.0603616,0.161663,0.263482,-0.144797,0.41637},
+{-0.306041,0.813033,-0.510282,1.00207,-0.181614,0.212771,-0.94552,-0.855241},
+{-1.35473,0.516612,0.530655,-0.335543,0.145048,-0.00939396,-0.0577425,-0.41273},
+{0.249532,-0.761677,1.3089,-1.75131,1.65852,-0.854403,-0.571145,1.26468},
+{0.0927833,-0.0137735,-0.097661,1.38898,-1.57679,-0.823795,0.519648,1.1486},
+{0.06601,0.165564,-0.993424,1.34508,-0.929114,0.131292,0.414036,-0.321453},
+{1.05058,-0.0251656,-0.275223,0.810499,-1.07563,0.309334,-0.221293,0.120445},
+{1.7515,-0.904356,0.227023,-0.351433,0.4153,-0.587257,0.845524,-0.948248},
+{0.330915,-0.580423,0.443403,0.641431,-1.40279,1.24292,-1.60405,1.4948},
+{1.68296,-0.64285,-0.566919,0.470661,-1.01202,0.57242,0.846119,-0.836062},
+{-0.447563,0.183039,-0.21687,0.163946,0.0784782,0.0751411,-0.0175558,-0.559718},
+{-0.29594,-0.159857,0.711292,-0.958151,0.417658,-0.282688,0.346357,0.555407},
+{1.09956,-1.17367,0.388148,-0.438466,-0.468689,1.82764,-0.675887,-0.475472},
+{0.388376,0.170336,-0.566452,-0.0468293,0.533737,-1.28383,1.56888,-0.489071},
+{-1.22709,1.4309,-0.680496,-0.149256,-0.192179,0.945096,-0.00887793,-1.04822},
+{-0.374513,0.425454,-0.935779,0.594377,1.90528,-2.34267,0.389767,0.0491996},
+{-0.830489,0.749176,0.327665,0.672398,-0.466695,0.024338,-0.856199,0.236828},
+{0.187119,-0.809194,-1.16195,0.848695,1.6578,-0.0615273,-0.703682,-0.719895},
+{-0.750323,-0.161095,0.0949979,0.980169,-0.974555,0.173864,0.236767,-0.180966},
+{0.287195,-0.297173,0.451272,-0.737058,1.05233,-1.69319,2.36518,-1.86979},
+{1.73148,-0.121871,-0.451267,-0.227752,0.189548,0.453515,-1.11514,0.867294},
+{-1.01936,-0.184087,0.503129,-0.634395,1.19479,-0.901918,1.01046,-1.03504},
+{-0.0696536,0.867389,-2.24691,1.86323,-0.376854,0.427633,-1.02926,1.00152},
+{0.40655,-0.256176,0.124463,0.555583,-0.610896,-0.483742,0.791806,-0.622593},
+{-0.156833,0.317132,-0.100818,-1.01491,1.11193,-0.329745,-0.52192,1.4425},
+{-0.378877,0.216637,1.292,-1.49789,-0.616441,1.87334,-0.385532,-1.01914},
+{0.368546,0.235754,-0.0152339,-0.321076,-0.527931,-0.992117,-1.06036,-1.25044},
+{-0.797651,0.157626,1.24115,-1.20486,-0.165027,0.179002,0.932803,-0.787738},
+{0.447907,-1.01891,0.743487,0.24333,-0.853308,0.531297,0.00885212,0.0753956},
+{-1.21031,1.0025,-0.534527,0.309691,0.438386,-1.58902,1.55208,-0.479541},
+{-0.951118,0.995838,-1.06264,1.2223,-0.762608,-0.34177,-0.114006,1.06023}};
diff --git a/libspeex/exc_gains_table.c b/libspeex/exc_gains_table.c
deleted file mode 100644 (file)
index 2e333b9..0000000
+++ /dev/null
@@ -1,256 +0,0 @@
-float exc_gains_table[256][5] ={{0,0,0,0,0},
-{0.972275,0.402021,0.401929,0.800834,0.604032},
-{0.521341,0.482969,1.30015,1.34672,0.515598},
-{0.704136,0.254923,0.225597,0.415044,0.237654},
-{0.118532,0.108211,0.109704,0.214159,1.19587},
-{0.953394,1.35646,0.73601,0.449876,0.37701},
-{0.963726,1.14754,0.602996,1.3777,1.33},
-{0.162504,0.137945,0.137239,0.169084,0.713126},
-{0.214615,0.694716,0.250157,0.217016,0.217004},
-{0.578935,1.3047,1.45514,0.591551,0.577459},
-{0.201417,0.191737,0.21526,0.713748,0.534357},
-{0.604835,0.353747,0.950318,0.577202,0.396275},
-{0.226098,0.218205,0.309687,1.34379,0.776054},
-{0.550915,0.635746,0.728705,0.409734,1.45305},
-{0.617468,0.808439,0.467973,0.712037,1.35797},
-{0.354373,0.635841,0.327349,0.564778,0.634233},
-{0.262291,0.24096,0.269297,0.878703,0.846369},
-{0.28283,0.272303,0.523589,0.71841,0.2801},
-{1.08446,0.799391,0.34672,0.451512,0.573106},
-{0.770633,1.19025,0.574476,0.906406,0.924732},
-{0.527886,0.712326,0.529878,0.527529,0.368671},
-{0.55169,0.461453,0.633219,1.04547,1.00062},
-{0.911447,0.416008,0.304148,0.419643,0.310092},
-{0.944921,0.627332,0.591817,0.875507,1.13378},
-{0.723674,0.253275,0.226479,0.235247,0.459685},
-{0.356184,0.654919,0.56119,0.330236,0.659618},
-{0.640447,0.784999,1.39964,0.507196,0.740835},
-{1.37257,0.909719,1.4253,1.35887,0.766594},
-{0.993756,0.368664,0.690089,0.599319,0.44539},
-{0.459005,0.430932,0.70052,0.507022,0.308046},
-{1.35867,0.877721,0.593717,0.917338,0.960946},
-{0.416514,1.39948,0.646887,0.363254,0.355859},
-{0.461567,0.436086,0.433055,1.36922,1.37312},
-{0.515051,0.701988,0.27593,0.258721,0.227499},
-{0.743553,1.35648,0.519104,0.460778,0.79189},
-{1.13341,0.488553,0.876964,0.538191,1.18897},
-{0.477589,0.87371,0.947462,0.855027,0.846926},
-{1.15928,0.477267,0.460651,0.800718,0.897817},
-{0.633649,1.05231,0.916455,0.509586,0.408965},
-{1.42703,0.547723,1.31581,0.90651,0.674567},
-{0.721091,0.332845,0.305928,0.526756,0.518563},
-{0.985646,1.19475,1.27664,0.712838,1.41057},
-{0.526615,0.514881,1.30318,0.457125,1.25301},
-{0.972529,0.700516,1.01761,1.42166,0.748644},
-{0.781448,1.21869,0.346365,0.348731,0.330229},
-{0.356117,0.357101,0.29171,0.325432,1.40351},
-{0.665768,0.576301,0.293516,0.465485,0.321017},
-{1.405,1.21953,0.579994,0.825537,1.34119},
-{1.00666,1.15496,0.446585,0.775017,0.4598},
-{0.935681,1.35373,0.937677,0.660844,0.81937},
-{1.40872,1.32346,0.919368,0.548001,0.999682},
-{1.12925,0.318703,0.294389,0.357727,0.613218},
-{1.41962,0.849738,1.04838,0.534462,1.37598},
-{1.46394,0.741556,0.399826,0.427772,0.426526},
-{0.947719,0.384231,0.420101,1.2868,0.523767},
-{0.726275,0.885338,1.31427,0.889976,1.0509},
-{0.718514,0.31327,0.240932,0.27535,0.750046},
-{1.32024,1.40172,0.932446,1.32921,1.45059},
-{0.511618,0.887083,0.564702,1.24288,1.21622},
-{0.344737,0.338843,0.725848,0.303817,0.469897},
-{0.680904,0.577025,0.308699,0.273644,0.559625},
-{1.40113,0.854853,0.549732,1.41536,0.949144},
-{0.66197,0.763205,0.857623,0.579795,0.692197},
-{0.287785,0.950849,0.745611,0.39432,0.355838},
-{0.997249,1.10924,0.880485,0.913087,1.06778},
-{0.318554,0.697328,0.527362,0.26532,0.265273},
-{0.570326,1.12066,0.446756,0.420497,1.17891},
-{1.37359,0.543468,0.871405,1.37365,0.572593},
-{0.423868,0.981704,0.510652,1.20006,0.419747},
-{0.473503,0.380938,0.657541,0.976714,0.382061},
-{1.42241,0.99629,0.486159,0.9234,0.498345},
-{0.380047,0.933421,1.33968,0.495083,0.377593},
-{1.33858,1.38662,1.07671,0.521677,0.551401},
-{0.525712,0.566488,0.608423,0.610011,0.712988},
-{1.3264,1.36154,1.34812,1.35304,0.689819},
-{0.328145,0.515172,0.293175,0.743057,0.340295},
-{0.179465,0.193377,0.704852,0.271414,0.21437},
-{1.01473,0.966375,0.443888,0.664939,1.05215},
-{0.313297,0.259347,0.240959,0.248981,1.01725},
-{0.51173,1.03144,0.814328,0.397627,0.88187},
-{0.403561,0.437586,1.36324,1.04097,1.24388},
-{1.11891,0.779818,1.35237,0.66367,0.9601},
-{0.695845,0.215196,0.174613,0.156823,0.164481},
-{0.694936,0.475279,0.82149,0.367273,0.659572},
-{1.00446,0.65876,0.688924,0.535484,0.775218},
-{0.488051,0.394564,0.412371,0.401268,0.709179},
-{0.419085,0.932623,0.39922,0.681645,0.344296},
-{1.38096,0.469823,0.767079,1.07721,1.09368},
-{0.858307,0.599978,1.34487,0.747092,1.41773},
-{0.867299,0.813551,0.438826,0.769831,0.685497},
-{0.676983,0.541416,0.917202,1.00752,0.716101},
-{0.509423,0.511131,0.888426,0.85971,1.33703},
-{0.233598,0.210134,0.269673,1.01355,0.400707},
-{0.531641,0.683755,0.491125,1.35098,0.708454},
-{1.04524,0.798053,0.471229,1.38981,0.562417},
-{0.570377,1.29303,1.30446,0.509441,1.11081},
-{0.731226,0.479167,0.367961,0.592231,0.863689},
-{0.719602,0.273401,0.4243,0.241497,0.235092},
-{1.39416,0.870226,0.496218,0.434202,1.05746},
-{1.18606,0.641133,0.334742,0.254625,0.261298},
-{0.318896,0.636718,0.458728,0.980523,0.599414},
-{0.581572,1.38305,0.956477,1.00986,0.847895},
-{0.944455,0.951589,1.10851,0.933021,0.637479},
-{1.41789,0.544071,0.415516,1.00899,0.548907},
-{0.310431,0.482505,0.24913,0.25783,0.734969},
-{1.42007,0.573146,0.504549,0.545169,1.41059},
-{0.394208,1.00389,0.771047,0.783679,0.479258},
-{1.39133,0.348961,0.284455,0.278966,0.283467},
-{0.755718,0.774018,0.728182,0.749738,0.933789},
-{1.00362,0.637714,1.01352,0.975032,1.00686},
-{0.35057,0.943689,0.278791,0.26342,0.244554},
-{1.38077,0.988684,0.782604,1.12476,1.42002},
-{0.932468,0.763109,1.45482,1.01663,0.577551},
-{0.50868,0.958474,0.51353,0.46611,0.637675},
-{0.240751,0.21715,0.215419,0.442746,0.724527},
-{0.845799,0.708941,0.261522,0.235763,0.236392},
-{0.70726,0.32005,0.536322,0.538214,0.294454},
-{0.883629,0.429025,0.747476,1.04414,0.432173},
-{0.459398,1.44193,1.01607,0.596322,0.529043},
-{0.759138,0.599769,0.754105,0.682876,0.419982},
-{0.746836,0.413024,0.359393,0.334954,1.40898},
-{0.774368,1.43343,1.12543,1.24132,1.32189},
-{1.33443,1.19093,1.44996,0.71621,0.863739},
-{0.593881,0.977409,0.936586,0.749974,1.30699},
-{1.02393,0.600096,1.416,1.33026,1.05845},
-{0.810553,0.262657,0.298729,0.77788,0.292396},
-{1.42747,0.460729,0.39096,0.463481,0.797837},
-{1.04254,0.824864,0.836904,0.799879,1.43965},
-{1.39711,0.481567,0.78444,0.798873,0.520114},
-{0.773335,0.483008,1.13145,0.585621,0.827946},
-{0.364525,0.412386,0.873931,0.831505,0.766241},
-{1.31611,1.41568,1.07089,0.822162,1.40385},
-{0.721388,0.551004,0.511029,0.480886,0.518742},
-{0.750012,1.32407,1.40478,1.41808,0.727873},
-{0.244528,0.300501,1.41808,0.583474,0.40588},
-{0.556924,0.808786,0.296311,0.384897,0.817433},
-{0.629217,0.660837,0.370047,0.679343,0.567673},
-{0.94669,0.542862,0.595309,1.39103,1.08608},
-{1.34439,1.38548,0.785918,0.872008,0.536333},
-{0.722287,0.560385,0.502034,0.26883,0.268874},
-{0.264549,0.286265,1.04868,0.340979,0.313366},
-{1.14687,0.958048,0.797669,0.759675,0.751111},
-{1.16042,1.42116,0.578728,0.993924,0.919367},
-{0.275215,0.265237,0.433743,0.284551,0.70771},
-{0.724508,0.684652,0.537697,0.389112,0.785042},
-{0.461,1.04549,1.31324,1.03516,0.523672},
-{0.449075,0.230555,0.220253,0.239218,0.714746},
-{1.07101,0.494466,1.43273,0.505434,0.557922},
-{0.651872,1.40048,0.629312,0.877823,0.478932},
-{0.314476,0.519758,0.944989,0.761632,0.344989},
-{0.586573,1.41873,0.818594,0.688533,1.2816},
-{0.614926,0.340379,0.663732,0.655486,0.578881},
-{1.39413,1.38174,0.870428,1.36998,1.01329},
-{0.427563,0.410732,1.01906,1.37567,1.00929},
-{1.1838,1.09413,0.845674,1.35539,0.729601},
-{0.928725,0.912421,0.948423,0.530318,1.00982},
-{0.716725,0.376622,0.300712,1.04899,0.989422},
-{0.342032,0.611919,0.768187,0.534886,0.536425},
-{0.977419,0.818639,0.484332,0.41841,1.37715},
-{1.4191,0.934955,0.98809,0.963722,0.497427},
-{0.443494,0.357365,0.356933,1.28602,0.380011},
-{1.03689,0.58904,0.593161,0.361587,0.487857},
-{0.62685,0.747246,0.921829,1.33748,0.421531},
-{0.734763,0.992225,0.963457,1.3243,1.40383},
-{0.717794,0.950892,0.57157,0.651529,0.401774},
-{1.35902,0.777653,1.12951,1.43847,1.29577},
-{0.826427,0.984049,0.785996,0.85149,0.597338},
-{0.324075,0.321327,0.499794,0.696533,0.633254},
-{0.699647,0.447185,0.233461,0.207025,0.23467},
-{1.26334,1.39869,0.482715,0.470843,0.736274},
-{0.512698,0.394565,0.406443,0.702691,1.36402},
-{0.34558,0.630122,0.956569,0.321373,0.277504},
-{0.983792,0.30269,0.212727,0.208796,0.215945},
-{1.35273,0.898547,0.886606,0.458719,0.428321},
-{0.914928,1.41073,1.23423,0.975644,0.51781},
-{1.42053,0.786283,1.00712,0.68441,0.883851},
-{0.747769,0.527418,0.703172,0.475628,1.12847},
-{1.32767,0.621679,1.2657,0.925819,1.39837},
-{0.219846,0.228227,0.777264,0.578013,0.388584},
-{1.03874,0.597391,0.388152,0.335099,0.987358},
-{0.626982,0.679977,0.644919,0.897948,0.605773},
-{1.10456,0.94846,0.479339,0.350068,0.289616},
-{0.515314,0.303562,0.281381,0.649247,0.686618},
-{0.734309,0.867893,0.362538,0.37835,0.4413},
-{1.09491,0.393134,0.391774,0.53094,1.30489},
-{0.600756,0.648178,0.722097,0.351113,0.407224},
-{0.4166,0.55147,0.939187,0.452547,0.998761},
-{0.695608,0.31667,0.542135,0.309059,0.491431},
-{0.481968,0.255664,0.730779,0.283866,0.249101},
-{1.24082,0.428159,0.371111,0.639324,0.35982},
-{0.290883,0.30027,0.99396,1.11201,0.398157},
-{1.08646,1.33951,0.638558,0.443313,1.28855},
-{0.899274,1.00716,1.41022,1.33737,1.41783},
-{0.553161,0.540097,1.42208,0.788474,0.398309},
-{0.813856,0.5877,0.992087,1.2488,1.38826},
-{0.750852,0.834514,0.788686,1.16453,0.945668},
-{0.974239,0.693244,0.617397,1.07156,0.707945},
-{0.5439,0.362043,0.598631,0.696378,0.962958},
-{0.698133,1.0455,0.731779,1.2708,0.65881},
-{1.41689,0.489073,0.635876,0.362636,0.338296},
-{0.981828,0.750206,1.06633,0.548349,0.549096},
-{0.954791,0.999911,0.656373,0.395426,0.738605},
-{1.37216,1.25162,0.484418,0.406661,0.34539},
-{0.417482,0.71854,1.03127,0.380905,0.581106},
-{0.524725,0.395229,0.650851,1.41219,0.698916},
-{0.429885,0.75674,0.558314,0.623743,0.99586},
-{0.381661,0.738759,0.312966,0.276511,0.482497},
-{0.392806,0.398552,0.565697,0.352257,0.999441},
-{0.447778,0.258217,0.241994,0.717681,0.297136},
-{0.798993,0.312859,0.588746,0.384457,0.789491},
-{1.00102,0.510132,1.08458,0.930362,0.423518},
-{0.404631,0.684262,0.340142,0.347804,1.12451},
-{0.58875,0.967233,0.610624,0.290556,0.298476},
-{1.35833,0.566374,0.84081,0.424704,0.798814},
-{1.31321,0.627276,0.518045,1.31765,1.39693},
-{1.38743,1.39732,1.1704,0.981091,0.976433},
-{1.11735,0.742696,0.627347,0.727904,0.413121},
-{1.01093,1.06099,1.15139,1.2511,1.01169},
-{0.427703,1.35269,0.36702,0.45199,0.570128},
-{0.837854,0.394956,0.76466,0.331732,0.295262},
-{0.909378,0.446163,0.794585,0.749216,0.786094},
-{0.344702,0.365015,0.329708,0.534921,0.961224},
-{0.38143,0.565635,0.597605,0.721197,0.41132},
-{0.875823,0.637858,0.404223,0.616252,0.324219},
-{0.397054,0.310093,0.746364,0.395879,0.711295},
-{0.264863,0.709984,0.401995,0.483187,0.318389},
-{0.507365,0.949016,1.27131,1.31729,0.93577},
-{0.550813,0.474785,1.3982,0.939911,0.833863},
-{0.712924,0.642765,0.371228,0.984357,0.380933},
-{0.899557,1.38033,1.38934,0.951007,0.986719},
-{0.60779,1.38202,0.713324,1.40317,0.835878},
-{0.852823,0.555799,0.549014,0.979552,1.47657},
-{1.36425,0.910603,1.31872,0.54743,0.477595},
-{1.41767,1.02304,1.3707,0.999278,1.30434},
-{0.576644,0.718734,1.05559,0.77462,0.471096},
-{0.698486,0.326327,0.310007,0.328323,1.07483},
-{0.550321,0.683533,0.395586,0.866495,0.904941},
-{0.794335,1.28904,0.584979,0.897343,1.44688},
-{0.683199,0.450746,1.23226,0.393307,0.377747},
-{0.242492,0.221403,0.299403,0.899992,1.28587},
-{0.877685,1.16576,1.27928,0.492245,0.497385},
-{1.04409,0.323209,0.465109,0.271362,0.300315},
-{1.37676,0.922592,1.00164,1.07654,0.89126},
-{0.496613,1.0732,0.482346,0.837521,0.751919},
-{0.169335,0.15668,0.203705,0.704017,0.251349},
-{0.567055,0.36419,0.40251,0.940086,0.600358},
-{1.15268,0.40942,1.01592,0.395888,0.384224},
-{0.262308,1.12019,0.408302,0.354161,0.32845},
-{1.43401,0.960675,0.575018,0.56046,0.68297},
-{0.565376,0.412315,0.408686,0.705626,0.376174},
-{0.91057,0.840437,0.807628,0.361432,0.34532},
-{0.928957,0.468982,0.355533,0.357671,0.653643},
-{0.248598,0.470228,0.704381,0.295403,0.241939},
-{1.33813,1.38385,1.40354,1.39387,1.31256},
-{1.11846,1.35294,0.568821,1.38766,0.550317},
-{0.315756,0.332599,1.18161,0.580827,0.694064}};
diff --git a/libspeex/exc_gains_wb2_table.c b/libspeex/exc_gains_wb2_table.c
deleted file mode 100644 (file)
index 6aca3b0..0000000
+++ /dev/null
@@ -1,256 +0,0 @@
-float exc_gains_wb2_table[256][5]={{-0.118248,-0.0903213,0.160174,-0.00123334,-0.21934},
-{0.0505919,-0.0288106,0.113996,0.0903071,-0.00984134},
-{0.113899,0.0433762,0.0882876,-0.0475371,0.054177},
-{0.0287272,0.0557836,-0.00316624,-0.00900847,-0.118819},
-{0.169872,-0.0428092,-0.187625,-0.0316026,0.192647},
-{0.0167698,-0.142869,-0.0351879,0.265943,-0.0151464},
-{-0.0439277,0.0326567,0.0561901,-0.0317043,0.0802247},
-{0.236985,0.0123511,-0.0784394,0.0999724,-0.000952686},
-{-0.142704,0.0920849,-0.0689582,-0.216057,0.145676},
-{0.0870207,0.0781122,0.162467,0.0399935,0.132958},
-{-0.128981,-0.0322974,0.0975815,-0.192499,-0.127642},
-{-0.102565,0.0270426,-0.127481,0.241065,-0.03122},
-{-0.031502,0.0855054,-0.042886,-0.0460144,0.130236},
-{-0.0942379,-0.0666479,0.018312,-0.0035047,0.101889},
-{0.119479,-0.0830763,0.103715,-0.103599,0.136849},
-{0.116035,-0.115112,-0.11395,0.0527047,-0.051518},
-{0.0851824,0.0296121,0.0979554,-0.0176937,-0.0838851},
-{-0.0112637,0.028357,0.0369974,0.0105319,-0.0231346},
-{0.121805,0.0930936,-0.00238656,0.0863224,-0.0727254},
-{-0.0432159,-0.0528344,-0.209758,-0.0481518,0.0781262},
-{0.0248402,0.0336596,0.0237071,-0.192787,0.13139},
-{0.126233,-0.072863,-0.0467142,0.0464679,0.109896},
-{0.170159,-0.17628,0.182159,-0.14398,-0.0677172},
-{0.191179,0.021901,-0.164383,0.211337,0.107637},
-{-0.160441,-0.129184,-0.164481,-0.0581384,-0.0482571},
-{-0.00853661,0.109003,0.0868082,0.0574961,0.0500668},
-{-0.109208,0.195432,0.113082,-0.188925,-0.0272042},
-{-0.0299113,-0.0692338,0.0743079,0.14364,-0.0928262},
-{-0.0594452,0.00192586,-0.0398129,0.0028896,0.0505964},
-{-0.194273,-0.181545,-0.100771,0.0257618,0.16813},
-{0.0232689,-0.165526,0.0938331,-0.0170004,0.0503893},
-{0.115822,0.0488415,-0.0185969,-0.100979,-0.113991},
-{-0.0881329,-0.154451,-0.150513,0.141348,-0.169259},
-{-0.0967658,0.0316989,0.15287,0.207056,-0.113766},
-{0.0288717,0.222654,0.0992637,-0.108253,0.203114},
-{0.149484,0.170655,0.0330888,-0.0228212,-0.13421},
-{0.151065,0.193866,0.0325463,0.109316,0.115277},
-{-0.0833898,-0.0723221,-0.108558,0.0713306,0.0150844},
-{-0.123702,-0.0347264,-0.0161615,-0.0769248,0.21856},
-{0.0850155,0.0358546,-0.111971,0.172465,-0.0381443},
-{-0.00562417,0.0637628,-0.0880934,-0.0930861,-0.0854997},
-{-0.0743979,-0.0691272,0.0790718,0.0997547,0.209345},
-{-0.0966082,-0.0529807,0.0990055,-0.0560605,-0.0616145},
-{-0.113037,-0.0149218,-0.194147,0.0931876,-0.0973557},
-{0.0333043,0.118144,0.0640649,-0.0455162,0.11294},
-{-0.150547,-0.203358,0.167846,0.165407,-0.0506945},
-{0.215828,0.0206265,0.127525,0.141395,0.0328834},
-{0.171978,0.199465,-0.148811,0.0608004,-0.0363784},
-{0.207549,0.0567694,0.00271488,0.111912,-0.225866},
-{0.0155828,0.149448,0.242043,-0.0861693,0.0510899},
-{0.0888324,0.10938,0.07555,0.0142276,-0.0216691},
-{0.0214858,0.171821,-0.0244336,-0.0760368,-0.0824601},
-{0.0414856,-0.00586913,-0.0997506,-0.00577843,0.120878},
-{0.206369,-0.201865,-0.0216558,0.130528,0.142588},
-{-0.183288,-0.192407,0.178432,-0.0646742,-0.0618598},
-{-0.049987,0.22806,-0.127391,0.179344,0.0497315},
-{-0.108284,-0.0479562,-0.0635562,-0.0832492,0.0205858},
-{-0.0948941,0.0868876,-0.0408448,0.226686,0.187384},
-{0.0251597,0.08785,0.071672,-0.141627,-0.133452},
-{-0.155272,0.231644,-0.0209745,-0.0133405,-0.062469},
-{-0.0836352,0.131699,-0.0986062,0.0511172,0.112163},
-{0.0893659,-0.193779,0.00118796,-0.179715,0.00102202},
-{0.119815,-0.0858676,0.0934043,-0.0284529,-0.0302291},
-{0.0310123,-0.00273832,-0.185191,-0.138868,-0.106802},
-{-0.00197316,-0.0625116,0.0356324,0.0373121,-0.0913948},
-{0.0469119,-0.115567,0.013378,0.0512016,-0.00884529},
-{-0.0054091,0.14038,0.0786078,-0.0434374,-0.0334637},
-{0.142066,0.103044,-0.0165019,-0.0255876,0.00274315},
-{0.186876,0.147007,-0.0810922,-0.139466,0.186235},
-{-0.0335924,-0.0913917,-0.00179792,0.134602,0.0222772},
-{-0.189227,-0.1338,0.0606105,-0.137663,0.0726223},
-{0.223312,-0.146251,-0.00913947,0.15792,-0.0921836},
-{-0.237208,0.0788275,-0.00364851,-0.137355,0.0177244},
-{0.113999,-0.0294367,0.112812,0.218815,0.197584},
-{-0.0923468,-0.0160347,0.0377776,0.00664991,-0.138003},
-{-0.0138741,0.0193135,0.0164956,0.20613,0.020337},
-{-0.0614057,0.0770052,0.00462154,-0.0770676,0.0117294},
-{-0.00976218,-0.0324956,0.0846505,0.0717681,0.089268},
-{0.197169,-0.0861648,-0.0393096,-0.202897,0.133087},
-{0.0543078,-0.025779,-0.0784255,-0.0383263,-0.071554},
-{0.00346738,0.0918708,0.0889084,0.0733931,-0.117767},
-{0.0180189,-0.00725124,0.12383,-0.0206228,0.0229105},
-{0.0540825,0.086697,0.111825,0.141422,-0.00640936},
-{-0.0735588,0.0334725,-0.135384,-0.00238102,-0.0119568},
-{0.0778553,-0.0388443,-0.0860914,-0.131339,0.0227053},
-{0.0266403,-0.0852892,-0.0992023,-0.00763189,0.0356529},
-{0.00799259,-0.103089,0.0501901,-0.0677319,-0.101507},
-{0.0489552,0.0960309,-0.181675,0.0209609,0.0690927},
-{-0.0350492,-0.0869723,-0.117222,-0.0763548,-0.03173},
-{-0.0203635,0.0408595,0.00286856,0.0968222,0.103525},
-{-0.113889,0.112892,0.0742673,0.0281804,-0.063894},
-{-0.141711,0.0132815,0.0191571,-0.0186625,-0.00306751},
-{-0.0267719,-0.112676,-0.120889,0.064112,0.227007},
-{-0.0777065,-0.113766,-0.092422,-0.0108326,0.0968495},
-{0.0338721,-0.0694403,0.0371834,-0.110895,0.0595546},
-{0.233015,-0.0093755,0.0307845,-0.0208098,0.0466165},
-{0.0187611,-0.276649,-0.0356151,-0.0282908,0.0544491},
-{0.0997084,-0.197142,0.139543,0.138167,-0.00540141},
-{0.177072,0.041443,0.0769368,-0.180746,-0.00228053},
-{0.0342045,0.110077,-0.124734,0.00300083,-0.164575},
-{0.118184,-0.00621488,-0.0177149,-0.0733277,0.0962981},
-{-0.060397,0.0164447,-0.24464,0.173789,0.130628},
-{-0.0754428,-0.0365944,0.230153,-0.144083,0.0101652},
-{0.027001,0.0293775,0.0095744,0.112659,-0.0472224},
-{-0.145668,0.109364,-0.177459,-0.0381539,-0.148942},
-{-0.0278113,0.0288286,0.179824,-0.0107439,0.275314},
-{-0.0380222,-0.167598,0.0994236,-0.141864,-0.0543759},
-{-0.0393469,0.0302542,-0.0790297,0.049888,-0.109961},
-{-0.201511,0.166796,0.188599,-0.0172545,0.149758},
-{-0.193334,-0.201259,-0.0500669,0.0493143,-0.0727459},
-{0.251968,-0.118383,0.200768,-0.0195926,0.0904261},
-{0.0289901,-0.0248818,-0.163649,0.0332636,-0.0656504},
-{0.164211,0.00118964,0.230827,0.0419142,-0.102895},
-{-0.215429,-0.0414835,0.0926556,0.0669367,-0.07967},
-{-0.0307506,0.138865,0.184538,0.212962,0.113124},
-{0.108699,0.1417,-0.152162,-0.127156,-0.0141149},
-{-0.0722352,0.0677319,-0.20078,-0.0562445,0.215757},
-{0.0697919,-0.170059,0.105691,0.0437521,0.212155},
-{-0.0585262,-0.151522,0.0438088,-0.0896096,0.15222},
-{0.0309129,0.202446,-0.0377962,0.001907,0.0555512},
-{-0.00289158,-0.0254041,-0.0392423,0.0623743,-0.00261949},
-{-0.0924203,0.0306853,0.0784937,0.121956,0.012477},
-{-0.0045806,-0.0170649,0.185222,-0.0886237,-0.127234},
-{-0.0625116,0.15723,0.0233099,0.195328,-0.048966},
-{-0.280417,0.125247,-0.0293725,0.123373,0.0369287},
-{0.0866752,-0.154833,-0.194282,-0.129443,0.0390598},
-{0.0891091,0.0249416,0.0335585,0.0929396,0.0755667},
-{0.0119323,-0.053161,-0.0295525,-0.134307,-0.0748131},
-{-0.0846423,-0.159101,-0.00308256,-0.0317854,-0.187703},
-{0.0189504,-0.0974639,0.165927,0.010335,-0.0669706},
-{0.0934099,-0.0401971,0.209317,-0.0872991,0.0246268},
-{-0.00359445,0.137584,-0.0205745,0.067999,-0.0611908},
-{0.147272,-0.0421384,-0.143954,-0.0368442,0.0271839},
-{0.0421469,-0.0360598,-0.0600746,0.170344,0.145347},
-{-0.0203904,-0.0158103,0.137789,-0.071433,0.137754},
-{0.0916375,0.00349815,-0.0857336,0.0687138,0.0317099},
-{-0.0424813,-0.113985,-0.0590368,-0.201567,0.0395139},
-{0.0316336,-0.0200706,0.0330931,-0.0152883,0.144802},
-{-0.207718,0.0568574,0.161737,-0.0825114,-0.0906158},
-{-0.146887,0.104078,-0.0858594,0.0936961,-0.0731951},
-{-0.0470482,0.160163,-0.0668586,-0.147814,0.0284234},
-{-0.061808,-0.15783,-0.0210107,-0.0495429,0.0113599},
-{0.153672,0.0648023,0.188418,-0.180681,0.184214},
-{0.211429,-0.17088,-0.0535839,-0.0247789,-0.131494},
-{0.0352645,-0.0115695,0.0804035,0.0168668,-0.208683},
-{-0.0541791,0.0153687,0.128841,0.0477276,-0.0713366},
-{0.131821,0.159715,-0.0281126,0.234108,-0.0542472},
-{-0.104645,0.0383343,-0.169126,-0.158743,-0.0189743},
-{0.0426111,0.0342361,-0.172954,-0.170265,0.122879},
-{0.0121114,-0.0866013,-0.0163905,0.0444945,0.107004},
-{0.0837522,-0.207279,0.120954,-0.0122023,-0.171522},
-{0.0946501,0.146836,-0.165315,0.119598,0.203275},
-{-0.0855449,-0.0257687,-0.10755,-0.0638105,-0.122213},
-{-0.100735,0.105633,0.00765256,0.0786506,0.0496864},
-{-0.056502,0.159621,0.193012,-0.0629858,-0.134093},
-{-0.138256,-0.0699661,-0.0162787,0.150332,-0.0636841},
-{-0.0735093,0.00373668,-0.103763,0.0465298,0.127709},
-{-0.143947,-0.112512,-0.132902,-0.147266,0.108412},
-{0.103288,-0.0650844,0.0940859,0.0378152,0.0826279},
-{0.055988,0.0598786,0.0067025,-0.0837237,-0.024286},
-{-0.0147287,-0.0672451,-0.0799861,0.142243,-0.0782013},
-{0.0488559,-0.0971178,0.244845,0.159864,-0.170948},
-{0.115222,0.201341,0.0292798,-0.146891,0.0200016},
-{0.152591,0.163476,-0.098961,-0.153761,-0.192124},
-{0.125596,0.0817735,-0.0576625,0.0175927,0.120742},
-{-0.0264798,-0.177993,-0.168879,0.0371509,-0.0153855},
-{-0.141536,0.052748,0.160385,-0.180193,0.1676},
-{0.117999,-0.0626229,-0.195904,0.211675,-0.150182},
-{-0.104018,0.125576,-0.0530812,-0.178902,-0.1383},
-{-0.17696,0.00374954,0.0917941,0.0197422,0.079975},
-{-0.0492265,-0.0748854,0.0411042,-0.0633745,0.00473631},
-{-0.137732,-0.0145727,-0.0559519,0.0774897,-0.220439},
-{-0.0915724,0.0737896,0.0579136,0.0157323,0.167938},
-{-0.15875,-0.151377,0.052411,0.0680781,0.0575547},
-{0.192015,0.00930675,0.0473749,0.0301401,0.215313},
-{0.163065,0.028092,-0.109934,0.00276047,-0.111297},
-{0.211405,-0.014898,0.0706439,-0.0485663,-0.128365},
-{-0.0735221,0.0531558,0.18108,0.0505551,0.086096},
-{0.0379808,0.0795417,0.193889,0.0282139,-0.0335529},
-{0.0442296,0.0502351,-0.0399216,-0.230638,-0.0355739},
-{0.0511992,0.0185631,-0.0267206,-0.11195,0.255986},
-{0.116278,-0.187006,-0.193574,0.104807,0.0963592},
-{-0.0796247,-0.0910838,0.13973,-0.0236921,0.0570298},
-{-0.012659,0.153795,-0.183274,0.129534,-0.101718},
-{-0.042893,-0.029388,-0.0314668,-0.0427583,-0.0536977},
-{-0.0782101,0.243769,0.039591,0.106455,0.174727},
-{0.092894,-0.087995,0.0640747,-0.172245,-0.188958},
-{-0.204312,0.128097,0.0547843,0.157636,-0.203402},
-{-0.17678,0.147208,-0.228526,0.0278318,0.0502795},
-{0.0552183,-0.129317,-0.0477975,-0.0654259,-0.0244198},
-{0.122497,-0.0109398,0.00490269,0.029181,-0.0221199},
-{0.154953,-0.0526826,-0.110481,-0.147433,-0.114739},
-{-0.0814938,-0.15216,0.0806935,0.0379707,-0.0791998},
-{0.110613,-0.0698286,-0.00689732,0.143655,0.0175145},
-{0.0214549,0.0858973,0.104745,-0.135563,0.0250991},
-{0.0661632,0.0763365,-0.0891647,0.00507962,-0.0319421},
-{0.217674,0.0628425,-0.100356,-0.0953654,0.0168884},
-{-0.1129,-0.0408577,-0.0291854,0.116409,0.0996814},
-{-0.108905,-0.0110996,0.0627132,-0.124285,0.0644265},
-{0.121377,-0.0562659,0.0767151,0.091977,-0.0989605},
-{-0.124304,0.062933,-0.0863845,-0.0704085,0.0716253},
-{-0.032042,-0.0827936,0.148869,0.173134,0.0566336},
-{-0.198434,0.0115822,-0.0205161,-0.0617167,-0.1283},
-{-0.050366,0.0502487,-0.091483,0.117861,0.0136856},
-{-0.0749119,0.0183143,-0.00743906,-0.155241,-0.0275047},
-{-0.0716606,-0.0650685,0.0683313,0.0570523,0.00614789},
-{0.170217,-0.154612,-0.00797698,-0.0373634,0.0535267},
-{0.0829654,-0.0713311,-0.00478617,-0.0137013,-0.124468},
-{-0.0628004,0.145008,0.0357808,-0.0391233,-0.239912},
-{-0.0794881,0.0586379,0.137579,-0.0588676,0.00481111},
-{0.107436,0.0114506,0.103155,0.240589,-0.0964913},
-{-0.0378529,0.119217,-0.0668421,-0.00570637,0.00387393},
-{-0.00562167,0.0216612,-0.092992,-0.0915635,0.0213126},
-{0.0207835,-0.0761744,-0.141375,0.119864,0.0477221},
-{0.0458936,-0.0252219,0.0854023,-0.108242,-0.0536257},
-{0.051886,0.116353,-0.0511672,0.121298,0.0458216},
-{0.0359931,-0.166556,-0.118295,-0.0814767,-0.135671},
-{0.0253774,0.0698017,-0.0195229,0.064894,0.227343},
-{-0.061009,0.0511503,0.0579108,-0.0776525,-0.0925163},
-{-0.098085,0.0240004,-0.00545791,0.0753657,-0.0552257},
-{-0.221028,0.0902189,-0.0495172,0.0307082,0.237697},
-{-0.0332626,-0.0411516,-0.0508722,-0.0910603,0.112237},
-{0.0421978,-0.0327166,-0.000771736,-0.0284324,0.0194985},
-{0.137238,-0.0419911,-0.01056,-0.0845596,-0.0326973},
-{0.0188133,-0.192993,-0.0246451,0.07936,-0.0836802},
-{0.0201842,-0.15399,0.0217178,0.174981,-0.20902},
-{0.207279,0.174621,0.168776,-0.00713064,0.000885962},
-{0.0170264,0.267317,-0.063856,0.0713687,-0.17105},
-{0.0624021,0.0918137,-0.0562975,-0.0873559,0.0754395},
-{-0.1528,-0.149471,-0.143195,0.199454,0.0703591},
-{0.0268299,-0.0535574,0.119328,-0.242533,0.00818973},
-{0.0807057,-0.0283622,-0.0507313,0.0942948,-0.119937},
-{-0.0919717,0.0879579,-0.0490018,-0.0383224,-0.0813515},
-{-0.172421,-0.149647,0.212398,0.0239194,0.165925},
-{-0.120685,-0.109185,-0.0230932,-0.122668,-0.0822865},
-{0.0510037,-0.0558475,-0.129015,0.0147875,-0.229606},
-{-0.098109,0.168955,0.0490106,-0.0545812,0.0772269},
-{-0.108299,-0.0858775,-0.0263694,0.0199443,-0.0362012},
-{0.0401172,-0.0879589,0.26063,0.0674477,0.0975288},
-{0.0993497,-0.00156441,-0.295087,0.0351,-0.0709351},
-{0.0598115,0.173527,0.187665,0.130056,-0.214068},
-{-0.110694,-0.0224932,0.246397,0.0549758,-0.0380774},
-{-0.173647,0.199207,0.182867,0.12095,-0.0483334},
-{-0.040217,0.191711,-0.181361,-0.0698609,-0.0406225},
-{-0.0156589,0.238328,-0.113888,-0.0824466,0.172756},
-{-0.0229313,-0.188714,-3.74661e-05,0.123303,0.0980829},
-{0.00587689,-0.190791,0.182726,-0.194,0.170508},
-{0.0242901,0.252354,0.0886593,0.0572889,-0.0223712},
-{-0.0339953,-0.0909718,-0.0723043,0.0265104,-0.101172},
-{-0.201602,-0.0196106,0.0875607,0.215563,0.112039},
-{0.133278,0.103058,0.197293,-0.164694,-0.148155},
-{-0.00263098,0.0668595,-0.0281583,0.164603,-0.174486},
-{-0.210904,-0.0175887,-0.108181,0.0336131,0.0365998},
-{0.0576604,-0.136688,-0.0711227,-0.0813818,0.165383},
-{0.0357962,0.0664384,-0.00584431,0.0175678,0.0475538},
-{-0.00922982,-0.0128747,-0.0305928,-0.109736,-0.190979}};
diff --git a/libspeex/exc_gains_wb_table.c b/libspeex/exc_gains_wb_table.c
deleted file mode 100644 (file)
index eb2ea1e..0000000
+++ /dev/null
@@ -1,256 +0,0 @@
-float exc_gains_wb_table[256][5]={{0,0,0,0,0},
-{0.182741,0.173211,0.18772,0.339072,0.19244},
-{0.0785705,0.0694257,0.0659853,0.0656197,0.0780267},
-{0.334227,0.362773,0.816178,1.42947,0.446182},
-{0.807808,0.718436,0.265968,0.258087,0.245452},
-{1.0705,0.359971,0.343867,0.607815,0.323286},
-{0.412248,0.259434,0.297784,0.656538,0.282031},
-{0.228488,0.233462,0.226318,0.213071,0.615172},
-{1.02755,1.02637,0.393747,0.303968,0.321669},
-{0.686858,0.486882,0.771728,1.08226,0.396834},
-{1.45332,0.683205,0.477046,0.461403,0.869789},
-{0.709118,0.1928,0.164951,0.159949,0.15203},
-{0.427995,0.525121,1.2778,0.745214,1.37293},
-{0.476313,0.806508,0.931422,1.34594,0.671121},
-{0.400884,1.3341,0.358803,0.332999,0.306268},
-{0.497816,0.74164,0.33876,0.629356,0.596944},
-{1.38143,0.521405,0.910426,0.434664,0.379752},
-{0.590784,0.321094,0.31763,0.348776,1.04293},
-{0.460382,1.16719,0.976714,0.861867,0.450711},
-{0.375061,0.690823,0.422769,1.00722,0.965644},
-{0.40974,0.691819,0.802724,0.958305,0.462125},
-{0.440287,0.892113,1.38045,1.19686,0.450153},
-{0.727229,0.269052,0.492156,0.256913,0.26407},
-{0.737566,0.926689,0.408083,0.394474,0.804539},
-{1.35145,0.551643,0.957903,1.04461,0.588706},
-{0.879871,0.912191,0.657896,1.01061,0.42593},
-{0.909919,0.373884,0.294972,0.31421,0.440197},
-{0.458094,0.371505,0.416061,1.27409,0.376035},
-{0.740847,0.824297,0.965983,0.659209,0.768914},
-{0.784484,1.33445,1.26608,1.30907,1.33417},
-{1.05377,0.739542,0.509217,0.56711,0.319022},
-{0.626667,1.29105,0.515243,0.528457,1.35042},
-{0.388153,0.232257,0.211576,0.220449,0.395738},
-{1.41876,1.37805,0.909401,0.627147,0.719338},
-{0.236909,0.246824,0.416106,0.270491,0.421736},
-{0.422891,1.03595,0.45593,0.947287,0.470335},
-{0.179905,0.168895,0.184137,0.238075,1.31702},
-{0.415525,0.854999,1.02981,0.844295,0.790831},
-{0.405095,0.793807,0.824319,0.48516,1.04089},
-{1.26772,0.942509,0.944603,0.855901,0.767926},
-{0.59855,0.405415,0.400043,0.748844,1.10966},
-{0.786577,0.474889,0.447414,1.17847,1.41667},
-{0.372814,0.413176,0.848519,1.27706,1.37715},
-{0.169996,0.161734,0.163633,0.173124,0.352952},
-{0.499155,0.879573,1.02021,1.06457,1.27026},
-{0.20588,0.349266,0.18345,0.178359,0.182752},
-{0.716525,0.45211,0.219726,0.20591,0.198346},
-{1.34188,1.31697,0.637851,0.611953,1.30596},
-{1.27239,0.778876,0.941553,0.638865,1.29889},
-{0.760614,0.45864,0.860001,0.617762,1.01556},
-{1.45373,0.492015,0.463143,0.441624,0.365387},
-{1.3736,1.40266,0.740942,1.20995,1.19442},
-{0.513898,0.548236,1.35968,0.351138,0.361087},
-{0.999901,0.406639,0.401258,0.407274,1.02998},
-{0.676813,0.541636,1.41182,0.818229,0.495914},
-{0.892004,0.396008,0.407904,0.676941,0.713857},
-{0.307986,0.964784,0.291466,0.250664,0.234822},
-{1.08065,0.737501,0.916255,0.712104,0.484706},
-{0.630028,0.749679,0.631166,0.438249,0.542493},
-{0.313645,0.31985,0.351993,1.37309,1.25075},
-{1.43804,0.855705,0.39209,0.339967,0.369304},
-{0.756712,0.622674,0.661289,0.67068,0.603914},
-{0.319041,0.716297,0.290809,0.282117,0.504837},
-{0.847979,1.40188,0.897418,0.446986,0.432255},
-{0.17768,0.172076,0.198827,0.426461,0.674869},
-{0.361053,0.640125,0.960164,0.437622,0.589129},
-{0.351219,0.181905,0.164962,0.153152,0.159031},
-{0.164024,0.170893,0.216443,0.671042,0.234278},
-{0.783878,0.394098,0.9138,0.317388,0.302081},
-{1.0575,0.90681,0.433274,0.506756,1.11706},
-{0.622059,0.681612,0.470669,0.748232,0.313737},
-{1.10399,0.38058,0.572969,0.305717,0.296082},
-{1.33731,0.573887,0.503576,0.633276,1.38439},
-{0.490364,0.354912,0.619323,0.730883,0.297319},
-{0.793757,0.560409,1.17363,1.39004,1.30285},
-{0.280637,0.471093,0.271004,0.282288,0.714626},
-{0.338726,0.339676,0.682624,0.381023,0.980325},
-{0.533155,1.17935,0.551896,1.09616,1.00792},
-{0.529876,0.343457,0.291183,0.67849,0.747774},
-{1.3343,1.33245,1.34567,1.35557,1.22426},
-{0.243223,0.382512,0.318652,0.450845,0.245796},
-{1.31927,1.30243,0.522576,1.10383,0.561894},
-{0.334474,0.888847,1.03328,0.334103,0.304403},
-{0.598997,0.348898,0.68613,0.787619,0.660694},
-{0.623294,0.328647,0.339425,0.836055,0.357822},
-{0.61034,1.40108,0.523386,0.805861,0.461764},
-{0.400394,0.356157,0.293283,0.449554,0.52863},
-{0.583111,0.575055,0.437143,0.921855,0.634195},
-{0.462074,0.338112,0.442465,0.42318,0.30806},
-{1.37257,0.522833,0.460875,0.961157,0.456164},
-{0.320431,0.360842,1.19325,1.0652,0.414012},
-{1.08063,0.762279,0.449196,0.705824,0.631308},
-{0.858462,0.553374,0.847335,0.94157,1.3282},
-{0.200057,0.225566,0.504139,0.729749,0.279356},
-{0.963199,0.596167,0.747657,0.910141,0.814512},
-{0.924686,1.04739,0.732421,0.58669,0.578778},
-{0.652763,0.898838,1.3944,1.31477,0.977645},
-{0.798751,0.592682,0.339954,0.53572,0.438658},
-{0.387905,0.636698,0.644805,0.688541,0.708767},
-{0.211575,0.198864,0.229932,0.723007,0.540023},
-{0.323091,0.852725,0.645928,0.286081,0.304319},
-{0.887236,0.921811,0.464416,1.02755,0.79299},
-{0.209666,0.193429,0.200353,0.242327,0.953092},
-{0.987418,1.36485,0.935415,0.921035,0.538395},
-{0.40543,0.417563,1.28576,1.42985,0.80199},
-{1.43702,0.913156,0.628154,0.718005,0.448171},
-{0.652675,0.280467,0.326895,0.53444,0.496972},
-{0.530347,1.36297,1.06127,1.26366,0.817743},
-{0.490941,0.694342,0.241977,0.210482,0.21615},
-{0.968647,0.94184,0.577248,0.958228,1.35886},
-{0.272885,0.281883,0.711816,1.00245,0.368118},
-{0.407543,0.426989,0.231442,0.223901,0.213256},
-{1.32304,1.25885,1.2895,0.739396,1.31542},
-{0.299498,0.485925,0.318213,0.70914,0.314709},
-{0.735863,1.35957,0.461769,0.412189,0.7171},
-{0.606943,0.970725,0.631787,0.744273,0.732373},
-{0.632884,1.25728,1.37068,0.842431,0.764322},
-{0.972232,0.515659,0.56492,1.37437,0.527993},
-{1.00375,0.700983,0.386865,0.338794,0.626771},
-{0.395431,0.237265,0.416153,0.220288,0.228126},
-{1.32629,0.871137,0.712638,1.36738,0.623578},
-{0.300598,0.359838,1.04338,0.291691,0.28758},
-{0.248092,0.258546,0.463243,0.324184,0.736487},
-{0.816408,0.977069,1.37761,0.524056,0.492604},
-{0.959486,0.856621,1.40299,0.731723,0.951003},
-{0.639678,0.48891,1.01625,0.947547,0.745774},
-{0.376809,1.31296,0.742348,0.413322,0.396407},
-{0.330601,0.313589,0.367934,0.899971,1.41226},
-{0.216184,0.22126,0.281585,1.01903,0.32408},
-{0.657797,0.952862,0.654034,1.39031,1.3453},
-{1.37705,0.326895,0.25861,0.235077,0.242192},
-{0.192831,0.233031,0.68903,0.21439,0.200497},
-{1.22485,0.485575,0.469215,0.93554,0.976907},
-{1.25296,0.971772,0.958275,1.28017,1.40463},
-{1.29801,1.03692,0.940294,0.424527,0.399051},
-{0.577911,0.49177,0.281209,0.279929,0.443526},
-{0.713668,0.278504,0.273643,0.445726,0.236289},
-{0.531333,1.37858,0.894186,0.627085,0.873345},
-{0.28669,0.55869,0.610643,0.568317,0.330016},
-{1.39085,0.928685,1.37918,0.737749,0.561254},
-{0.269898,0.667898,0.46554,0.242176,0.224656},
-{0.501519,0.777566,0.426977,0.407889,1.30446},
-{0.678408,1.01896,0.657147,0.333607,0.300515},
-{0.912685,0.880813,1.37366,1.01026,1.37506},
-{1.03145,0.759036,0.739733,0.505288,0.862037},
-{0.693726,1.27261,0.71272,1.359,0.500376},
-{0.358395,0.414044,0.748539,0.825797,1.07589},
-{1.28514,0.814442,1.33057,1.32764,0.878569},
-{0.806036,1.3995,0.89106,0.885917,1.35305},
-{0.256429,0.241856,0.273196,0.970294,0.915787},
-{0.735898,0.982358,0.394181,0.605071,0.405942},
-{0.815618,0.462788,0.452566,0.533497,1.41644},
-{0.673605,0.811876,0.861341,0.709201,0.386176},
-{0.453248,0.757198,0.544963,0.827649,1.42542},
-{0.700424,0.381822,0.448474,1.1238,0.893269},
-{1.25905,0.365693,0.314552,0.362931,0.640386},
-{0.882725,0.572279,1.16767,1.34256,0.498455},
-{0.322207,0.644102,0.301482,0.447162,0.303926},
-{0.948253,1.24638,1.35776,1.33453,0.626869},
-{1.19187,1.38496,1.38637,0.546604,0.495114},
-{0.158262,0.153562,0.142954,0.136,0.137281},
-{0.48717,0.72264,1.39626,0.514273,0.877285},
-{0.215204,0.208815,0.227226,0.430976,0.403806},
-{0.673814,0.238416,0.228071,0.240022,0.419178},
-{0.318255,0.354338,0.768696,1.15267,0.81092},
-{0.232174,0.254473,0.881681,0.596983,0.291914},
-{0.679934,0.59797,0.64195,0.397282,0.909373},
-{0.87528,1.0101,0.965605,0.959879,0.96941},
-{1.14083,0.547354,1.35288,0.507897,0.412646},
-{0.81057,0.596226,0.526345,0.293601,0.252723},
-{0.468693,0.24683,0.22695,0.278629,0.715343},
-{0.979597,1.1719,1.08422,0.480143,0.962035},
-{0.507106,0.514869,0.50711,0.589173,0.50021},
-{0.459479,1.34311,1.31957,0.464193,0.453815},
-{0.366921,0.372019,1.11434,0.489597,0.880665},
-{0.315061,0.657258,0.600663,0.359864,0.688068},
-{0.398,0.235403,0.232009,0.383525,0.227874},
-{0.619032,0.715749,0.716619,0.945573,0.923992},
-{0.244168,0.408747,0.422267,0.222288,0.218462},
-{0.556153,0.424271,0.813268,0.387763,0.639077},
-{0.230555,0.241534,0.602055,0.443054,0.2518},
-{0.75265,0.389004,0.578029,0.553712,0.322254},
-{0.516637,1.24469,1.30834,0.660226,1.25455},
-{0.231638,0.665077,0.207604,0.188567,0.189985},
-{1.37854,1.40244,0.523345,0.415661,0.403397},
-{0.500169,0.76542,0.513107,1.34629,0.538221},
-{0.405645,0.480214,1.34866,0.964558,0.94777},
-{0.781497,0.320383,0.319707,0.317766,0.720235},
-{1.11838,0.610118,0.29402,0.277378,0.264294},
-{0.250688,0.295341,0.727174,0.308405,0.515534},
-{0.611077,0.428438,0.989632,0.660351,0.406562},
-{0.283338,0.351197,0.83199,0.696767,0.630069},
-{0.562113,1.00323,0.863977,0.384062,0.682895},
-{1.42351,1.2656,1.12563,1.22113,0.644907},
-{0.876297,0.893569,1.16139,0.984862,0.535445},
-{0.247747,0.246357,0.273184,0.603304,1.16944},
-{0.903472,0.479551,0.415956,0.982997,0.433624},
-{0.700131,0.476753,0.556693,0.33559,0.501667},
-{0.374498,0.892051,0.686745,0.595779,0.43103},
-{0.295774,0.342462,1.33701,0.582105,0.417695},
-{0.775731,0.93208,0.774526,0.596892,1.21543},
-{0.558199,0.622059,0.7796,0.371297,0.299905},
-{0.350309,0.837212,1.3439,0.626067,0.440423},
-{0.535357,0.712571,0.471967,0.390523,0.285972},
-{0.579129,0.512794,0.272848,0.528243,0.28285},
-{0.975247,1.35522,0.621394,0.742671,0.916309},
-{0.37646,0.680583,0.371886,0.518141,0.934408},
-{1.34244,0.595149,1.09155,0.495624,0.871223},
-{0.57473,0.581647,0.347747,0.348865,0.710669},
-{0.397073,0.403396,0.741788,0.513491,1.38088},
-{0.474167,0.337413,0.707807,0.473658,0.39481},
-{0.750042,0.700993,0.436349,0.67502,0.941756},
-{1.12931,1.36339,1.29985,0.92508,0.923555},
-{0.505912,0.295321,0.486319,0.286129,0.569624},
-{0.980672,0.279547,0.239184,0.218386,0.202523},
-{1.06268,1.2302,0.459522,0.696396,0.426017},
-{0.240942,0.526818,0.744135,0.279415,0.250472},
-{0.812498,0.560384,1.09031,0.445021,0.688436},
-{1.28517,1.13848,0.524505,0.421746,0.756671},
-{0.531131,0.370801,0.54113,0.495729,0.745086},
-{0.277218,0.276378,0.501635,0.582627,0.528409},
-{0.599798,0.528389,0.656403,1.43926,0.967507},
-{0.633027,1.01739,0.313941,0.270623,0.243476},
-{0.847386,1.40613,0.436607,0.34917,0.328286},
-{1.38799,0.976847,0.659124,0.934279,1.00719},
-{0.261274,0.441631,0.247761,0.260116,0.408158},
-{1.39959,0.704028,1.27337,1.01829,1.25994},
-{0.329022,0.322178,0.43859,0.900161,0.597841},
-{0.359459,0.527453,0.528219,0.310772,0.447986},
-{1.28021,0.591136,0.641603,1.36321,1.16619},
-{0.303054,0.590361,0.935776,0.655923,0.306808},
-{0.909066,0.806358,0.876643,1.32686,0.866917},
-{0.313996,0.61914,0.439506,0.984077,0.3795},
-{0.31606,0.446711,0.338337,0.317312,1.04431},
-{0.980237,0.4244,0.782711,0.74743,0.407302},
-{0.963387,0.39892,0.674681,0.405775,0.62459},
-{0.390604,1.00373,0.417655,0.373138,0.597421},
-{0.632318,0.800142,0.33124,0.29327,0.4748},
-{0.277001,0.511726,0.327298,0.598255,0.629799},
-{0.972354,1.30576,0.804884,1.34897,0.968324},
-{0.466766,0.339504,0.688563,0.24833,0.241491},
-{0.276954,0.309284,0.506502,0.671665,0.871014},
-{0.757628,0.897736,1.06152,0.379848,0.336404},
-{0.387573,0.363857,0.325432,0.388422,1.45383},
-{0.341164,0.878875,0.359061,0.608593,0.299899},
-{1.01932,0.502556,1.24836,0.919968,0.874397},
-{0.408629,1.15193,0.463231,0.591718,0.906437},
-{0.124563,0.113565,0.11774,0.160868,0.703326},
-{0.256755,0.268552,0.322054,1.35017,0.667696},
-{0.984166,0.744223,0.759104,0.357689,0.411526},
-{1.34939,0.443003,0.658442,0.602355,0.713139},
-{0.564345,0.259968,0.243453,0.198779,0.198531},
-{0.241578,0.221736,0.233219,0.560329,0.851796},
-{0.782741,0.65909,1.12404,0.521294,1.35791},
-{0.188768,0.192146,0.340929,0.198247,0.184002},
-{0.590317,0.484028,0.437683,0.245425,0.231335}};
diff --git a/libspeex/exc_sb_table.c b/libspeex/exc_sb_table.c
deleted file mode 100644 (file)
index f332203..0000000
+++ /dev/null
@@ -1,128 +0,0 @@
-float exc_sb_table[128][5]={{-0.102624,-0.054111,-0.150332,0.925474,-0.073627},
-{0.0334537,0.427829,0.534788,-0.188438,0.604833},
-{0.139761,0.666278,0.0654791,0.629374,-0.0485821},
-{0.381103,-0.348657,-0.223198,0.754575,-0.162999},
-{0.139871,-0.65616,0.567975,0.365822,0.0199881},
-{0.238787,-0.663805,0.412313,-0.011008,0.504689},
-{-0.255037,-0.268362,0.337979,0.00543153,0.800096},
-{0.0157631,0.0546008,-0.587497,0.43831,0.602686},
-{0.266576,0.454332,-0.287143,0.543867,0.4675},
-{0.539929,-0.211438,0.544636,-0.19762,0.497794},
-{0.790626,0.281386,-0.434619,0.0150189,0.0396688},
-{0.537489,-0.697916,0.358457,0.137981,0.0744294},
-{-0.171602,0.661162,0.530261,-0.141799,-0.34708},
-{0.550564,-0.357929,0.47943,-0.486588,0.234207},
-{-0.522763,0.70251,-0.180435,0.0110766,0.34005},
-{0.290646,-0.486299,-0.0267554,0.0195369,0.765342},
-{-0.510804,0.543264,-0.0113427,0.559072,-0.214979},
-{-0.054281,0.296506,0.227583,-0.663565,0.585474},
-{0.281311,0.410409,-0.589923,0.514236,-0.24451},
-{0.352187,-0.681431,0.0409394,0.529577,0.180429},
-{0.335686,0.152943,0.340562,0.350725,-0.716269},
-{-0.184544,-0.493059,0.709312,0.0789398,0.333809},
-{0.36807,0.398848,0.439442,0.469874,0.426293},
-{-0.074492,-0.067026,-0.220689,0.0949041,0.911539},
-{-0.0244626,0.599877,-0.664436,0.337101,0.102803},
-{0.507241,0.299874,0.67683,-0.183245,0.1731},
-{-0.158717,0.687196,0.0106936,-0.49428,0.40757},
-{0.18848,-0.206213,0.859075,-0.0790016,-0.271342},
-{-0.481602,0.268191,0.761241,-0.0182754,-0.102577},
-{0.654972,-0.254684,-0.0536777,-0.326449,0.566277},
-{-0.311018,0.468055,-0.518803,0.260996,0.508674},
-{0.409175,-0.0381644,-0.507158,-0.00951909,0.694244},
-{-0.246701,0.0131884,0.376172,0.718583,-0.416487},
-{-0.483561,0.409034,0.162806,-0.293085,0.631156},
-{0.158998,0.813405,-0.0109502,0.0180112,-0.445918},
-{0.705327,-0.410767,-0.241706,0.433087,-0.00413281},
-{0.600455,-0.479235,0.23816,0.379886,-0.3432},
-{0.301259,-0.582477,0.700397,-0.0832768,0.0474716},
-{-0.281273,-0.426036,0.296623,0.708078,0.198903},
-{0.405234,0.466206,-0.612542,-0.124835,0.369165},
-{-0.211322,0.835041,-0.341256,0.212979,-0.112143},
-{0.00691859,0.220931,0.802972,-0.420141,-0.163715},
-{0.665906,0.121232,-0.357705,-0.342484,0.451004},
-{0.659969,-0.509186,-0.178865,0.147746,0.408789},
-{-0.52733,0.627687,0.394084,-0.203386,0.184659},
-{0.561308,-0.582705,0.43265,-0.259265,0.219455},
-{-0.478271,0.78833,0.1123,0.166179,-0.128496},
-{0.257733,0.0106463,0.364816,-0.0231152,0.831136},
-{-0.206288,0.304049,-0.176448,0.781093,-0.380172},
-{-0.282692,0.0171014,0.501923,-0.470113,0.608837},
-{0.640325,0.422174,-0.139084,0.14123,-0.503401},
-{0.278649,-0.375512,-0.352527,0.432341,0.606905},
-{-0.259996,-0.24862,0.754151,0.402793,-0.161873},
-{0.176409,-0.37323,0.272941,-0.332164,0.760739},
-{0.219157,0.591943,0.619522,0.281972,-0.111015},
-{0.355112,0.0542548,0.0346132,-0.572545,0.682399},
-{0.302553,-0.0692851,-0.581226,0.676379,0.140197},
-{0.158078,0.634064,0.347225,-0.569978,-0.118974},
-{0.233516,0.790668,-0.266387,-0.37779,0.0894651},
-{0.88696,0.0427845,0.0771191,-0.275171,-0.177864},
-{-0.20828,0.401446,0.661027,0.416781,0.244633},
-{0.444848,-0.0251255,0.339661,-0.659061,0.42588},
-{-0.392048,0.144615,-0.28817,0.665781,0.441333},
-{0.664287,0.0737455,-0.54894,0.376551,-0.144804},
-{-0.564502,0.128396,0.0865737,0.728833,0.120127},
-{-0.57034,0.0979681,0.585372,-0.0564536,0.460319},
-{-0.168581,0.587204,0.220691,0.365764,-0.58274},
-{0.559779,-0.0715092,-0.152879,0.567635,-0.49618},
-{0.114242,-0.456576,0.288872,0.736407,-0.231899},
-{0.00837993,-0.595792,0.218303,0.425367,0.55763},
-{-0.331547,-0.329078,-0.0551475,0.490597,0.661246},
-{0.0816829,0.304182,-0.544833,-0.0409868,0.719706},
-{0.344068,0.274524,-0.736783,0.315036,0.275653},
-{0.228404,-0.315749,0.768149,-0.422216,0.106815},
-{0.662165,0.486676,-0.276654,-0.386017,0.0209953},
-{0.80392,-0.513347,0.138384,0.0246297,-0.0146162},
-{0.301751,0.449556,0.488575,-0.163447,-0.571901},
-{0.781474,-0.371342,0.196756,-0.318678,0.22194},
-{-0.726348,0.441955,0.208678,0.257971,0.249602},
-{0.589172,-0.58137,0.177834,-0.0952224,0.457552},
-{-0.457955,0.582895,-0.357162,0.486044,0.0770756},
-{0.0950343,-0.109581,0.345219,-0.587601,0.677624},
-{0.19224,0.115768,-0.408221,0.771759,-0.332153},
-{0.517119,-0.256665,0.185316,0.643863,0.309937},
-{0.540099,0.105316,0.53074,0.490803,-0.210116},
-{0.249416,-0.140204,0.725332,0.3115,0.40436},
-{-0.151338,0.655717,0.0959581,0.334807,0.543585},
-{-0.11283,0.0734222,0.0532614,-0.370352,0.872759},
-{-0.125588,0.314843,-0.574553,0.687819,0.0452927},
-{0.538183,0.031037,0.541285,-0.550722,-0.120951},
-{0.153766,0.427132,-0.291862,-0.49462,0.613839},
-{0.652598,-0.0458756,0.463965,-0.0682286,-0.493205},
-{-0.531497,0.318335,0.53472,0.409559,-0.237859},
-{0.48061,-0.422219,0.294698,-0.43837,0.517025},
-{-0.103654,0.744761,-0.474463,-0.0720102,0.340483},
-{0.628206,-0.13234,-0.545444,0.258424,0.366585},
-{0.148394,-0.0425618,0.0865729,0.759242,-0.544229},
-{-0.260555,0.434974,-0.259427,-0.205655,0.740156},
-{0.60187,0.540709,0.113835,-0.315797,-0.351679},
-{0.849773,-0.142091,-0.0420795,0.211852,-0.34112},
-{0.277191,-0.376379,0.613516,0.320655,-0.451303},
-{0.636778,-0.429747,0.529245,-0.187377,-0.141152},
-{-0.580468,-0.11628,0.481246,0.428717,0.340724},
-{0.402818,0.52967,-0.0272272,-0.0541325,0.655869},
-{0.324038,0.710271,-0.503013,0.131347,-0.125574},
-{-0.220883,-0.103133,0.882013,-0.207169,0.146864},
-{0.766691,0.0705879,0.0825369,-0.502545,0.228221},
-{0.895274,-0.197354,-0.234603,-0.0232927,0.131917},
-{-0.257596,0.412843,0.566726,-0.544417,0.226161},
-{0.296013,-0.541693,0.559311,-0.348357,0.375752},
-{-0.255127,0.882802,0.0156524,-0.25512,0.0153832},
-{0.668598,0.0427881,-0.000316741,0.194706,0.627481},
-{-0.150822,0.60525,-0.383042,0.535514,-0.329319},
-{0.0835202,0.0230119,0.619825,-0.662472,0.304508},
-{0.228531,0.43578,-0.163453,0.526958,-0.600919},
-{-0.024975,0.0622987,0.21989,0.57448,0.702719},
-{-0.0771633,0.170254,0.718226,0.226328,-0.532113},
-{-0.031851,-0.316799,0.649984,-0.375654,0.513181},
-{0.720653,0.52339,0.203987,0.167927,0.0998602},
-{0.22968,-0.101649,-0.158635,-0.324444,0.853797},
-{0.0138676,-0.311507,-0.253608,0.790742,0.326826},
-{0.404968,0.458736,0.124864,-0.662365,0.25065},
-{0.247051,0.851768,0.234943,-0.0360821,0.174313},
-{0.820181,-0.142236,0.401901,0.092983,0.171547},
-{-0.0234138,0.102285,0.470282,0.792313,0.112344},
-{0.276176,-0.323481,0.500884,-0.559456,0.4644},
-{-0.535225,0.156369,-0.0102809,0.197816,0.733569},
-{0.609358,0.217827,-0.0926352,0.661177,0.0951336}};
diff --git a/libspeex/exc_table.c b/libspeex/exc_table.c
deleted file mode 100644 (file)
index 006f816..0000000
+++ /dev/null
@@ -1,128 +0,0 @@
-float exc_table[128][8]={{0,0,0,0,0,0,0,0},
-{-0.519148,-0.383215,0.492778,1.4744,0.677986,-1.30348,0.654883,0.272205},
-{0.235487,1.08995,1.1888,-0.454432,-0.873275,-0.72557,0.127527,1.19132},
-{1.31407,-0.12346,-1.6954,1.12853,0.223931,0.316261,0.0103814,0.00687301},
-{2.02206,-0.221238,-0.709228,0.133388,-0.0665108,0.644046,-0.811408,0.624665},
-{-0.211276,1.64339,-0.628985,-1.14044,1.20664,-0.0699504,-0.0975374,0.408862},
-{-0.225241,1.53847,-1.06719,0.295573,-0.476,1.40531,-0.221542,-0.0712951},
-{-0.0777728,0.263831,-0.390129,1.28144,-0.732307,-1.00018,1.65573,0.0192973},
-{-0.253542,-0.607609,1.56792,-0.386332,0.712034,-1.17144,0.449069,0.902173},
-{0.457305,0.159654,0.964737,-1.48001,-0.124851,1.56212,-0.270539,-0.1115},
-{-0.535583,1.2753,0.82763,-0.511839,-1.21468,0.387945,1.14347,-0.037292},
-{0.658727,0.0951354,-0.91433,1.84221,-1.15651,0.11608,0.457493,-0.0696827},
-{-0.171123,-0.640259,1.98106,-0.538926,-0.702949,0.224473,0.146852,0.907132},
-{1.23847,-0.735588,-0.458715,1.33074,-1.02485,0.564821,-0.481561,0.815328},
-{0.638468,-0.482913,0.360224,1.06189,-1.1122,-0.0272128,1.46374,-0.803822},
-{0.142921,0.427225,0.0114741,0.403792,-0.712144,1.23426,1.06859,-1.48582},
-{0.206021,-0.025427,0.000886086,-0.300349,1.40432,-1.41072,-0.148592,1.4734},
-{0.290391,0.85017,0.246852,0.238577,0.987514,0.876865,-0.322982,-1.54234},
-{1.28185,-0.721373,-0.790936,0.761936,0.591477,-0.541731,-0.440675,1.36101},
-{-0.44707,1.65442,-0.103376,-0.715018,0.227665,-0.744212,1.38073,-0.0216128},
-{1.58882,0.3999,-0.836505,-0.38793,-0.076672,1.06949,0.541261,-0.846127},
-{-1.2514,1.17783,0.00721583,0.998346,-0.964169,0.884813,0.160821,0.188163},
-{0.032151,-1.41618,0.323532,-0.251319,0.415093,1.07904,0.576218,1.22169},
-{-0.14934,1.22495,-0.244964,-0.327759,0.212238,1.15037,-1.46728,0.81144},
-{0.0865305,0.447683,-0.253781,-0.475941,1.57808,-1.48456,1.00947,0.0725317},
-{1.187,-0.692426,-0.160248,0.402956,0.659311,-1.36626,1.23888,0.053066},
-{0.938144,-1.24477,-0.0266074,1.63676,-0.41681,-0.560181,0.552124,0.311536},
-{1.19399,0.845415,-0.296021,0.395652,-0.957363,-0.11966,-0.533361,1.44858},
-{0.607339,-1.11686,0.895028,0.658016,-0.347789,-0.814287,0.0185571,1.52623},
-{1.34549,-0.393902,1.01,-1.15699,-0.63963,0.346319,0.362357,0.948321},
-{-0.644387,0.734053,0.336477,-0.812896,1.00561,-0.128355,-0.940326,1.59094},
-{-1.49306,0.66011,1.21486,0.115235,0.0322791,-0.66451,0.408269,0.971429},
-{0.431509,-0.655904,0.787717,-0.591676,0.704448,-0.350819,-0.882844,1.86331},
-{0.274213,1.26762,-1.38245,-0.199402,0.991432,0.00956448,0.865429,-0.678094},
-{0.626281,-0.19805,0.260867,-0.0897887,-0.426774,1.47313,-1.6055,1.00902},
-{-0.216025,0.0862033,0.445714,-0.0880767,0.301077,-1.3334,1.98526,-0.0555188},
-{-0.797843,0.586305,-0.154543,1.70117,1.03544,-0.0184295,-0.334302,-0.381217},
-{-1.42492,1.67326,0.405813,-0.506934,0.562486,0.469201,-0.147553,0.0748747},
-{0.913965,0.402575,0.682482,0.790534,0.391609,1.16972,0.299276,1.27145},
-{-0.640021,0.989951,1.17676,-1.66393,0.355064,0.121597,0.369959,0.403901},
-{1.23378,0.641514,-1.22876,0.234667,0.0827593,-0.880098,1.13685,0.527352},
-{0.356115,-0.509378,1.05565,-1.04099,0.371755,0.94073,-1.291,1.10064},
-{-0.943512,1.31169,-0.390361,-0.103097,1.11716,-1.12928,0.371843,0.818917},
-{-0.156317,-0.0418901,0.0723236,0.973233,0.730196,-0.966608,-0.947366,1.5693},
-{1.5829,1.33856,0.473229,0.0219714,-0.702468,-0.154917,-0.0369134,-0.470584},
-{-0.673854,0.699879,1.12444,-0.662892,-0.71571,1.18947,-0.640153,0.915725},
-{0.896011,0.787349,0.200906,-1.46967,0.347642,0.352741,-0.615997,1.25272},
-{1.09999,0.792396,-0.884367,-0.727592,0.784642,1.17963,-0.77986,-0.160579},
-{-1.05379,-0.0732156,1.59632,-0.132611,-0.169706,1.1097,0.543206,-0.45768},
-{0.707575,-0.166165,-0.10517,-0.384722,1.20009,0.203652,-1.55824,1.24602},
-{0.426702,-0.750799,-0.785802,0.106489,1.51227,0.957005,0.673555,-0.486873},
-{1.28994,-0.960517,0.545345,-0.159149,-0.32678,0.580855,-0.982405,1.49181},
-{0.741273,-0.0211484,-1.00192,1.6835,0.0392508,-1.07969,0.231873,0.672362},
-{-0.253722,1.1727,1.68946,0.493711,-0.0471442,-0.333803,-0.287764,-0.675685},
-{-1.32033,1.11807,0.0833384,0.562357,0.272908,-0.088752,1.31208,-0.778032},
-{-0.0803658,0.372868,0.449437,-1.40348,1.39748,0.966697,-0.814686,0.190767},
-{0.951774,0.427257,0.15036,-1.60358,1.14627,0.0810234,0.70735,-0.450667},
-{1.63808,0.109634,-0.99458,-0.434123,1.35836,-0.260683,-0.111738,0.185745},
-{-0.394671,-0.896337,0.646351,1.37455,0.625629,0.804453,0.458131,-0.811909},
-{0.0362565,-0.0235451,0.178868,-0.285337,0.0782079,-0.518704,0.189328,2.37162},
-{0.492691,1.13895,-0.86741,0.347883,-1.26497,0.380709,1.28738,-0.064377},
-{0.930297,1.28741,0.429463,0.245579,0.694034,-1.21605,-0.628591,0.0374087},
-{-0.199797,1.13671,-1.09067,1.37141,-0.517385,0.322349,0.764701,-0.852772},
-{-0.5007,0.303226,-0.0132675,-0.45596,-0.546562,0.277561,1.5487,1.46029},
-{1.65408,-0.842994,0.302966,-0.854034,0.662024,0.910017,-0.687823,0.250232},
-{1.12219,-0.5419,-0.336237,-0.655839,-0.373273,0.708425,1.64614,0.265602},
-{-0.743476,2.11592,-0.952805,0.264998,0.170145,-0.0560336,0.306247,-0.116348},
-{0.403037,-0.48668,0.817853,0.477643,-1.52252,0.964304,-0.546706,1.16473},
-{2.11011,-0.537778,-0.497273,0.602666,-0.48884,-0.125965,0.619928,-0.12306},
-{0.103031,1.79484,0.0818756,-1.13463,-0.13095,0.917941,0.259381,-0.552635},
-{0.428065,-0.557918,1.07281,-0.962703,1.37196,-0.963967,0.901819,-0.278916},
-{0.231896,0.041965,0.0632494,1.18255,-1.84059,1.07733,0.269347,-0.00577954},
-{0.557442,-1.02095,1.43921,-0.377425,-0.633907,1.32529,-0.709583,0.381231},
-{0.518884,1.09369,-1.13942,-0.105153,0.835027,-0.580586,-0.487998,1.39804},
-{-1.43902,-0.319956,-0.0826762,0.354559,1.1348,0.807323,0.546867,0.812576},
-{1.00645,-0.128206,0.28316,0.334308,-1.33777,-0.533485,1.17966,1.00905},
-{0.948813,0.119369,-1.01666,1.23683,0.105635,-0.459294,1.13103,-0.980494},
-{1.17283,-1.5799,1.33239,-0.485987,0.211327,0.169073,-0.387067,0.677013},
-{-0.247152,-0.0280727,-0.234614,1.39573,-0.963978,-0.0813067,-0.0728599,1.67411},
-{-0.449916,-0.274801,1.35576,0.451492,1.43631,0.141543,-0.896003,-0.0876196},
-{0.892366,-1.36578,0.444708,0.107565,1.44366,-0.755166,-0.0429619,0.585746},
-{0.939511,0.341971,-0.974305,0.928629,-1.00693,1.42408,-0.602308,0.126122},
-{-0.5307,-0.23615,1.20135,0.699046,-1.25741,-0.380481,1.25698,0.455196},
-{1.04482,1.14309,1.03158,0.939667,0.812349,0.425079,0.423823,0.0813321},
-{1.29549,-0.745042,-0.272242,1.15236,-0.838247,1.02629,0.227678,-0.774721},
-{0.981011,-1.45622,0.999967,0.725389,-1.11806,0.54881,0.176738,0.191717},
-{0.746684,-1.4211,1.37464,0.0883952,0.0254114,-0.573669,1.0495,-0.0720876},
-{0.565948,0.269033,-1.10345,1.01211,0.0768689,0.564008,-1.29685,1.19745},
-{1.84142,-1.60809,0.161708,0.38437,-0.0217134,0.210367,-0.0739498,0.363587},
-{-0.0523482,0.24593,-0.110338,0.493247,0.168289,-1.68577,0.925992,1.40436},
-{1.42867,-0.892126,0.262141,0.307225,-0.951306,1.38196,-0.728869,0.319043},
-{0.13951,-0.538299,-0.107962,0.370945,0.809012,1.83285,-0.951098,-0.0192296},
-{-0.24702,0.992114,-0.865963,0.681391,0.616911,-1.25823,1.37272,-0.405411},
-{1.55571,0.0192892,1.45179,0.186482,-0.152518,-0.257762,-0.833094,0.00577311},
-{-0.242198,-0.774192,-0.86156,0.991197,0.195455,0.670919,1.44314,0.515926},
-{0.405336,-0.228159,1.06259,-0.21443,-1.58614,1.13637,0.811685,-0.236429},
-{0.507745,0.074398,0.266039,-0.112387,0.977209,-0.600809,1.43474,-1.4099},
-{-0.0917663,0.669177,-0.911825,0.0500723,1.95743,0.0154906,-0.710767,0.243701},
-{0.481562,-0.951578,1.72838,-1.24032,0.629132,0.270267,0.185945,-0.0909246},
-{1.19697,-0.576168,-0.355474,1.184,1.18151,0.00954522,-0.758864,-0.38764},
-{1.36069,-0.965855,0.881144,-0.305908,-0.138624,0.95165,0.470982,-0.962228},
-{-0.412674,-0.162429,1.24246,0.215614,-0.190758,0.185485,-1.26035,1.59782},
-{1.7233,-1.02853,0.708902,-0.705601,0.736584,-0.463615,0.603755,-0.265125},
-{-0.171625,0.994245,-1.16615,1.47341,-0.906766,0.725075,-0.443446,0.507531},
-{-0.877189,1.47809,-0.597217,0.392568,-0.194374,0.270966,-0.589283,1.39253},
-{0.0658357,0.498163,-0.196594,0.147868,-0.348259,-0.196625,2.11986,-1.03849},
-{0.261188,0.170408,0.389773,0.034553,-0.891044,2.07769,-0.549077,-0.455646},
-{0.590399,-0.0467183,-1.27306,-0.617851,0.467039,0.87919,0.606851,1.28071},
-{-0.897853,0.713074,0.696729,-0.812095,1.4373,-0.592191,0.922986,-0.414167},
-{0.54709,0.646744,0.630487,1.50951,-0.345142,0.350881,-1.17514,-0.402886},
-{-0.0816486,0.289308,-0.293964,0.86241,-1.05741,1.40111,-1.11131,1.05698},
-{0.186736,0.0771509,1.41461,-1.00273,-0.153773,-0.114169,1.4834,-0.634813},
-{0.363376,0.423276,-1.35003,0.73783,1.35552,-1.15193,0.292795,0.411996},
-{0.731525,-1.33912,0.457722,1.0034,0.0192787,0.532992,-1.18752,0.913092},
-{-0.31047,1.2268,-1.553,1.20347,0.0226895,-0.455502,0.438372,0.527228},
-{-0.239933,1.39976,0.334577,1.10709,-0.871845,-1.04237,0.37649,0.427001},
-{0.971516,1.38103,-1.62783,0.60115,0.073291,0.180237,-0.252818,0.0398674},
-{1.10027,1.2861,-0.359542,-1.1075,-0.42857,-0.0905618,0.877396,0.683471},
-{-0.625662,-0.595133,1.40743,1.49617,-0.587654,-0.0180775,-0.155266,0.446349},
-{0.948704,0.636859,-0.179848,-0.685071,-1.20254,1.30743,0.10664,0.850157},
-{-0.097477,0.257188,0.40842,-1.28178,1.83085,-0.690013,-0.17072,0.73336},
-{1.88226,-0.462958,0.0975533,-0.398942,0.315353,-0.689253,0.0387385,1.21094},
-{0.139807,0.465299,0.548072,0.709881,1.07842,0.885513,1.30961,0.886652},
-{-0.294122,0.381301,-0.219781,-0.964707,0.404105,1.58573,1.13793,-0.482169},
-{0.377838,-0.0050249,0.535722,-1.15191,0.658768,-1.01305,1.19409,1.1331},
-{0.175,-0.0275022,-0.0336047,0.0388552,-0.180907,0.565689,-1.23001,2.13179},
-{0.931122,-0.787445,1.06286,-1.30927,1.16088,-0.357942,-0.230584,0.75641},
-{-0.451216,-0.159499,1.55692,-1.38334,0.764803,0.101408,-0.382677,0.980935}};
diff --git a/libspeex/exc_wb_table.c b/libspeex/exc_wb_table.c
deleted file mode 100644 (file)
index 2014ef5..0000000
+++ /dev/null
@@ -1,128 +0,0 @@
-float exc_wb_table[128][8]={{0,0,0,0,0,0,0,0},
-{0.775771,0.440749,-0.495126,0.0484444,-0.558805,1.94737,-0.772592,0.0683286},
-{0.770298,0.767063,-1.48262,1.45348,-0.153233,-0.564021,0.330471,0.195552},
-{-0.757402,-0.34029,1.66061,0.552675,-1.08727,0.194918,0.979085,0.169412},
-{-0.185719,-0.514093,1.37466,-0.759508,0.313433,0.257598,-0.766254,1.58689},
-{0.39876,0.484886,-0.909725,0.0310173,1.64044,-0.840648,-0.572353,1.08004},
-{-0.0572745,1.83617,-0.462888,-0.771793,0.152308,0.751314,0.750204,-0.757503},
-{0.666645,0.426114,0.411757,0.440951,0.685107,1.04417,1.18874,1.26219},
-{-0.312804,-0.0183786,1.58263,0.765403,-0.411226,0.976233,0.10062,-1.09916},
-{1.37911,-0.632356,0.661254,0.315078,-1.02059,1.24908,0.0466878,-0.726069},
-{0.132778,-0.0542109,-0.107961,-1.19117,0.119262,1.86047,0.924067,-0.20808},
-{0.0757026,0.372034,0.193145,0.351066,-1.28067,-0.483544,1.87521,0.495347},
-{0.360565,-0.135176,-0.378865,0.0555138,0.447026,0.104883,-0.96553,2.12743},
-{0.781177,-0.261961,0.204314,1.22309,0.536275,0.917566,-1.33994,-0.623591},
-{-1.28928,0.699913,1.03915,-0.143057,-0.495769,-0.47707,0.942017,1.17349},
-{0.144841,-0.115187,-0.240342,1.55885,-1.24175,0.855755,-0.561126,0.856463},
-{-0.297538,-0.709477,1.19287,1.88206,0.0534102,-0.247618,-0.125041,-0.146487},
-{0.0429008,-0.0519561,-0.248789,0.314744,0.225377,-1.323,0.92677,1.76619},
-{1.51397,-0.588726,0.183482,-0.682625,0.633467,1.28349,-0.848284,-0.163051},
-{-0.303961,-0.122323,1.083,0.979169,-0.798078,-1.25728,0.702003,1.04917},
-{0.918395,-0.466791,1.48064,-0.994999,0.120815,0.573571,0.673281,-0.797386},
-{1.43322,-0.776617,0.698546,-0.482307,0.0946818,-0.914728,0.441308,1.19569},
-{0.546749,-1.1585,0.329245,0.993999,0.348764,-0.748592,-0.461701,1.53486},
-{0.84956,1.21544,0.611375,0.825878,-0.574422,-1.40927,0.0218958,0.253053},
-{1.12829,-0.380426,-0.455433,1.37505,1.10982,-0.73439,-0.767009,0.187596},
-{-0.16941,0.177178,1.12278,-1.0607,0.556393,1.46179,-0.965152,0.0782219},
-{0.846189,-0.751599,0.717835,1.23919,-1.49093,0.0408583,0.645834,0.179195},
-{1.20009,0.201024,0.146934,0.287647,-1.14693,-0.747884,0.415407,1.50782},
-{1.32405,0.41783,-1.18055,0.0203925,1.10455,0.430449,-1.1049,0.311481},
-{-0.948474,1.20769,-0.952185,1.30785,-0.461345,0.812843,-0.190386,0.231567},
-{0.32806,-0.845516,-0.808372,0.892217,1.65227,0.726494,-0.421723,-0.0394001},
-{-0.735431,1.26056,-0.112061,-0.361656,1.1905,-1.12137,0.0166439,1.08075},
-{0.233589,0.044441,-0.339363,1.78981,-0.891615,-0.12416,1.1161,-0.654994},
-{0.667562,1.40902,1.26168,0.297422,-0.419786,0.163962,-0.564644,-0.953517},
-{-0.108021,1.296,0.539957,-1.18658,-0.806598,0.468139,1.3425,0.105849},
-{1.94549,-0.661905,-0.848373,0.0939239,0.887829,-0.338309,-0.0938294,0.496034},
-{0.512513,1.26602,-0.484184,-1.46634,0.600489,1.07784,-0.449645,0.272972},
-{0.373461,-0.0133473,-0.225367,0.888525,0.152544,-1.42283,1.69522,-0.0772472},
-{-0.499101,-1.2905,0.297369,1.17037,-0.0757249,-0.0375968,1.22149,0.884705},
-{-0.807021,1.42566,-0.257394,-0.0345958,-0.425846,1.15661,-0.767917,0.941804},
-{-1.29859,0.570665,0.537508,0.957761,0.0342095,-0.508587,1.43004,-0.314701},
-{0.196714,0.928304,-1.17023,0.876087,-0.399692,0.575468,-0.853138,1.25611},
-{0.562785,-0.696234,-1.35948,1.10816,0.850598,-0.344437,0.586342,0.888893},
-{0.0754354,1.01784,1.59635,-0.0469297,-1.04188,-0.721341,0.0453567,0.841556},
-{0.519945,-0.616138,0.496482,-0.429389,1.58022,-0.848711,-0.559528,1.15961},
-{-0.304117,1.59114,-0.130884,-0.309588,0.17195,-1.1074,1.3491,0.204715},
-{1.89383,0.560069,-0.705705,-0.787143,-0.0353329,0.269826,-0.0505539,0.915421},
-{1.4389,1.05995,-1.13903,0.185456,0.186799,0.656613,0.208571,-0.935401},
-{1.36601,-0.837739,0.697474,-0.489343,0.228542,0.409494,-1.05712,1.22495},
-{1.00409,0.391417,-0.235596,0.259372,-1.02847,0.790305,1.34444,-1.05455},
-{1.66946,-1.67023,0.317712,0.695016,0.0515751,-0.230551,0.0776751,0.186626},
-{1.12082,-0.212203,-0.709065,-0.26147,-0.988522,0.654864,1.08864,1.14235},
-{0.434711,1.39689,0.0749227,-0.786222,-0.784015,-0.449397,0.718669,1.38294},
-{0.0790131,0.235079,0.920765,-1.16727,0.830221,-1.17265,0.782715,0.948728},
-{-0.963013,0.857078,0.0182286,1.36314,-0.208667,-0.84204,0.0961981,1.19678},
-{1.28868,-0.583239,-1.25485,-0.0380027,0.632627,1.29698,0.386559,-0.31326},
-{-0.678492,1.72207,-1.39915,0.723837,0.1924,-0.263941,0.147904,0.487105},
-{-1.14448,1.13022,0.660272,-0.439701,0.285009,1.28374,0.41188,-0.821226},
-{0.281919,0.333533,0.285269,-0.386696,0.647669,-0.459306,1.80357,-1.14347},
-{-0.518794,0.0139493,0.00689697,-0.7624,-0.282019,0.553949,1.53549,1.44821},
-{0.200769,0.201108,-0.0199344,0.277907,0.742188,1.493,0.314615,-1.59739},
-{-0.819861,-0.36448,0.0482586,1.35906,1.37588,0.455571,0.423741,-0.779836},
-{-0.442476,1.63289,-0.371685,0.734756,-1.26128,0.0846302,0.783122,0.191572},
-{1.21222,-0.492701,-0.63772,1.11652,0.558305,-0.0722016,0.838788,-1.15318},
-{0.40832,0.284751,0.112715,-0.892692,1.15749,0.552406,-1.40847,1.13029},
-{-0.844766,0.156722,1.75698,-0.784186,-0.539899,0.993032,0.10886,0.408235},
-{-0.519506,1.50281,-0.811893,-0.0770795,1.18193,0.166596,-0.976262,0.633815},
-{1.25859,1.20472,1.02703,0.804729,0.501985,0.507974,0.457387,0.383234},
-{0.738665,0.861996,-1.60455,0.304943,1.31111,-0.225601,0.357081,-0.273263},
-{0.633034,0.426478,1.0395,0.994155,0.19338,-0.735345,-1.37469,0.598933},
-{1.12268,0.123073,-0.177913,-1.08642,1.74849,-0.0327693,0.134861,-0.318752},
-{-0.279982,1.92996,0.7596,-1.09139,0.261731,0.20264,-0.374665,0.151212},
-{0.132535,-0.250428,0.367428,0.263679,-0.297366,1.29999,-1.48745,1.29124},
-{-0.142985,-1.41655,0.975325,0.354926,1.01912,0.957654,-0.587599,0.326691},
-{0.2836,0.808856,-1.17204,-1.00533,0.765408,0.111144,0.761906,1.19344},
-{1.58185,-0.653009,-0.714944,1.09403,-0.357522,-0.68855,0.897552,0.328754},
-{0.486712,-1.12232,1.59151,0.546806,-0.819486,0.249542,-0.463608,0.803322},
-{1.37326,0.755819,-1.09151,-0.0329317,-0.200192,-0.46814,1.39995,0.0413843},
-{1.51079,-0.506755,-0.731195,1.02153,-0.287343,0.236801,-0.823164,1.04181},
-{-1.11132,-0.403705,-0.281905,0.379014,1.30821,0.374105,0.574183,1.28883},
-{1.28058,-1.64994,1.31054,-0.490028,0.108686,0.278282,0.0731333,0.0181541},
-{0.602272,0.468423,0.868551,-1.68355,-0.130504,0.584439,-0.0678738,1.12622},
-{2.17907,-0.782772,-0.086662,-0.426339,-0.192304,0.274945,0.592368,-0.124194},
-{-1.01046,-0.0734508,1.65899,0.730969,0.30478,-0.599344,-0.445248,0.934146},
-{0.386106,0.976593,0.7573,-1.07547,-0.642251,1.49572,0.223906,-0.69964},
-{-0.455997,0.176658,0.80257,0.632457,1.65851,0.260536,-1.12995,-0.42957},
-{-0.195011,-0.374047,0.494444,0.225348,-0.718297,0.149778,0.379982,2.14138},
-{-1.5879,1.86023,-0.0858599,0.0204928,0.0752767,0.110229,0.165349,0.357988},
-{1.38225,1.42699,0.501144,-0.659316,-1.06377,0.0409188,0.296565,0.0371474},
-{-1.13605,0.947113,0.604197,-0.823668,0.747305,0.250522,-0.576645,1.32811},
-{0.557821,-0.293609,1.12262,-0.665576,-1.34,0.393799,1.10571,0.771741},
-{0.624621,-0.843319,1.44603,-1.40395,0.958346,-0.0241084,-0.127839,0.383662},
-{-0.369219,0.182266,-0.829448,-0.419725,1.52255,1.50227,0.209066,-0.131143},
-{-1.7929,0.244035,0.990126,0.792652,0.409135,0.701928,-0.11999,0.218675},
-{0.518422,-1.14652,-0.570944,-0.533627,0.708444,0.878883,0.812965,1.21649},
-{0.409713,1.05845,-1.21391,1.15455,-0.864845,0.929817,0.0981028,-0.410504},
-{-0.0928879,-0.234633,-0.91548,-0.0164181,0.384947,0.852774,1.94388,0.14298},
-{0.0878643,0.567983,0.917475,1.16115,1.22911,1.00499,0.627254,0.431649},
-{-0.223266,1.14023,-0.907588,0.785187,0.00256339,-0.0755225,1.42399,-1.01635},
-{-0.129021,-1.00913,1.71098,-0.0900219,0.535683,-0.803703,0.793885,0.314247},
-{0.200844,0.909236,0.621273,1.37256,0.795603,-0.481157,-0.386021,-1.15294},
-{1.51266,-0.449305,-0.694055,1.32429,-0.842498,0.735748,0.0609972,-0.36188},
-{0.411097,-1.39379,-0.0206668,1.16644,0.0768579,1.16727,0.736271,-0.494066},
-{0.972158,0.806019,-0.464964,-1.25743,-0.633956,0.842753,1.23447,0.339788},
-{-0.97043,0.462674,1.28753,-1.11035,0.853929,-0.042166,0.92368,-0.145242},
-{-0.00528003,0.228362,0.2789,0.744154,-1.63914,1.51711,0.239836,-0.123921},
-{1.26087,-1.12705,0.718827,-0.54681,0.981461,-0.735483,0.877053,-0.318805},
-{1.04325,1.87304,-0.514198,-0.553957,0.528734,-0.405415,-0.377246,0.210236},
-{-0.535349,-0.208057,0.0246204,1.41322,1.29827,-0.837795,-0.513341,0.863412},
-{-0.241988,-0.0623511,0.686661,-0.156711,-0.876904,0.959126,1.77558,-0.693038},
-{2.11193,0.600993,0.20936,0.339503,-0.121784,-0.207107,-0.645788,-0.420807},
-{1.22815,0.607444,-0.874424,0.414901,0.404982,-1.19601,-0.0760612,1.27897},
-{1.0166,-1.18127,0.788539,0.510686,-0.611037,-0.293299,1.39195,-0.476282},
-{0.803049,0.635893,0.806845,0.00435291,-1.33064,0.660423,-0.855725,1.02725},
-{-0.793614,1.49047,-0.633648,-0.322054,1.40127,-0.308023,0.619653,-0.337143},
-{0.470212,1.00331,-0.157688,-0.245235,1.24111,1.08229,-0.905259,-0.959883},
-{0.0315501,0.652923,0.411305,-0.186055,0.314619,-0.972984,-0.579537,1.98314},
-{0.486815,-0.656819,-0.11027,1.80442,-0.102151,-1.2307,0.358531,0.713214},
-{0.502115,-0.777812,1.27461,-0.539509,-0.802824,1.5335,-0.389286,0.408219},
-{-0.113833,0.830114,-0.901973,0.931689,1.05204,-1.40523,0.695503,0.18954},
-{-0.851642,1.33024,1.50519,0.631487,0.224523,-0.45348,-0.497673,-0.14997},
-{1.39859,-1.18634,0.267111,0.402463,-0.68516,1.10298,-0.646773,0.6923},
-{-0.096615,0.118834,0.145958,-0.336444,1.59344,-1.37502,1.12467,-0.0263447},
-{-0.67702,1.21341,1.39213,-0.186954,-1.1566,0.178893,0.848396,-0.163224},
-{-0.416763,0.568104,0.417053,-1.40651,1.73401,-0.0791357,-0.150471,0.514234},
-{-1.12241,-0.766883,0.270181,0.275066,0.606253,1.51395,0.937476,0.266323},
-{1.12086,0.645151,1.31346,-0.222125,0.835919,-0.989588,0.0322641,-0.465444},
-{1.29269,0.762152,-0.76088,-1.08806,0.409218,1.15806,0.425753,-0.672306}};
diff --git a/libspeex/hexc_table.c b/libspeex/hexc_table.c
deleted file mode 100644 (file)
index 8459eea..0000000
+++ /dev/null
@@ -1,256 +0,0 @@
-float hexc_table[256][8]={{0.00596334,0.961802,-1.17836,-3.01893,0.498393,-1.77481,0.933678,0.707556},
-{-1.09273,0.779159,3.35175,8.96719,9.20773,-5.48121,-10.3742,-6.00719},
-{-6.63724,-0.431913,1.22604,4.36403,0.315399,-1.74806,1.18705,1.3023},
-{-0.34432,-0.291574,-0.676932,-0.693059,-0.7169,-0.664636,-0.479618,-0.499353},
-{-0.289628,-0.69633,-0.420114,-0.550872,-0.194063,0.406592,0.129426,0.638474},
-{1.55285,5.18598,-4.07314,-0.57972,1.41307,-3.34088,-1.75373,0.836238},
-{9.64848,5.49757,2.71352,-0.774738,-5.77379,-11.3207,-6.64266,8.36487},
-{5.35712,2.3447,0.611676,-3.20016,-0.573763,-0.633532,-3.71085,-0.11144},
-{1.55562,-3.0477,-0.443413,-2.66988,1.62136,1.25092,-0.598591,1.3126},
-{0.107545,-0.229729,2.97792,-0.0144502,-0.467264,-1.0848,0.459428,-1.23135},
-{-1.31507,-1.83314,-1.68476,0.838043,1.36763,1.84906,1.59447,-0.581666},
-{-1.84137,-1.61001,0.212489,-1.57008,1.15597,-0.186575,0.104659,0.534858},
-{1.3404,-2.36834,0.652265,0.144586,1.38806,0.0279121,0.0943678,-1.38542},
-{1.80025,1.93867,2.00891,0.685305,0.462605,-9.82099,-1.43226,-1.02076},
-{1.06998,0.460049,1.99375,-3.45493,-2.93745,1.12063,0.883749,0.0620846},
-{-0.421529,1.10504,-7.0891,-0.115913,3.5515,0.749357,2.06642,0.302182},
-{-4.9891,-4.97802,3.03304,-0.545989,-5.1588,1.47589,4.97565,1.61485},
-{10.6517,6.05228,7.04337,5.2549,4.60269,4.3744,1.75997,0.923521},
-{-7.65203,5.27239,-4.24031,-1.84605,2.09177,0.721852,1.14006,2.23425},
-{-0.767754,0.334586,0.809721,0.580797,-0.480078,-0.629865,-0.0528265,0.211446},
-{-0.579945,-1.66864,5.09098,-0.45305,3.4849,2.62679,-3.21053,-2.14739},
-{0.240911,12.8432,-8.82027,-1.6974,-6.1177,-8.82078,3.68925,-0.0674868},
-{1.85091,-0.942606,0.473398,-0.591,-1.94523,1.96216,-2.48735,-0.454837},
-{5.09157,-9.95944,1.32533,7.88265,1.75663,-1.93783,-1.24923,-0.293239},
-{-1.22145,-5.98452,3.7634,-0.705553,3.38743,-0.413326,-1.65825,2.90272},
-{1.2211,-1.75124,3.31627,1.23058,-3.09041,1.4764,0.354087,-0.887407},
-{2.51455,-1.35068,-1.29518,2.8944,-2.37898,1.2081,1.24154,-3.28068},
-{-0.319508,-0.252012,-0.133097,-0.305965,-0.562591,-0.759897,2.05952,0.299892},
-{-0.800117,0.0891911,0.299706,2.16995,3.36063,-0.111935,-0.646773,-3.46147},
-{3.00977,1.33377,8.45317,-3.46033,4.25616,-6.27074,-6.8382,-0.565441},
-{-1.11805,-0.977105,0.09164,6.71365,1.30803,10.4462,-9.19217,-8.67702},
-{3.54213,6.58884,-3.49584,1.99994,-8.29993,0.640732,-2.04007,-1.86263},
-{0.994519,0.128403,-1.17005,1.30192,-5.75131,-5.0784,8.31152,-2.85104},
-{-1.60038,5.54056,1.85563,6.81351,-2.48191,0.468508,-1.57252,-2.08778},
-{-0.971087,-3.78474,-3.88213,-3.01418,-4.89943,-3.35667,-1.89404,-2.25134},
-{2.18713,0.162262,-0.794402,-0.894054,0.301279,-0.367108,-0.16506,-0.325218},
-{3.54902,-1.02119,-2.61702,-0.433606,4.35146,-0.148326,-3.46654,2.14477},
-{3.56186,4.39716,-12.5599,-4.90088,1.10731,3.61826,1.3884,2.58328},
-{1.7457,0.499283,-1.11856,-3.02534,-9.0291,1.82454,2.67053,4.79438},
-{6.33564,1.3493,-2.90245,4.9839,-2.07942,-2.99799,-1.37353,0.194392},
-{0.59306,-0.667111,-1.63125,-1.94958,-0.273168,1.86502,2.00237,0.635809},
-{0.162288,0.0477809,0.397164,-0.0260089,0.0535681,-0.783583,-1.75111,-1.94167},
-{0.911535,-4.70564,-2.89805,-2.72332,8.24786,5.59401,-1.56173,-1.95495},
-{0.517353,-0.525953,-3.41303,3.64218,-0.911369,1.06019,-1.16563,1.05369},
-{-0.161767,-0.0456504,0.418959,0.160653,0.480297,-0.206741,0.636733,-1.81423},
-{-0.11519,-0.0362332,-1.05077,0.102514,-0.021697,-6.09927,1.80389,5.41577},
-{0.0991684,-0.682428,0.259715,-0.134647,0.416149,1.29069,-0.370203,-0.775089},
-{-4.50775,-0.00100952,-4.76029,4.93879,3.12663,1.40609,-2.15292,1.06787},
-{-2.78658,-2.41158,-1.97123,0.482207,2.33509,-3.01037,8.20183,0.841873},
-{0.287164,1.86315,7.77262,11.2794,-12.9211,-7.09667,-1.35359,-6.19793},
-{-6.79787,-1.34923,6.98219,0.0379624,-1.31655,-0.496518,-0.84944,1.89517},
-{0.245815,-1.10537,0.826552,0.0871601,-0.368666,-0.238575,-0.318147,0.0367272},
-{-4.26892,-1.14217,-1.47639,-6.52443,6.09884,1.01617,-1.62314,7.8186},
-{1.54392,5.37571,0.977919,-0.847368,-2.70392,-1.01109,-0.922396,-1.28249},
-{-0.495491,-0.256343,-2.23996,1.32637,0.479325,2.8504,0.512101,6.20605},
-{5.69122,-0.488377,-1.46671,0.681471,0.868299,1.68511,0.838676,-0.825714},
-{-2.31738,-2.1621,0.522756,0.900326,-0.470159,1.05873,-1.0559,-0.210936},
-{-0.459554,-1.06285,0.573956,1.98694,-0.65771,-1.34037,-0.0553681,1.62538},
-{-2.72696,-1.52834,-0.593637,5.75016,-3.12266,4.86092,0.413699,0.359828},
-{0.0808353,0.193152,0.0389671,0.175378,-0.211664,0.327569,-1.21192,0.0455147},
-{-0.882134,-1.33219,-1.5698,-0.629834,6.19642,0.60124,4.43049,-4.09649},
-{3.84539,-0.45681,1.76585,0.421058,0.929836,-1.3123,0.0920509,-0.565889},
-{0.204747,2.37451,-0.0402808,1.797,-2.46898,-1.09955,-5.20885,1.3839},
-{-0.189646,1.62857,-0.833329,-0.0364312,-2.83753,0.378956,0.39833,0.980087},
-{1.40852,1.19171,2.7495,-5.64983,1.96283,-3.27398,0.199364,1.38964},
-{-1.09869,1.3949,0.759887,0.687602,-1.42357,-2.77522,-3.61392,-4.87194},
-{-8.17908,-2.77667,-0.327769,-0.23556,4.90227,2.59569,-0.200477,-0.707252},
-{-1.7181,-1.89374,-1.89098,-2.34294,-1.41945,-1.285,-0.821974,0.250006},
-{0.57952,-2.18138,-1.63374,0.37941,0.450371,-0.115038,0.438043,0.546956},
-{0.0783844,2.43611,-1.9918,-0.547415,0.366085,-0.915101,0.498379,-0.843595},
-{-0.388358,1.27791,-1.16751,0.609873,-5.74965,2.55315,-10.591,14.4464},
-{6.1754,3.11497,1.50675,-5.21698,-0.804491,-1.65617,2.34825,-2.34182},
-{-1.98947,-2.5542,-0.827056,-2.67255,2.4294,1.31308,3.25936,1.28217},
-{2.0815,2.90298,1.029,-0.162884,1.25637,0.52683,0.122897,-0.25819},
-{-1.36184,-4.72108,-6.19039,0.875934,2.2871,3.55011,3.12527,1.12481},
-{-4.24993,1.57179,-0.643034,0.0488152,-0.855254,0.319326,-0.670514,1.94472},
-{0.392787,-0.572109,0.330958,-0.574133,0.489689,-0.233161,0.539798,-0.153841},
-{-0.151992,1.05461,1.59571,-1.14266,-0.775412,-4.78044,1.85783,-0.375044},
-{-1.37613,-1.17214,1.15579,-2.18811,0.0144438,3.36288,-0.559745,0.266116},
-{-1.90271,0.133615,-3.72728,5.39488,0.389955,-1.14554,2.92875,-1.07409},
-{-1.13268,-1.16504,-0.803357,-1.26185,-0.995426,2.98762,11.6034,-1.55409},
-{1.58461,3.43271,3.15758,3.61008,4.19841,2.95134,2.02262,1.21991},
-{-3.16395,1.76306,2.06703,1.88901,0.179146,1.37067,-1.19422,-0.984654},
-{0.0414621,-0.00391642,-0.0213088,-0.0476843,-0.0975031,0.017092,-0.014006,-0.00491766},
-{-1.2966,-3.69977,-0.196889,-1.74452,10.1355,-1.55321,1.81829,0.659723},
-{0.378435,13.6983,2.15336,-3.18556,-0.798485,0.863881,-0.15097,-0.732861},
-{-0.855569,0.24939,3.83951,-1.22131,-3.45346,0.658904,-3.41821,1.70097},
-{3.33813,-3.7548,-2.07261,-2.04664,0.0186421,-1.50429,1.8991,0.258947},
-{-1.4418,-3.00819,0.541237,4.31623,3.25692,1.92429,-0.401486,0.123254},
-{-2.61994,-3.4407,6.94121,2.97651,-0.864004,0.612121,1.20001,-3.97684},
-{-1.01072,-1.01778,-1.46718,0.962642,0.139496,6.4504,0.58795,-2.77344},
-{0.0683276,0.242321,-0.332268,-0.167348,0.0588223,-0.561949,0.0128769,0.692257},
-{-3.70373,3.53353,1.36103,-1.28587,4.6419,5.95083,0.463164,-4.46743},
-{4.73618,-2.4861,2.62966,-7.29803,-4.98566,-2.26953,-2.30375,3.06739},
-{-0.494718,0.718938,-0.304026,1.24893,-0.278192,4.10163,-6.95281,2.14885},
-{-0.472974,3.22649,-6.07153,1.07686,-3.75601,-1.10709,3.21006,0.312003},
-{0.170852,-0.556819,-5.61366,-10.0139,-5.71126,-2.51742,13.3491,11.8559},
-{-0.594016,1.23359,0.0658363,3.54037,-0.155034,-1.52533,0.0236745,-1.75594},
-{-15.9805,-7.17243,-13.2139,-10.7127,-7.74589,-7.88822,-2.35093,-1.36059},
-{-0.839397,-5.89704e-05,1.0169,-0.124808,-1.23702,1.07154,0.112274,-0.437035},
-{-0.498523,1.84575,-1.76887,-0.467115,2.6392,-0.207664,-1.27903,0.778147},
-{-0.894377,2.73574,-1.91608,-3.84077,0.645348,1.09503,0.102773,2.86183},
-{-1.16055,-3.20939,-3.60614,-8.21962,3.97539,12.4943,2.7547,10.0854},
-{15.0031,9.64887,-13.4129,3.18632,6.62155,0.941796,-8.23323,-8.32332},
-{-0.543627,-0.442222,-0.654387,-0.360416,-3.47404,-1.51365,3.9665,3.00349},
-{0.203788,1.75743,-0.0272479,0.617584,0.391623,0.884434,-2.73177,-1.05421},
-{1.26367,-12.8384,-1.06154,-1.10927,-0.234052,4.10143,3.1193,2.77169},
-{-0.507726,0.243182,-0.870555,0.644998,-0.567712,0.669043,-0.255913,0.462607},
-{-1.75066,3.07852,2.09557,-1.43375,1.54424,-0.999114,0.849652,-3.49942},
-{0.651646,-0.608241,0.548973,-0.48609,1.13023,-1.09611,-1.04516,1.27515},
-{-0.558097,0.401336,-0.948848,0.915317,-0.297274,3.34695,-1.907,0.354723},
-{-0.00229686,-0.41602,-0.641986,1.46701,1.20854,-0.559052,-0.817557,-0.262575},
-{-0.28695,-0.784754,0.4309,-0.00134333,0.474683,1.639,4.43773,-3.56919},
-{0.689816,2.2718,5.07713,-0.261499,0.422245,-1.12882,-2.44818,-1.98737},
-{-0.683059,0.46414,1.07219,-0.832315,1.01921,-0.012251,-0.468265,-0.0879798},
-{0.593875,-0.333936,-0.348577,0.902744,-0.471702,-0.148596,0.430625,-0.369835},
-{-7.15968,7.69222,-1.20884,-2.51399,9.04829,-8.10114,-3.45027,5.60251},
-{-3.12493,5.07696,1.41182,-3.44671,-3.56646,-1.87571,1.44955,1.77522},
-{-0.285136,-0.255548,-0.615051,0.346838,-1.27277,0.356668,-2.43423,5.33611},
-{0.512416,-2.74434,0.546467,2.83784,-0.533482,-0.817829,1.83944,-0.731159},
-{-0.528217,-5.85344,1.99714,-2.2978,0.098025,2.85496,1.09226,-1.43392},
-{-1.14276,1.48479,2.45777,2.07843,-3.71661,-0.741793,2.22734,-1.37552},
-{-7.3812,-4.55657,10.8417,10.8648,-1.20119,-1.15897,-3.46763,2.56275},
-{-0.316369,-0.0895606,-0.509939,-0.171779,-0.624263,0.654241,1.05006,2.63367},
-{-1.59816,0.335927,2.00651,3.53271,4.00066,1.59781,2.14921,-13.6871},
-{1.29544,-0.998222,1.64711,-2.71804,0.37388,-0.777328,0.648924,-0.758115},
-{0.123894,0.0498136,0.973389,0.587381,1.71504,-0.375171,-4.65329,0.85261},
-{3.10734,0.338142,-0.0128751,-0.864252,-1.49979,-2.89216,1.18564,1.80511},
-{-0.0904794,-0.538784,0.082841,-1.0526,1.32898,-1.73746,1.91643,2.8206},
-{-0.656568,0.848891,2.71889,1.47392,6.31869,-4.70759,-2.1531,-3.02864},
-{-3.19259,-4.22885,-1.97228,1.00988,-0.506759,0.192971,1.32023,2.91531},
-{0.408182,-1.64363,-1.30707,0.384958,-2.621,-0.650188,0.350918,-0.0830882},
-{0.22472,0.14646,-1.11336,-0.331597,0.982495,0.27725,-0.0547889,-0.0909637},
-{-1.69001,5.3349,-0.366215,2.32444,0.676152,-1.63652,-0.496699,0.990876},
-{-1.01343,2.02632,3.75093,-1.48647,-5.80882,-8.40272,-2.27878,10.2562},
-{3.8378,2.05113,-2.59689,-2.39786,-2.69032,0.0530386,0.26899,0.972373},
-{0.49211,0.0821152,-1.2347,-2.92653,2.16986,1.5811,0.59131,-1.51669},
-{0.467823,0.150847,1.88578,1.80124,0.0210955,0.103743,-1.30309,-0.624813},
-{-3.24128,0.153595,0.394586,1.34867,2.18227,2.90401,2.97036,1.87611},
-{-1.85919,0.571944,-0.334621,-0.769427,0.31506,0.493431,0.441428,0.315109},
-{-0.271593,-0.470292,0.489023,-0.56287,2.15425,-0.313037,2.40481,-0.930909},
-{1.0053,1.67489,1.8417,5.49286,2.59641,-9.01027,1.00317,-7.85156},
-{0.192674,1.23763,-0.2898,-0.821004,-1.89117,1.01075,1.95767,-2.19794},
-{2.12767,-0.14419,-4.98615,-0.415483,-0.621716,-1.12736,1.07307,2.17722},
-{-10.0525,-1.37945,12.0511,-8.52086,-12.1122,4.01575,7.7583,4.85601},
-{17.7165,16.2218,15.2097,16.8817,18.1844,16.7123,12.2521,9.76576},
-{-6.85617,7.56277,-3.45185,6.8115,4.55666,-1.9991,1.78707,-1.73036},
-{-0.499327,-0.0698337,-0.0373869,0.200028,0.329592,-0.0486077,0.0663931,-0.219115},
-{-2.27881,-2.05002,2.67206,1.03504,1.92792,0.121717,0.562062,-0.835895},
-{0.99975,11.1524,1.06566,1.68586,-0.504727,-5.86336,-3.12448,-4.47146},
-{0.285341,0.755941,0.0583213,2.3038,-2.79715,0.933629,-1.48385,0.0677943},
-{7.66993,-10.4982,-9.97698,6.17148,0.167368,-2.61863,-2.28408,4.39419},
-{-8.53897,-13.7514,0.266647,4.65467,3.68827,-4.83792,5.20001,10.7581},
-{1.03452,-3.55737,2.1642,1.52748,-0.342402,2.28709,-1.64957,1.22567},
-{-1.0491,1.7385,1.34901,0.655908,-6.00214,5.13727,1.03022,-4.067},
-{1.47236,0.335302,-0.69815,1.23935,1.03984,0.212929,1.88324,1.36407},
-{1.59779,0.719427,-4.42698,2.39738,5.85166,1.55233,-1.7612,-6.04771},
-{-2.0815,3.45684,10.8921,-8.82219,4.29542,1.09212,-2.85653,0.495975},
-{-1.04604,3.60327,2.37328,2.24126,4.81999,5.53379,-13.2484,-1.413},
-{0.488281,2.15665,0.747949,1.81346,-7.05606,-1.65903,0.150788,2.36166},
-{1.25837,-0.720683,1.14494,-3.89918,-0.920351,-10.1479,9.42865,3.23743},
-{0.470473,-0.457707,0.70375,8.20134,-1.67875,-0.674016,-2.50759,-3.23649},
-{-8.45883,-4.82219,-5.41379,-4.18737,-3.69233,-3.11833,-1.47025,-0.0576363},
-{0.152079,1.29853,-0.206948,-2.06923,-0.237207,1.04946,-0.84165,-0.377527},
-{-0.211852,-0.00916021,0.914064,-4.63152,1.14687,1.25372,-3.83941,2.45133},
-{1.81849,4.29555,-2.98607,-6.09764,5.12727,1.66926,-1.61484,-1.91625},
-{-1.874,0.549654,-2.78619,-2.47448,-6.14046,8.90464,0.0288635,6.82601},
-{4.6217,2.7517,1.04102,1.74871,1.00226,-1.02518,-2.89941,-2.91679},
-{-0.263811,-0.67306,-2.09165,0.0961835,-2.75083,3.57406,1.60871,1.06315},
-{0.600714,0.441095,0.417873,0.0629572,0.0999319,-0.344547,-0.272613,-0.516114},
-{-3.89916,-12.2242,3.70331,5.16777,9.65396,9.09547,-4.37104,-1.57708},
-{-1.84074,1.29088,-2.02276,2.04776,-0.887496,0.801188,0.383502,-0.368345},
-{0.656491,0.143978,0.624393,-0.158679,0.427109,-1.56755,0.619428,-4.2152},
-{0.609344,0.0732138,0.873515,-0.617669,1.05644,-4.91967,-3.81445,3.99232},
-{-0.409582,0.16064,-0.0131707,1.03396,0.361093,2.09456,-0.354058,-2.99418},
-{0.809913,-1.76251,-2.44662,3.11799,2.88003,-3.4845,-0.188212,0.652149},
-{0.406978,-0.0842555,-0.349887,-1.77173,-0.50055,-1.06198,5.77243,0.0498347},
-{3.18269,1.12462,6.41939,4.60169,-5.97689,-1.26831,-5.5743,-1.79626},
-{-2.53636,0.0317959,2.79664,-0.353874,-0.112605,-1.60821,-0.133658,1.60668},
-{1.91824,-1.02026,0.159537,0.0412503,-0.85463,0.832986,0.0705105,0.279141},
-{-5.02989,1.85044,1.82933,-2.36279,3.71654,-1.09433,-1.57432,1.25383},
-{0.99047,1.45704,1.37992,-0.589451,-1.24788,-1.50652,-1.19568,0.39856},
-{0.00706045,-0.599155,2.22793,-2.16684,-1.27906,0.0548773,2.21572,6.60851},
-{2.2303,0.0380174,-3.36751,0.0567251,0.580353,1.31216,-0.878314,-1.62739},
-{-0.929961,-0.980825,0.109624,0.733087,0.48422,0.601498,0.860915,0.343296},
-{-0.895637,-3.87482,3.13111,4.75071,-3.33122,-3.58624,1.14427,2.81316},
-{3.45503,-7.73637,1.48223,9.10071,-7.08029,6.03079,2.97385,-7.47854},
-{-0.437426,0.244051,0.123814,0.125134,-0.704714,0.403038,-1.45737,1.76556},
-{-0.776061,-2.66567,-2.13818,-0.301486,2.19431,9.31766,11.6326,-12.9785},
-{5.32131,-3.93852,3.25484,-1.54489,-1.04619,0.357715,-1.25165,-1.42639},
-{0.393764,1.25782,1.8604,1.92865,0.637688,-1.72167,-12.2475,4.44725},
-{1.32603,1.2719,-0.799616,1.0445,-0.472987,-0.572721,-0.388705,0.0559285},
-{2.13059,4.79752,-3.01884,-11.9279,3.68476,-7.27929,2.36094,1.79636},
-{2.01085,3.33588,3.45415,0.707843,-1.88576,-1.93373,-5.90498,-12.0753},
-{-13.1358,-0.0722972,1.1759,-0.233742,-0.469496,4.38377,2.22281,1.5721},
-{1.44864,0.484473,-1.04305,-1.91033,-1.7157,-3.04247,-2.18691,-1.66752},
-{-1.89339,-0.656363,-3.56054,-0.157522,0.597456,0.181031,0.305276,1.17847},
-{-2.99884,2.18798,-1.60484,-0.120089,2.16557,-2.16618,2.11124,-0.19639},
-{0.639774,-0.139229,-2.33318,-1.39971,-2.31862,0.139156,-2.04763,11.8003},
-{8.72324,0.0659868,2.72419,0.407081,-5.44599,-1.47224,0.605711,-2.40505},
-{0.0521982,-1.62578,-0.653986,-8.16205,3.39202,0.744154,3.70636,0.841041},
-{0.219746,0.918197,1.4789,1.54168,1.08978,1.11674,0.929919,0.169255},
-{-10.0517,-4.4404,-13.512,-0.762768,7.76414,6.38467,5.95964,-1.69592},
-{-4.8178,-0.237022,-1.62624,-1.58952,-1.77048,1.70292,0.255762,-1.4344},
-{0.492779,-0.0236254,0.23246,-0.255688,0.559473,-1.94112,0.820715,-0.546517},
-{0.923056,-0.517965,0.592486,-1.11193,2.87061,-5.2177,3.94727,-2.44346},
-{-2.39633,2.94591,2.56805,-3.08263,-0.500908,2.79285,1.94271,-0.54145},
-{-0.322366,-2.03661,-9.94176,7.36866,-5.18107,1.64396,4.91411,-1.37354},
-{2.39178,2.2664,-3.19701,-6.74048,-4.5786,2.73158,7.68536,-2.16476},
-{5.03591,1.12068,3.87863,3.70015,-0.119696,-0.347596,0.416848,2.02736},
-{-6.64054,6.49094,4.84356,1.34578,0.554388,0.97534,-1.63704,-1.95429},
-{0.189083,0.253443,0.351171,0.330216,0.341852,0.47609,0.172018,0.40755},
-{0.0613737,-4.35191,5.36635,-0.253103,2.42636,-2.32654,2.31745,-0.0704671},
-{-1.93029,9.65932,2.30469,-12.7983,-5.15272,5.96595,-3.53528,-3.19886},
-{1.41572,0.286996,0.244565,0.130537,-6.55088,3.56512,-4.17733,2.66477},
-{5.81587,-4.98287,-1.32456,0.73151,-4.39559,1.45896,1.66452,0.335995},
-{1.66357,-7.16468,-2.14436,2.00926,1.21921,0.952822,-0.505583,-0.591253},
-{1.6658,-8.68521,10.3974,-2.57838,0.666186,6.00717,-2.46826,0.550397},
-{0.363529,-1.92985,-5.13981,-0.583374,-4.53813,9.68008,4.04232,-1.13259},
-{-0.621135,1.05921,-1.10351,0.422243,-0.154673,-1.85978,0.127122,1.38249},
-{1.90018,1.47782,1.0164,-3.71849,-0.253692,4.9619,-1.32665,-4.14597},
-{14.2059,-3.19643,6.07712,-7.06154,-5.59924,2.66166,-6.71292,1.60592},
-{-1.14988,-2.11124,-0.822718,0.427132,1.18521,9.47297,-4.22216,0.995913},
-{1.63825,3.91994,-2.24553,1.74886,-0.910052,-2.6372,2.55721,-1.43779},
-{-0.187612,-1.12707,-3.21935,-2.53696,0.444087,0.250754,6.32012,6.84569},
-{0.402972,1.10826,0.537091,2.65937,-2.35776,-3.67383,-0.411338,0.00468015},
-{-17.4953,-19.3723,-14.7056,-16.8843,-18.4026,-16.6708,-12.4375,-11.2071},
-{0.571586,0.621064,0.399659,-0.879283,-0.81783,-0.11569,0.346091,0.370155},
-{0.26496,-0.612374,0.656908,-1.40373,4.63243,-1.55518,-0.146315,-0.211709},
-{-0.221528,4.37888,-4.90966,-0.826994,-1.15318,2.45195,-0.999603,-0.885087},
-{0.0774179,-2.35438,-0.615972,-3.95522,-0.489508,5.37933,0.83192,3.97895},
-{11.8538,0.280897,-6.25442,-0.413919,0.177485,-2.81457,-0.187652,-1.32068},
-{0.849645,-0.777109,0.132662,-2.32685,-1.7465,-0.299211,-0.353344,2.7832},
-{0.360023,-0.0221648,0.182637,2.04186,0.437422,2.16491,-5.59429,-4.20462},
-{6.58371,-3.06165,-5.46584,-7.15424,1.15371,4.55279,-0.676023,-0.814275},
-{-0.662566,1.60954,-0.151962,0.439522,-0.119091,0.0794726,-0.154145,-0.439802},
-{0.690386,-0.213604,1.24216,0.0327462,1.01089,-0.331969,1.77089,-8.32465},
-{0.25844,0.71889,1.28564,0.484911,1.81275,-3.26167,-1.30672,-0.543728},
-{-0.874365,-0.847797,-0.0344846,-0.364135,3.38751,1.92608,-1.60058,-0.364437},
-{-2.47908,0.0358242,-0.416142,1.25336,1.61083,-0.405303,-0.200643,0.153088},
-{0.0676664,0.0732605,-1.70212,1.13502,0.178007,-1.04099,2.46956,-1.61058},
-{2.04816,1.49183,8.84348,-3.07608,-4.29935,-2.43361,0.184449,-0.966081},
-{-1.62614,3.1635,1.08861,-1.21798,0.171358,-0.17998,-1.12656,0.282562},
-{0.0912846,0.176816,-0.546831,-0.205794,-0.295235,0.878923,1.00537,-0.490185},
-{1.60419,1.08165,-7.39422,4.18227,9.66378,-4.6794,-6.23252,3.40852},
-{-7.56484,8.28081,6.27843,-3.72213,-0.614124,-5.09631,6.06978,-3.43011},
-{1.21491,0.697695,-1.62641,-0.529543,-0.617756,-0.414999,-2.13013,1.85773},
-{3.04352,-2.20158,-0.810965,1.49209,-0.184109,-1.33921,-1.8366,0.410804},
-{-0.105488,-2.76789,1.55884,-0.490935,-1.1862,0.247893,1.58913,0.842581},
-{-3.49846,0.159163,1.8186,-0.177431,-1.27182,0.0968679,2.14015,-0.368962},
-{-6.03981,-4.30762,-4.10649,11.161,7.31562,-0.27644,2.69345,-3.42264},
-{-0.313663,-0.421797,-0.390626,-0.0718103,1.16765,1.89664,-0.542448,2.32168},
-{1.34793,-1.60852,0.960585,-0.842856,2.52615,-4.00664,9.11328,-10.994},
-{0.614699,-0.444924,3.50166,-1.70597,0.372752,0.735592,-1.0934,0.745709},
-{-2.5638,-2.06912,1.59051,3.69104,0.513344,-2.79309,-4.0566,0.0711823},
-{2.02001,0.693771,0.597655,0.346926,-1.89079,-0.533733,-0.214125,-1.53317}};
index 2986c3b..9f695e6 100644 (file)
@@ -1,68 +1,85 @@
-float cdbk_nb[]={     0.269728, 0.372372, 0.627997, 1.06063, 1.30239, 1.48717, 1.78314, 1.97805, 2.21079, 2.48535 ,
-  0.238271, 0.315725, 0.638869, 1.37119, 1.59263, 1.76589, 2.03894, 2.20728, 2.5266, 2.68382 ,
-  0.294884, 0.411627, 0.600158, 0.822329, 0.981997, 1.21208, 1.79851, 2.03834, 2.27372, 2.58234 ,
-  0.244089, 0.430726, 0.915875, 1.27547, 1.61116, 1.88346, 2.15962, 2.35166, 2.58783, 2.71514 ,
-  0.296914, 0.440389, 0.645098, 0.867076, 1.1, 1.25419, 1.62175, 2.06706, 2.32597, 2.51984 ,
-  0.220366, 0.317708, 0.477417, 0.724629, 1.28188, 1.82627, 2.10124, 2.25393, 2.51205, 2.65214 ,
-  0.191591, 0.280986, 0.426704, 0.721106, 1.24776, 1.4955, 1.74968, 1.98178, 2.31016, 2.6156 ,
-  0.423628, 0.637314, 0.948166, 1.15734, 1.37077, 1.55106, 1.8518, 2.09573, 2.41582, 2.60455 ,
-  0.261613, 0.369219, 0.577887, 0.954382, 1.1873, 1.40033, 1.93694, 2.15025, 2.43406, 2.64057 ,
-  0.215087, 0.307791, 0.499946, 1.00464, 1.41578, 1.63173, 2.00253, 2.21793, 2.50021, 2.66374 ,
-  0.318431, 0.421922, 0.685682, 0.896042, 1.09237, 1.62071, 1.95193, 2.16939, 2.55651, 2.68343 ,
-  0.483978, 0.72216, 1.03175, 1.26215, 1.51141, 1.71417, 2.00766, 2.22631, 2.50928, 2.66919 ,
-  0.356634, 0.486076, 0.703328, 0.980017, 1.16423, 1.36811, 1.74593, 1.90952, 2.31981, 2.62239 ,
-  0.259869, 0.353586, 0.535455, 1.04063, 1.51952, 1.66591, 1.89411, 2.10949, 2.32896, 2.52832 ,
-  0.263716, 0.392173, 0.595003, 0.873455, 1.24867, 1.40275, 1.72664, 2.15184, 2.4364, 2.57092 ,
-  0.411293, 0.5996, 0.801386, 1.03027, 1.29426, 1.446, 1.77104, 2.05175, 2.30522, 2.49947 ,
-  0.315757, 0.440872, 0.736251, 1.08131, 1.2668, 1.48529, 1.81962, 2.01611, 2.41981, 2.63678 ,
-  0.262304, 0.372285, 0.797399, 1.24213, 1.42686, 1.66303, 1.91566, 2.12389, 2.49887, 2.66555 ,
-  0.284825, 0.395208, 0.568187, 0.76433, 0.910514, 1.08911, 1.67343, 2.16638, 2.44018, 2.63368 ,
-  0.433473, 0.685322, 1.05765, 1.31078, 1.62243, 1.89684, 2.20113, 2.40323, 2.63409, 2.74982 ,
-  0.34656, 0.551076, 0.767065, 0.950295, 1.18316, 1.33273, 1.63998, 2.08616, 2.43606, 2.57953 ,
-  0.252917, 0.354724, 0.527754, 0.949258, 1.59235, 1.81358, 1.99463, 2.18584, 2.43107, 2.56997 ,
-  0.170951, 0.251011, 0.382747, 0.605955, 1.06095, 1.45111, 1.80031, 2.09231, 2.41228, 2.70243 ,
-  0.313611, 0.532802, 1.01002, 1.2955, 1.50965, 1.70444, 1.96896, 2.17994, 2.48031, 2.6541 ,
-  0.272186, 0.387625, 0.678405, 0.890476, 1.12855, 1.57645, 1.85565, 2.05152, 2.36162, 2.55816 ,
-  0.249509, 0.327312, 0.562653, 1.24126, 1.50434, 1.66193, 1.94194, 2.1075, 2.47949, 2.66921 ,
-  0.283599, 0.37744, 0.545607, 0.738599, 0.876566, 1.23801, 1.98935, 2.21852, 2.47939, 2.66798 ,
-  0.459734, 0.749676, 1.20389, 1.47848, 1.76765, 2.00572, 2.25088, 2.41791, 2.63026, 2.74254 ,
-  0.351086, 0.49999, 0.704679, 0.950692, 1.16255, 1.33235, 1.84067, 2.09974, 2.30144, 2.52462 ,
-  0.250584, 0.357747, 0.50166, 0.801887, 1.46943, 1.71743, 1.91476, 2.13214, 2.35938, 2.51803 ,
-  0.232147, 0.329861, 0.534622, 0.761803, 0.985477, 1.48983, 1.82211, 2.02592, 2.27526, 2.53374 ,
-  0.231836, 0.353668, 0.707724, 1.05028, 1.29772, 1.59986, 1.91137, 2.15276, 2.48583, 2.65205 ,
-  0.317159, 0.470838, 0.657216, 0.940975, 1.42336, 1.60453, 1.84145, 2.11511, 2.38872, 2.53362 ,
-  0.219511, 0.304055, 0.511536, 1.16337, 1.62401, 1.80039, 2.09973, 2.28361, 2.5308, 2.67414 ,
-  0.316807, 0.449246, 0.649587, 0.860357, 1.03242, 1.23352, 1.86624, 2.22325, 2.43576, 2.60502 ,
-  0.318532, 0.489181, 0.836814, 1.15236, 1.5711, 1.76458, 1.99917, 2.20342, 2.44869, 2.60566 ,
-  0.261281, 0.372857, 0.608347, 0.878198, 1.08918, 1.33054, 1.61895, 1.8529, 2.18253, 2.5736 ,
-  0.224587, 0.325594, 0.442077, 0.710575, 1.53609, 1.83835, 2.01913, 2.20131, 2.43855, 2.57416 ,
-  0.193531, 0.284962, 0.43149, 0.708334, 1.22455, 1.56404, 1.90009, 2.13506, 2.37332, 2.56776 ,
-  0.314956, 0.495846, 0.837423, 1.08895, 1.36169, 1.59985, 1.91515, 2.15034, 2.45905, 2.63057 ,
-  0.350715, 0.479519, 0.682716, 0.888293, 1.03901, 1.34058, 1.84057, 2.02033, 2.45346, 2.66141 ,
-  0.212276, 0.3058, 0.512172, 0.992759, 1.31046, 1.51773, 1.86444, 2.08347, 2.36975, 2.59348 ,
-  0.273572, 0.356961, 0.556407, 0.717054, 0.933298, 1.63536, 1.99289, 2.18879, 2.52033, 2.6428 ,
-  0.36, 0.593924, 1.10505, 1.40683, 1.67902, 1.87804, 2.10217, 2.28084, 2.53772, 2.68099 ,
-  0.360684, 0.528996, 0.720781, 0.941827, 1.18705, 1.34171, 1.66351, 1.9465, 2.17224, 2.44208 ,
-  0.258135, 0.36976, 0.52351, 0.847932, 1.38542, 1.55746, 1.80364, 2.0728, 2.29423, 2.47316 ,
-  0.236148, 0.343427, 0.53523, 0.890964, 1.1935, 1.38111, 1.76157, 2.0302, 2.23925, 2.47578 ,
-  0.40043, 0.566104, 0.801628, 0.99867, 1.1681, 1.4608, 1.89969, 2.11785, 2.48078, 2.6628 ,
-  0.238041, 0.340015, 0.562572, 0.959519, 1.22978, 1.44599, 1.7223, 1.92043, 2.42423, 2.63401 ,
-  0.236202, 0.391391, 0.79144, 1.12109, 1.40971, 1.72637, 2.05167, 2.28914, 2.56868, 2.70601 ,
-  0.226826, 0.318678, 0.467267, 0.673579, 0.861992, 1.23531, 1.77993, 2.07083, 2.424, 2.69776 ,
-  0.400471, 0.627706, 0.981657, 1.22973, 1.51949, 1.77614, 2.10302, 2.32538, 2.59398, 2.72723 ,
-  0.287822, 0.414135, 0.630681, 0.845693, 1.01989, 1.279, 1.61573, 1.88405, 2.46629, 2.66913 ,
-  0.223998, 0.318094, 0.466934, 0.835527, 1.58699, 1.91364, 2.11961, 2.28102, 2.54028, 2.66498 ,
-  0.19858, 0.291564, 0.462822, 0.793839, 1.07424, 1.32906, 1.74148, 2.01413, 2.35125, 2.63758 ,
-  0.394161, 0.614835, 0.922974, 1.14704, 1.43365, 1.66683, 1.9888, 2.22139, 2.5197, 2.6786 ,
-  0.329487, 0.439227, 0.707224, 0.972886, 1.13834, 1.5006, 1.78052, 1.99363, 2.55529, 2.70152 ,
-  0.26733, 0.349403, 0.577575, 1.14286, 1.36053, 1.55618, 1.83955, 2.01045, 2.51628, 2.69329 ,
-  0.270552, 0.366466, 0.582126, 0.780037, 0.961004, 1.46912, 1.80281, 2.03412, 2.52409, 2.66918 ,
-  0.502396, 0.870048, 1.26533, 1.45902, 1.71358, 1.89864, 2.11986, 2.29413, 2.54172, 2.67867 ,
-  0.318575, 0.487927, 0.668967, 0.909524, 1.31323, 1.46681, 1.72947, 2.0484, 2.30229, 2.47571 ,
-  0.231111, 0.33457, 0.518309, 0.834968, 1.36396, 1.62473, 1.85849, 2.07699, 2.49917, 2.668 ,
-  0.211596, 0.307791, 0.533462, 0.848872, 1.18835, 1.59966, 1.81581, 1.9592, 2.14327, 2.51038 ,
-  0.288493, 0.388643, 0.675794, 1.17165, 1.40162, 1.57163, 1.87474, 2.0527, 2.33181, 2.57845    
+/* Copyright (C) 2002 Jean-Marc Valin 
+   File: lsp_tables_nb.c
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+   
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+   
+   You should have received a copy of the GNU Lesser General Public
+   License along with this library; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+float cdbk_nb[]={     0.367035, 0.575953, 0.898663, 1.13373, 1.40566, 1.62544, 1.92849, 2.16854, 2.47686, 2.66605 ,
+  0.26779, 0.431383, 0.653283, 0.843937, 1.11966, 1.28682, 1.54849, 2.07668, 2.38104, 2.61105 ,
+  0.173254, 0.25467, 0.372603, 0.642321, 1.4879, 1.70812, 1.93244, 2.19301, 2.45614, 2.79342 ,
+  0.196671, 0.291205, 0.449721, 0.689854, 1.25155, 1.48783, 1.73158, 2.07264, 2.33654, 2.60108 ,
+  0.215377, 0.293094, 0.53662, 1.25932, 1.60318, 1.78126, 2.08341, 2.26368, 2.53963, 2.70363 ,
+  0.23301, 0.338112, 0.523528, 0.878811, 1.18096, 1.38066, 1.85498, 2.12369, 2.3669, 2.56975 ,
+  0.342609, 0.512949, 0.782604, 1.0188, 1.20318, 1.48743, 1.85073, 2.11077, 2.53763, 2.74534 ,
+  0.240393, 0.346512, 0.489522, 0.699007, 0.836088, 1.20917, 1.98025, 2.22925, 2.53334, 2.75449 ,
+  0.42132, 0.658093, 1.02821, 1.28021, 1.57016, 1.82602, 2.13208, 2.34411, 2.59749, 2.73327 ,
+  0.225215, 0.377676, 0.567715, 0.813698, 1.19828, 1.34819, 1.71529, 2.02672, 2.25597, 2.81041 ,
+  0.246778, 0.346181, 0.513985, 0.934545, 1.5887, 1.81542, 2.00261, 2.19365, 2.42688, 2.57366 ,
+  0.167697, 0.238104, 0.393122, 0.65945, 1.08939, 1.30371, 1.77716, 2.07021, 2.40273, 2.78811 ,
+  0.289269, 0.379576, 0.641341, 1.15328, 1.34496, 1.54903, 1.83999, 2.0176, 2.47019, 2.67557 ,
+  0.361896, 0.540396, 0.731005, 0.947568, 1.2082, 1.36318, 1.67865, 1.968, 2.21211, 2.47035 ,
+  0.15242, 0.221809, 0.450146, 0.918539, 1.25862, 1.5641, 1.94522, 2.24559, 2.58896, 2.84137 ,
+  0.267598, 0.376077, 0.592361, 0.799625, 0.984059, 1.50127, 1.79648, 2.02228, 2.46238, 2.63094 ,
+  0.269282, 0.451375, 0.873055, 1.20188, 1.5161, 1.75161, 2.01821, 2.23171, 2.50244, 2.67494 ,
+  0.306341, 0.437526, 0.630143, 0.842874, 0.997642, 1.2375, 1.90856, 2.18998, 2.43332, 2.64423 ,
+  0.206493, 0.297253, 0.458976, 0.672736, 1.23316, 1.72212, 1.93644, 2.16589, 2.41509, 2.6283 ,
+  0.206974, 0.300372, 0.482896, 0.977987, 1.30214, 1.50072, 1.77937, 1.9706, 2.35186, 2.62437 ,
+  0.161739, 0.293498, 0.750352, 1.14108, 1.4695, 1.79847, 2.12734, 2.41103, 2.68178, 2.88082 ,
+  0.245223, 0.389905, 0.597516, 0.842865, 1.08094, 1.28717, 1.57985, 1.84349, 2.18123, 2.63773 ,
+  0.310906, 0.420754, 0.67551, 0.889343, 1.0848, 1.61375, 1.93425, 2.14918, 2.53831, 2.67773 ,
+  0.259958, 0.385162, 0.564362, 0.757558, 0.937199, 1.09384, 1.61991, 2.21732, 2.48045, 2.72994 ,
+  0.287192, 0.565225, 0.930261, 1.28001, 1.57965, 1.89633, 2.20854, 2.48192, 2.72915, 2.91311 ,
+  0.223286, 0.372512, 0.558304, 0.800757, 0.976949, 1.23743, 1.64279, 1.87956, 2.52232, 2.76128 ,
+  0.187882, 0.258756, 0.418514, 0.920433, 1.56911, 1.77718, 2.08412, 2.31111, 2.5811, 2.78776 ,
+  0.177027, 0.274312, 0.457775, 0.825684, 1.138, 1.36985, 1.6799, 1.90166, 2.42745, 2.72088 ,
+  0.202292, 0.337834, 0.730847, 1.04873, 1.35848, 1.63942, 1.95132, 2.24826, 2.56831, 2.8185 ,
+  0.302137, 0.463177, 0.643237, 0.889641, 1.33777, 1.5108, 1.75877, 2.08555, 2.35332, 2.52371 ,
+  0.227649, 0.327766, 0.551744, 1.00953, 1.30957, 1.53929, 1.93661, 2.16818, 2.44174, 2.63407 ,
+  0.175323, 0.25803, 0.420214, 0.650584, 0.851368, 1.4043, 1.77971, 2.06582, 2.48996, 2.76639 ,
+  0.404216, 0.594619, 0.839407, 1.07253, 1.31312, 1.47937, 1.797, 2.05934, 2.35659, 2.55952 ,
+  0.220075, 0.329547, 0.559292, 0.766277, 1.18092, 1.37353, 1.64254, 2.20476, 2.45907, 2.74191 ,
+  0.2203, 0.312618, 0.449644, 0.727487, 1.50902, 1.89349, 2.07603, 2.24585, 2.48956, 2.64322 ,
+  0.20266, 0.302779, 0.456359, 0.751206, 1.37829, 1.56471, 1.79961, 2.0996, 2.3091, 2.80267 ,
+  0.254325, 0.334424, 0.636195, 1.282, 1.49824, 1.68036, 1.94142, 2.1197, 2.48833, 2.6718 ,
+  0.217288, 0.317172, 0.53777, 0.820736, 1.13427, 1.57597, 1.8278, 1.99663, 2.18912, 2.50053 ,
+  0.311891, 0.451331, 0.678841, 0.963902, 1.14959, 1.39302, 1.71115, 1.91591, 2.45885, 2.67752 ,
+  0.210187, 0.315014, 0.456798, 0.680469, 0.8416, 1.0745, 1.78185, 2.09831, 2.44248, 2.8 ,
+  0.444823, 0.752926, 1.19713, 1.45757, 1.73412, 1.96133, 2.19845, 2.37662, 2.60311, 2.73736 ,
+  0.216631, 0.323809, 0.504835, 0.766456, 0.957018, 1.27856, 1.78136, 2.04253, 2.32629, 2.61229 ,
+  0.250759, 0.364797, 0.557004, 0.830932, 1.40575, 1.68495, 1.88862, 2.15676, 2.46429, 2.64789 ,
+  0.155684, 0.202937, 0.347718, 0.563459, 1.14451, 1.51289, 1.83888, 2.13244, 2.45355, 2.79266 ,
+  0.281653, 0.387984, 0.583826, 1.04575, 1.49593, 1.64899, 1.88842, 2.11353, 2.34186, 2.53206 ,
+  0.345731, 0.543693, 0.753033, 0.942473, 1.17889, 1.33156, 1.72415, 2.14305, 2.40481, 2.58342 ,
+  0.172136, 0.280092, 0.67532, 0.926855, 1.23417, 1.49098, 1.79291, 2.11383, 2.45036, 2.74616 ,
+  0.240432, 0.328266, 0.508878, 0.708945, 0.903124, 1.61814, 1.97214, 2.20005, 2.53857, 2.69858 ,
+  0.446155, 0.680737, 1.01668, 1.25181, 1.50382, 1.70459, 1.99545, 2.21562, 2.50307, 2.66896 ,
+  0.319664, 0.462923, 0.649715, 0.861833, 1.0345, 1.2312, 1.7636, 2.02521, 2.2818, 2.56682 ,
+  0.192446, 0.260581, 0.414147, 0.619682, 1.25403, 1.83399, 2.11414, 2.29023, 2.55518, 2.76142 ,
+  0.245535, 0.351668, 0.493493, 0.81223, 1.4378, 1.65193, 1.86504, 2.0986, 2.3149, 2.49647 ,
+  0.302334, 0.549254, 0.864186, 1.15347, 1.44497, 1.70065, 2.02105, 2.32051, 2.62965, 2.88214 ,
+  0.241261, 0.360127, 0.572191, 0.893244, 1.18806, 1.38311, 1.70064, 1.98243, 2.22451, 2.48535 ,
+  0.347636, 0.479383, 0.707211, 0.978367, 1.15117, 1.41752, 1.88067, 2.04724, 2.37166, 2.61324 ,
+  0.217293, 0.351092, 0.545836, 0.754327, 0.986065, 1.15278, 1.62241, 1.99417, 2.28855, 2.78878 ,
+  0.243149, 0.441618, 0.980969, 1.35677, 1.6583, 1.90822, 2.14269, 2.33971, 2.57871, 2.74341 ,
+  0.220822, 0.372806, 0.552862, 0.862762, 1.03939, 1.31703, 1.84821, 2.06511, 2.5689, 2.81458 ,
+  0.199178, 0.281245, 0.426964, 1.08273, 1.47465, 1.6228, 1.91594, 2.09642, 2.53099, 2.75292 ,
+  0.158004, 0.243646, 0.394741, 0.782171, 1.2858, 1.49413, 1.83016, 2.04101, 2.51809, 2.79457 ,
+  0.257164, 0.407658, 0.791966, 1.08704, 1.34676, 1.6078, 1.89718, 2.13118, 2.43724, 2.62698 ,
+  0.277396, 0.385463, 0.647108, 1.06563, 1.30758, 1.4963, 1.80423, 2.00172, 2.24215, 2.50116 ,
+  0.227732, 0.339801, 0.486371, 1.02253, 1.24377, 1.46395, 1.82262, 2.009, 2.58232, 2.78822 ,
+  0.165873, 0.240104, 0.420613, 0.722822, 1.05524, 1.51018, 1.79156, 1.96547, 2.259, 2.74067    
 };
 
 
diff --git a/libspeex/matrix.c b/libspeex/matrix.c
deleted file mode 100644 (file)
index 1a92832..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-/* Copyright (C) 2002 Jean-Marc Valin 
-   File: matrix.h
-
-   Matrix stuff
-
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-   
-   This library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-   
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-*/
-
-
-void solve(float *A, float *b, float *x, int N)
-{
-   int i,j,k;
-   for (i=0;i<N;i++)
-      x[i]=b[i];
-   
-   for (i=0;i<N;i++)
-   {
-      float d,d_1;
-      d=A[i*N+i];
-      d_1=1/d;
-      for (j=i+1;j<N;j++)
-      {
-         float fact=A[j*N+i]*d_1;
-         for (k=0;k<N;k++)
-         {
-            A[j*N+k]-=fact*A[i*N+k];
-         }
-         x[j]-=fact*x[i];
-      }
-   }
-   
-   
-   for (i=N-1;i>=0;i--)
-   {
-      float d=A[i*N+i];
-      for (j=0;j<i;j++)
-      {
-         x[j]-=A[j*N+i]/d*x[i];
-      }
-   }
-   
-   for (i=0;i<N;i++)
-   {
-      x[i]/=A[i*N+i];
-   }
-   
-  
-}
diff --git a/libspeex/matrix.h b/libspeex/matrix.h
deleted file mode 100644 (file)
index 3931412..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright (C) 2002 Jean-Marc Valin 
-   File: matrix.h
-
-   Matrix stuff
-
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-   
-   This library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-   
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-*/
-
-#ifndef MATRIX_H
-#define MATRIX_H
-
-
-void solve(float *A, float *b, float *x, int N);
-
-
-#endif
index 9810458..9a7b8eb 100644 (file)
 #include "ltp.h"
 #include "quant_lsp.h"
 #include "cb_search.h"
-#include "mpulse.h"
 #include "sb_celp.h"
 #include "nb_celp.h"
 
 
 /* Extern declarations for all codebooks we use here */
 extern float gain_cdbk_nb[];
-extern float exc_gains_table[];
-extern float exc_table[];
-extern float exc_wb_table[];
-extern float exc_gains_wb_table[];
-extern float exc_sb_table[];
 extern float hexc_table[];
+extern float exc_5_256_table[];
+extern float exc_8_256_table[];
+extern float exc_5_64_table[];
 
 /* Parameters for Long-Term Prediction (LTP)*/
 static ltp_params ltp_params_nb = {
@@ -45,32 +42,19 @@ static ltp_params ltp_params_nb = {
    7
 };
 
-static ltp_params ltp_params_wb = {
-   gain_cdbk_nb,
-   7,
-   8
-};
-
 /* Split-VQ innovation parameters */
-static split_cb_params split_cb_nb = {
-   8,               /*subvect_size*/
-   5,               /*nb_subvect*/
-   exc_table,       /*shape_cb*/
-   7,               /*shape_bits*/
+split_cb_params split_cb_nb = {
+   5,               /*subvect_size*/
+   8,               /*nb_subvect*/
+   exc_5_64_table, /*shape_cb*/
+   6,               /*shape_bits*/
 };
 
-static split_cb_params split_cb_sb = {
+split_cb_params split_cb_sb = {
    5,               /*subvect_size*/
    8,              /*nb_subvect*/
-   exc_sb_table,    /*shape_cb*/
-   7,               /*shape_bits*/
-};
-
-static split_cb_params split_cb_wb = {
-   8,               /*subvect_size*/
-   10,              /*nb_subvect*/
-   exc_wb_table,    /*shape_cb*/
-   7,               /*shape_bits*/
+   exc_5_256_table,    /*shape_cb*/
+   8,               /*shape_bits*/
 };
 
 static split_cb_params split_cb_high = {
@@ -80,33 +64,8 @@ static split_cb_params split_cb_high = {
    8,               /*shape_bits*/
 };
 
-
-/* Various multi-pulse parameter definitions */
-static mpulse_params mpulse_nb = {
-   15,     /*nb_pulse*/
-   5,      /*nb_tracks*/
-   4,    /*gain_coef*/
-   10
-};
-
-
-static mpulse_params mpulse_sb = {
-   15,     /*nb_pulse*/
-   5,      /*nb_tracks*/
-   3.8,    /*gain_coef*/
-   10
-};
-
-
-static mpulse_params mpulse_wb = {
-   24,     /*nb_pulse*/
-   4,      /*nb_tracks*/
-   2.2,    /*gain_coef*/
-   26,
-};
-
 /* Default mode for narrowband */
-static SpeexNBMode mp_nb_mode = {
+SpeexNBMode nb_mode = {
    160,    /*frameSize*/
    40,     /*subframeSize*/
    320,    /*windowSize*/
@@ -127,9 +86,9 @@ static SpeexNBMode mp_nb_mode = {
    pitch_unquant_3tap,
    &ltp_params_nb,
    /*Innovation quantization*/
-   mpulse_search,
-   mpulse_unquant,
-   &mpulse_nb
+   split_cb_search_nogain2,
+   split_cb_nogain_unquant,
+   &split_cb_nb
 };
 
 /* Narrowband mode used for split-band wideband CELP*/
@@ -154,15 +113,9 @@ static SpeexNBMode low_sb_mode = {
    pitch_unquant_3tap,
    &ltp_params_nb,
    /*Innovation quantization*/
-#if 1
-   split_cb_search2,
-   split_cb_unquant,
+   split_cb_search_nogain2,
+   split_cb_nogain_unquant,
    &split_cb_sb
-#else
-   mpulse_search,
-   mpulse_unquant,
-   &mpulse_sb
-#endif
 };
 
 SpeexMode low_wb_mode = {
@@ -176,8 +129,8 @@ SpeexMode low_wb_mode = {
    160
 };
 
-SpeexMode nb_mode = {
-   &mp_nb_mode,
+SpeexMode speex_nb_mode = {
+   &nb_mode,
    &nb_encoder_init,
    &nb_encoder_destroy,
    &nb_encode,
@@ -210,7 +163,7 @@ static SpeexSBMode sb_wb_mode = {
 };
 
 
-SpeexMode wb_mode = {
+SpeexMode speex_wb_mode = {
    &sb_wb_mode,
    &sb_encoder_init,
    &sb_encoder_destroy,
diff --git a/libspeex/mpulse.c b/libspeex/mpulse.c
deleted file mode 100644 (file)
index 06b3c26..0000000
+++ /dev/null
@@ -1,487 +0,0 @@
-/* Copyright (C) 2002 Jean-Marc Valin 
-   File: mpulse.c
-
-   Multi-pulse code
-
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-   
-   This library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-   
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-*/
-
-#include "mpulse.h"
-#include "stack_alloc.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include "filters.h"
-#include <math.h>
-
-#define MAX_PULSE 60
-#define MAX_POS  100
-
-int porder(int *p, int *s, int *o, int len)
-{
-   int i,j, bit1, nb_uniq=0;
-   int *st, *en;
-   int rep[MAX_POS];
-   int uniq[MAX_PULSE];
-   int n;
-   /*Stupid bubble sort but for small N, we don't care!*/
-   for (i=0;i<MAX_POS;i++)
-      rep[i]=0;
-   for (i=0;i<len;i++)
-   {
-      for (j=i+1;j<len;j++)
-      {
-         if (p[i]>p[j])
-         {
-            int tmp;
-            tmp=p[j];
-            p[j]=p[i];
-            p[i]=tmp;
-            tmp=s[j];
-            s[j]=s[i];
-            s[i]=tmp;
-         }
-      }
-   }
-#ifdef DEBUG
-   printf ("quant_pulse\n");
-   for (i=0;i<len;i++)
-      printf ("%d ", p[i]);
-   printf ("\n");
-   for (i=0;i<len;i++)
-      printf ("%d ", s[i]);
-   printf ("\n");
-#endif
-   for (i=0;i<len;i++)
-   {
-      rep[p[i]]++;
-      if (i==0 || p[i]!=p[i-1])
-      {
-         uniq[nb_uniq]=p[i];
-         s[nb_uniq]=s[i];
-         nb_uniq++;
-      }
-   }
-   st=uniq;
-   en=&uniq[nb_uniq-1];
-
-
-   bit1=s[0];
-   n=0;
-   for (i=0;i<nb_uniq;i++)
-   {
-      int next;
-      if (i==nb_uniq-1)
-      {
-         next=*st;
-         for (j=0;j<rep[next];j++)
-         {
-            o[n]=next;
-            n++;
-         }
-      } else {
-         if (s[i+1])
-         {
-            next=*en;
-            for (j=0;j<rep[next];j++)
-            {
-               o[n]=next;
-               n++;
-            }
-            en--;
-         } else {
-            next=*st;
-            for (j=0;j<rep[next];j++)
-            {
-               o[n]=next;
-               n++;
-            }
-            st++;
-         }
-      }
-   }
-#ifdef DEBUG
-   for (i=0;i<len;i++)
-      printf ("%d ", o[i]);
-   printf ("\n");
-#endif
-   return s[0];
-}
-
-void rorder(int *p, int *s, int *o, int bit, int len)
-{
-   int i,j,nb_uniq=0;
-   int *st, *en;
-   int rep[MAX_POS];
-   int uniq[MAX_PULSE];
-   int ss[MAX_PULSE];
-   int n;
-   /*Stupid bubble sort but for small N, we don't care!*/
-   for (i=0;i<len;i++)
-      o[i]=p[i];
-   for (i=0;i<len;i++)
-   {
-      for (j=i+1;j<len;j++)
-      {
-         if (o[i]>o[j])
-         {
-            int tmp;
-            tmp=o[j];
-            o[j]=o[i];
-            o[i]=tmp;
-         }
-      }
-   }
-
-   for (i=0;i<len;i++)  
-   {
-      rep[p[i]]++;
-      if (i==0 || o[i]!=o[i-1])
-      {
-         uniq[nb_uniq]=o[i];
-         s[nb_uniq]=s[i];
-         nb_uniq++;
-      }
-   }
-   st=uniq;
-   en=&uniq[nb_uniq-1];
-
-   ss[0]=bit;
-   n=1;
-#ifdef DEBUG
-   printf ("unquant_pulse\n");
-   for (i=0;i<len;i++)
-      printf ("%d ", o[i]);
-   printf ("\n");
-#endif
-   for (i=1;i<len;i++)
-   {
-      if (i>1&&p[i-1]==p[i-2])
-         continue;
-      if (p[i-1]==*st)
-      {
-         ss[n++]=0;
-         st++;
-      } else if (p[i-1]==*en)
-      {
-         ss[n++]=1;
-         en--;
-      } else 
-      {
-         fprintf (stderr, "ERROR in decoding signs\n");
-         exit(1);
-      }
-   }
-   
-   n=0;
-   for (i=0;i<len;i++)
-   {
-      s[i]=ss[n];
-      if (i<len&&o[i]!=o[i+1])
-         n++;
-   }
-#ifdef DEBUG
-   for (i=0;i<len;i++)
-      printf ("%d ", s[i]);
-   printf ("\n");
-#endif
-}
-
-
-void mpulse_search(
-float target[],                        /* target vector */
-float ak[],                    /* LPCs for this subframe */
-float awk1[],                  /* Weighted LPCs for this subframe */
-float awk2[],                  /* Weighted LPCs for this subframe */
-void *par,                      /* Codebook/search parameters*/
-int   p,                        /* number of LPC coeffs */
-int   nsf,                      /* number of samples in subframe */
-float *exc,
-FrameBits *bits,
-float *stack
-)
-{
-   int i,j, nb_pulse;
-   float *resp, *resp2, *energy, *t, *e, *pulses;
-   float te=0,ee=0;
-   float g, gain_coef;
-   int nb_tracks, track_ind_bits;
-   int *tracks, *signs, *tr, *nb;
-   int full_div=0, full_mod=0;
-   mpulse_params *params;
-   int pulses_per_track;
-   params = (mpulse_params *) par;
-
-   nb_pulse=params->nb_pulse;
-   nb_tracks=params->nb_tracks;
-   pulses_per_track=nb_pulse/nb_tracks;
-   track_ind_bits=params->track_ind_bits;
-   gain_coef=params->gain_coef;
-
-   tracks = (int*)PUSH(stack,nb_pulse);
-   signs = (int*)PUSH(stack,nb_pulse);
-   tr = (int*)PUSH(stack,pulses_per_track);
-   nb = (int*)PUSH(stack,nb_tracks);
-
-   resp=PUSH(stack, nsf);
-   resp2=PUSH(stack, nsf);
-   energy=PUSH(stack, nsf);
-   t=PUSH(stack, nsf);
-   e=PUSH(stack, nsf);
-   pulses=PUSH(stack, nsf);
-   
-   /*Compute optimal (real) excitation from target*/
-   syn_filt_zero(target, awk1, e, nsf, p);
-   residue_zero(e, ak, e, nsf, p);
-   residue_zero(e, awk2, e, nsf, p);
-   for (i=0;i<nsf;i++)
-   {
-      pulses[i]=0;
-      te+=target[i]*target[i];
-      ee+=e[i]*e[i];
-   }
-   /*Compute global gain (coef found from linear regression and tweaking)*/
-   g=gain_coef/sqrt(nb_pulse)*exp(0.18163*log(te+1)+0.17293*log(ee+1));
-   
-   e[0]=1;
-   for (i=1;i<nsf;i++)
-      e[i]=0;
-
-   /*Impulse response of W(z)/A(z)*/
-   residue_zero(e, awk1, resp, nsf, p);
-   syn_filt_zero(resp, ak, resp, nsf, p);
-   syn_filt_zero(resp, awk2, resp, nsf, p);
-   
-   /*Impulse response * gain*/
-   for (i=0;i<nsf;i++)
-      resp2[i]=g*resp[i];
-
-   for (i=0;i<nsf;i++)
-      e[i]=0;
-
-   for (i=0;i<nsf;i++)
-      t[i]=target[i];
-
-   for (i=0;i<nb_tracks;i++)
-      nb[i]=0;
-
-   /*For all pulses*/
-   for (i=0;i<nb_pulse;i++)
-   {
-      float best_score=1e30, best_gain=0;
-      int best_ind=0;
-      int mod_track=nb_tracks-1;
-      /*For all positions*/
-      energy[0]=0;
-      for (j=1;j<nsf;j++)
-         energy[j]=energy[j-1]+t[j-1]*t[j-1];
-      /*For each position*/
-      for (j=0;j<nsf;j++)
-      {
-         int k;
-         float dist;
-         float *base=t+j;
-         mod_track++;
-         if (mod_track==nb_tracks)
-            mod_track=0;
-         /*Fill any track until it's full*/
-         if (nb[mod_track]==pulses_per_track || nb[mod_track] > full_div)
-              continue;
-
-         /*Try for positive sign*/
-         if (pulses[j]>=0)
-         {
-            dist=energy[j];
-            for (k=0;k<nsf-j;k++)
-            {
-               float tmp=(base[k]-resp2[k]);
-               dist+=tmp*tmp;
-            }
-            if (dist<best_score || j==0)
-            {
-               best_score=dist;
-               best_gain=g;
-               best_ind=j;
-            }
-         }
-         /*Try again for negative sign*/
-         if (pulses[j]<=0)
-         {
-            dist=energy[j];
-            for (k=0;k<nsf-j;k++)
-            {
-               float tmp=(base[k]+resp2[k]);
-               dist+=tmp*tmp;
-            }
-            if (dist<best_score)
-            {
-               best_score=dist;
-               best_gain=-g;
-               best_ind=j;
-            }
-         }
-      }
-#ifdef DEBUG
-      printf ("best pulse: %d %d %f %f %f %f\n", i, best_ind, best_gain, te, ee, g);
-#endif
-      /*Remove pulse contribution from target*/
-      for (j=best_ind;j<nsf;j++)
-         t[j] -= best_gain * resp[j-best_ind];
-      e[best_ind]+=best_gain;
-      if (best_gain>0)
-         pulses[best_ind]+=1;
-      else
-         pulses[best_ind]-=1;
-      {
-         int t=best_ind%nb_tracks;
-         tracks[t*pulses_per_track+nb[t]] = best_ind/nb_tracks;
-         signs[t*pulses_per_track+nb[t]]  = best_gain >= 0 ? 0 : 1;
-         nb[t]++;
-      }
-         full_mod++;
-         if (full_mod==nb_tracks)
-         {
-            full_mod=0;
-            full_div++;
-         }
-   }
-
-   /*Global gain re-estimation*/
-   if (1) {
-      float f;
-      int quant_gain;
-      residue_zero(e, awk1, resp, nsf, p);
-      syn_filt_zero(resp, ak, resp, nsf, p);
-      syn_filt_zero(resp, awk2, resp, nsf, p);
-
-      f=((.1+(xcorr(resp,target,nsf)))/(.1+xcorr(resp,resp,nsf)));
-      /*for (i=0;i<nsf;i++)
-        e[i]*=f;*/
-      g *= f;
-      if (g<0)
-         g=0;
-      
-      quant_gain=(int)floor(.5+8*(log(1+fabs(g))-1));
-      if (quant_gain<0)
-         quant_gain=0;
-      if (quant_gain>127)
-         quant_gain=127;
-      speex_bits_pack(bits,quant_gain,7);
-      g=exp((quant_gain/8.0)+1);
-      
-      for (i=0;i<nsf;i++)
-         e[i]=g*pulses[i];
-#ifdef DEBUG
-      printf ("global gain = %f\n", g);
-#endif
-      for (i=0;i<nsf;i++)
-         t[i]=target[i]-f*resp[i];
-
-   }
-#ifdef DEBUG
-   for (i=0;i<nsf;i++)
-      printf ("%f ", e[i]);
-   printf ("\n");
-#endif
-   for (i=0;i<nsf;i++)
-      exc[i]+=e[i];
-   for (i=0;i<nsf;i++)
-      target[i]=t[i];
-   
-   for (i=0;i<nb_tracks;i++)
-   {
-      int bit1, ind=0;
-      bit1=porder(tracks+i*pulses_per_track, signs+i*pulses_per_track,tr,pulses_per_track);
-      speex_bits_pack(bits,bit1,1);
-      for (j=0;j<pulses_per_track;j++)
-      {
-         ind*=nsf/nb_tracks;
-         ind+=tr[j];
-         /*printf ("%d ", ind);*/
-      }
-      
-      speex_bits_pack(bits,ind,track_ind_bits);
-
-      /*printf ("track %d %d:", i, ind);
-      for (j=0;j<pulses_per_track;j++)
-        printf ("%d ", tr[j]);
-        printf ("\n");*/
-   }
-   POP(stack);
-   POP(stack);
-   POP(stack);
-   POP(stack);
-   POP(stack);
-   POP(stack);
-   POP(stack);
-   POP(stack);
-   POP(stack);
-   POP(stack);
-}
-
-
-void mpulse_unquant(
-float *exc,
-void *par,                      /* non-overlapping codebook */
-int   nsf,                      /* number of samples in subframe */
-FrameBits *bits,
-float *stack
-)
-{
-   int i,j, bit1, nb_pulse, quant_gain;
-   float g;
-   int nb_tracks, track_ind_bits;
-   int *track, *signs, *tr;
-   mpulse_params *params;
-   int pulses_per_track;
-   params = (mpulse_params *) par;
-
-   nb_pulse=params->nb_pulse;
-   nb_tracks=params->nb_tracks;
-   pulses_per_track=nb_pulse/nb_tracks;
-   track_ind_bits=params->track_ind_bits;
-
-   track = (int*)PUSH(stack,pulses_per_track);
-   signs = (int*)PUSH(stack,pulses_per_track);
-   tr = (int*)PUSH(stack,pulses_per_track);
-   
-   quant_gain=speex_bits_unpack_unsigned(bits, 7);
-   g=exp((quant_gain/8.0)+1);
-   /*Removes glitches when energy is near-zero*/
-   if (g<3)
-      g=0;
-   for (i=0;i<nb_tracks;i++)
-   {
-      int ind;
-      int max_val=nsf/nb_tracks;
-      bit1=speex_bits_unpack_unsigned(bits, 1);
-      ind = speex_bits_unpack_unsigned(bits,track_ind_bits);
-      /*printf ("unquant ind = %d\n", ind);*/
-      for (j=0;j<pulses_per_track;j++)
-      {
-         track[pulses_per_track-1-j]=ind%max_val;
-         ind /= max_val;
-      }
-      rorder(track, signs, tr, bit1, pulses_per_track);
-      for (j=0;j<pulses_per_track;j++)
-      {
-         exc[tr[j]*nb_tracks+i] += signs[j] ? -g : g;
-      }
-   }
-
-   POP(stack);
-   POP(stack);
-   POP(stack);
-}
diff --git a/libspeex/mpulse.h b/libspeex/mpulse.h
deleted file mode 100644 (file)
index 17ae841..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Copyright (C) 2002 Jean-Marc Valin 
-   File: mpulse.h
-
-   Multi-pulse code
-
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-   
-   This library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-   
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-*/
-
-#ifndef MPULSE_H
-#define MPULSE_H
-
-#include "speex_bits.h"
-
-typedef struct mpulse_params {
-   int     nb_pulse;
-   int     nb_tracks;
-   float     gain_coef;
-   int     track_ind_bits;
-} mpulse_params;
-
-
-void mpulse_search(
-float target[],                        /* target vector */
-float ak[],                    /* LPCs for this subframe */
-float awk1[],                  /* Weighted LPCs for this subframe */
-float awk2[],                  /* Weighted LPCs for this subframe */
-void *par,                      /* Codebook/search parameters*/
-int   p,                        /* number of LPC coeffs */
-int   nsf,                      /* number of samples in subframe */
-float *exc,
-FrameBits *bits,
-float *stack
-);
-
-void mpulse_unquant(
-float *exc,
-void *par,                      /* non-overlapping codebook */
-int   nsf,                      /* number of samples in subframe */
-FrameBits *bits,
-float *stack
-);
-
-#endif
index dd35820..b6f6a5c 100644 (file)
@@ -28,6 +28,8 @@
 #include "cb_search.h"
 #include "filters.h"
 #include "stack_alloc.h"
+#include "vq.h"
+#include "speex_bits.h"
 
 #ifndef M_PI
 #define M_PI           3.14159265358979323846  /* pi */
@@ -182,7 +184,6 @@ void nb_encoder_destroy(void *state)
    free(st);
 }
 
-
 void nb_encode(void *state, float *in, FrameBits *bits)
 {
    EncState *st;
@@ -229,9 +230,10 @@ void nb_encode(void *state, float *in, FrameBits *bits)
    /* x-domain to angle domain*/
    for (i=0;i<st->lpcSize;i++)
       st->lsp[i] = acos(st->lsp[i]);
-   
+   /*print_vec(st->lsp, 10, "LSP:");*/
    /* LSP Quantization */
    st->lsp_quant(st->lsp, st->qlsp, st->lpcSize, bits);
+
    /*for (i=0;i<st->lpcSize;i++)
      st->qlsp[i]=st->lsp[i];*/
    /*printf ("LSP ");
@@ -283,6 +285,19 @@ void nb_encode(void *state, float *in, FrameBits *bits)
       for (i=0;i<st->lpcSize;i++)
          st->interp_qlsp[i] = (1-tmp)*st->old_qlsp[i] + tmp*st->qlsp[i];
 
+      if (0) {
+         float *h=PUSH(st->stack, 8);
+         for (i=0;i<8;i++)
+            h[i]=0;
+         h[0]=1;
+         
+         residue_zero(h, st->bw_lpc1, h, 8, st->lpcSize);
+         syn_filt_zero(h, st->interp_qlpc, h, 8, st->lpcSize);
+         syn_filt_zero(h, st->bw_lpc2, h, 8, st->lpcSize);
+         print_vec(h, 8, "lpc_resp");
+         POP(st->stack);
+      }
+      
       /* Compute interpolated LPCs (quantized and unquantized) */
       for (i=0;i<st->lpcSize;i++)
          st->interp_lsp[i] = cos(st->interp_lsp[i]);
@@ -388,7 +403,7 @@ void nb_encode(void *state, float *in, FrameBits *bits)
       syn_filt_zero(target, st->bw_lpc1, res, st->subframeSize, st->lpcSize);
       residue_zero(res, st->interp_qlpc, st->buf2, st->subframeSize, st->lpcSize);
       residue_zero(st->buf2, st->bw_lpc2, st->buf2, st->subframeSize, st->lpcSize);
-      if (1||(snr>9 && (rand()%6==0)))
+      /*if (1||(snr>9 && (rand()%6==0)))
       {
          float ener=0;
          printf ("exc ");
@@ -401,15 +416,78 @@ void nb_encode(void *state, float *in, FrameBits *bits)
          }
          printf ("\n");
       printf ("innovation_energy = %f\n", ener);
+      }*/
+      if (rand()%5==0 && snr>5)
+      {
+         float ener=0, sign=1;
+         if (rand()%2)
+            sign=-1;
+         for (i=0;i<st->subframeSize;i++)
+         {
+            ener+=st->buf2[i]*st->buf2[i];
+         }
+         ener=sign/sqrt(.01+ener/st->subframeSize);
+         for (i=0;i<st->subframeSize;i++)
+         {
+            if (i%8==0)
+               printf ("\nexc ");
+            printf ("%f ", ener*st->buf2[i]);
+         }
+         printf ("\n");
       }
+
       for (i=0;i<st->subframeSize;i++)
          exc[i]+=st->buf2[i];
 #else
+      if (0)
+      {
       /* Perform a split-codebook search */
       st->innovation_quant(target, st->interp_qlpc, st->bw_lpc1, st->bw_lpc2,
                            st->innovation_params, st->lpcSize,
                            st->subframeSize, exc, bits, st->stack);
+      }
+      else
+      {
+         float *innov;
+         float ener=0, ener_1;
+         innov=PUSH(st->stack, st->subframeSize);
+         for (i=0;i<st->subframeSize;i++)
+            innov[i]=0;
+         syn_filt_zero(target, st->bw_lpc1, res, st->subframeSize, st->lpcSize);
+         residue_zero(res, st->interp_qlpc, st->buf2, st->subframeSize, st->lpcSize);
+         residue_zero(st->buf2, st->bw_lpc2, st->buf2, st->subframeSize, st->lpcSize);
+         for (i=0;i<st->subframeSize;i++)
+            ener+=st->buf2[i]*st->buf2[i];
+         ener=sqrt(.1+ener/st->subframeSize);
+
+         {
+            int qe = (int)(floor(7*log(ener)));
+            if (qe<0)
+               qe=0;
+            if (qe>63)
+               qe=63;
+            ener = exp(qe/7.0);
+            speex_bits_pack(bits, qe, 6);
+            printf ("quant_energy: %d %f\n", qe, ener);
+         }
+         ener_1 = 1/ener;
+         
+         for (i=0;i<st->subframeSize;i++)
+            target[i]*=ener_1;
+#if 1
+         st->innovation_quant(target, st->interp_qlpc, st->bw_lpc1, st->bw_lpc2, 
+                                st->innovation_params, st->lpcSize, st->subframeSize, 
+                                innov, bits, st->stack);
+         
+         for (i=0;i<st->subframeSize;i++)
+            exc[i] += innov[i]*ener;
+#else
+         for (i=0;i<st->subframeSize;i++)
+            exc[i] += st->buf2[i];
+#endif
+         POP(st->stack);
 
+      }
 #endif
       /* Compute weighted noise energy and SNR */
       enoise=0;
@@ -596,9 +674,29 @@ void nb_decode(void *state, FrameBits *bits, float *out)
 
       /*Adaptive codebook contribution*/
       st->ltp_unquant(exc, st->min_pitch, st->max_pitch, st->ltp_params, st->subframeSize, bits, st->stack);
-       
-      /*Fixed codebook contribution*/
-      st->innovation_unquant(exc, st->innovation_params, st->subframeSize, bits, st->stack);
+      
+
+      {
+         int q_energy;
+         float ener;
+         float *innov;
+         
+         innov = PUSH(st->stack, st->subframeSize);
+         for (i=0;i<st->subframeSize;i++)
+            innov[i]=0;
+
+         q_energy = speex_bits_unpack_unsigned(bits, 6);
+         ener = exp(q_energy/7.0);
+         printf ("unquant_energy: %d %f\n", q_energy, ener);
+         
+         /*Fixed codebook contribution*/
+         st->innovation_unquant(innov, st->innovation_params, st->subframeSize, bits, st->stack);
+
+         for (i=0;i<st->subframeSize;i++)
+            exc[i]+=ener*innov[i];
+
+         POP(st->stack);
+      }
 
       /*Compute decoded signal*/
       syn_filt_mem(exc, st->interp_qlpc, sp, st->subframeSize, st->lpcSize, st->mem_sp);
index b8332ce..0b7b7b2 100644 (file)
@@ -21,6 +21,7 @@
 #include <math.h>
 #include <stdio.h>
 
+extern int lsp_nb_vqid[64];
 static float quant_weight[MAX_LSP_SIZE];
 
 /* Note: x is modified*/
@@ -201,6 +202,7 @@ void lsp_quant_wb(float *lsp, float *qlsp, int order, FrameBits *bits)
 
    for (i=0;i<order;i++)
       qlsp[i]=lsp[i]-qlsp[i];
+
 }
 
 
index 9b9f683..27c7055 100644 (file)
@@ -68,10 +68,10 @@ void decoder_destroy(void *state);
 void decode(void *state, FrameBits *bits, float *out);
 
    /** Default narrowband mode */
-extern SpeexMode nb_mode;
+extern SpeexMode speex_nb_mode;
 
    /** Default wideband mode */
-extern SpeexMode wb_mode;
+extern SpeexMode speex_wb_mode;
 
 
 #ifdef __cplusplus
diff --git a/libspeex/stoc.c b/libspeex/stoc.c
deleted file mode 100644 (file)
index 49434d9..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-/*---------------------------------------------------------------------------*\\r
-|                                                                             |\r
-| FILE: STOC.C                                                                |\r
-| TYPE: Unix C data file                                                      |\r
-| AUTHOR: David Rowe                                                          |\r
-| DATE CREATED: 23/3/93                                                       |\r
-| LAST MODIFIED: 23/3/93                                                      |\r
-|                                                                             |\r
-| DoD CELP 3.2 stochastic codebook.                                          |\r
-|                                                                             |\r
-\*---------------------------------------------------------------------------*/\r
-/* \r
-   This library is free software; you can redistribute it and/or\r
-   modify it under the terms of the GNU Lesser General Public\r
-   License as published by the Free Software Foundation; either\r
-   version 2.1 of the License, or (at your option) any later version.\r
-   \r
-   This library is distributed in the hope that it will be useful,\r
-   but WITHOUT ANY WARRANTY; without even the implied warranty of\r
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\r
-   Lesser General Public License for more details.\r
-   \r
-   You should have received a copy of the GNU Lesser General Public\r
-   License along with this library; if not, write to the Free Software\r
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
-*/\r
-\r
-\r
-float stoc[] = {\r
-   0.,  1.,  0.,  0.,  0.,  1.,  0.,  0.,  0.,  0.,  0.,  0.,  1.,  0.,  1.,  0.,  0.,  0.,  0., -1.,\r
-   0.,  0., -1.,  0., -1.,  0.,  1.,  0.,  0.,  0.,  0.,  0.,  0.,  0., -1.,  0., -1., -1.,  0.,  0.,\r
-  -1.,  0., -1.,  0., -1.,  0., -1.,  0.,  0.,  0.,  0.,  0.,  0.,  0., -1.,  0.,  0.,  0.,  1.,  0.,\r
-   0.,  0.,  0., -1.,  0.,  0.,  0.,  0.,  1.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,  1., -1.,  0.,\r
-   1.,  0.,  1.,  0., -1.,  1.,  0.,  0.,  0.,  0.,  0., -1.,  0.,  0.,  1.,  0.,  0.,  0., -1.,  0.,\r
-   0.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,\r
-   0., -1., -1.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,  0., -1., -1.,\r
-   0.,  1., -1.,  0.,  0., -1., -1.,  0.,  0.,  0.,  0.,  1.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,\r
-   0.,  0.,  0., -1.,  0., -1., -1.,  0.,  0., -1.,  0.,  1.,  0.,  0.,  0.,  1.,  0.,  0.,  0.,  0.,\r
-   0., -1.,  0.,  0.,  0., -1.,  0.,  0.,  0.,  0.,  0.,  0., -1.,  0.,  1.,  0.,  0.,  0.,  0.,  0.,\r
-   0.,  0., -1.,  1.,  0.,  0.,  0., -1.,  1.,  0.,  0.,  1.,  0.,  0., -1.,  0.,  0.,  0.,  0.,  0.,\r
-   0., -1.,  0.,  0.,  1., -1.,  0.,  0.,  1.,  0.,  0.,  0.,  0.,  0.,  0.,  1.,  1.,  1.,  0.,  0.,\r
-   1.,  1.,  0.,  0.,  0., -1.,  0.,  0.,  0., -1.,  0.,  0., -1.,  1.,  0.,  0.,  0.,  0.,  0., -1.,\r
-  -1.,  0.,  0.,  0.,  0., -1.,  0.,  0.,  0.,  0.,  0., -1.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,\r
-   0.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,  1.,  1.,  0., -1., -1.,  0.,  0.,  1.,  0.,\r
-   0.,  0.,  0.,  0.,  0., -1.,  0.,  0., -1.,  1.,  0.,  0.,  0.,  0.,  0.,  0., -1.,  0.,  0., -1.,\r
-   0.,  0.,  0.,  0.,  0., -1.,  0.,  0., -1.,  0.,  0.,  0.,  0.,  0., -1., -1., -1.,  0., -1., -1.,\r
-   0.,  1.,  0.,  0.,  0.,  0.,  1.,  0.,  0.,  0.,  1.,  0.,  0.,  0.,  0.,  1., -1.,  0.,  0.,  0.,\r
-   0.,  0.,  0.,  1., -1.,  0.,  0., -1.,  0., -1.,  0.,  0., -1.,  0.,  0.,  1.,  0.,  0.,  0.,  0.,\r
-  -1., -1.,  0., -1.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,  1.,  0.,  0., -1.,  0.,  0.,  0.,\r
-  -1.,  0.,  1.,  0.,  0., -1.,  0.,  0.,  0., -1.,  0.,  0.,  0., -1.,  0.,  0.,  0.,  0., -1.,  0.,\r
-   0., -1., -1.,  0.,  0.,  0.,  1.,  0., -1.,  0.,  0.,  0.,  0.,  0.,  1.,  0.,  0.,  0.,  0.,  0.,\r
-   0.,  0.,  1.,  1.,  0.,  0.,  0.,  1.,  1.,  0.,  0.,  0., -1.,  0.,  0.,  0.,  0.,  0., -1.,  1.,\r
-   1.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,  1.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,\r
-   0.,  0.,  0.,  0.,  0.,  0.,  0.,  0., -1.,  0.,  1.,  1.,  0.,  0.,  0.,  0.,  1.,  0.,  0.,  1.,\r
-   0.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,  1.,  0.,  0.,  1.,  0., -1.,\r
-  -1.,  1.,  0.,  0.,  0.,  1.,  0.,  1.,  0.,  1.,  0.,  0., -1.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,\r
-   0., -1.,  0., -1.,  0.,  0.,  0., -1.,  0.,  0., -1.,  0.,  1.,  1.,  0.,  0.,  0.,  0.,  0.,  0.,\r
-   0.,  0.,  0.,  0.,  0.,  0.,  0., -1., -1.,  0.,  0.,  0.,  0.,  1.,  0.,  0.,  0.,  0.,  0.,  0.,\r
-  -1.,  0., -1., -1.,  0.,  0., -1.,  0., -1.,  0.,  0.,  0.,  0.,  0.,  1.,  0.,  1.,  0.,  0.,  0.,\r
-   0.,  0.,  0.,  1., -1.,  0.,  1.,  0.,  0.,  0.,  0., -1.,  0.,  0.,  0.,  0.,  0.,  0.,  1.,  0.,\r
-   0., -1., -1.,  0.,  0.,  0.,  0.,  0.,  0.,  1.,  0.,  0.,  0.,  0.,  1., -1.,  0.,  1.,  0.,  1.,\r
-   0.,  1.,  0.,  0.,  0.,  1.,  0.,  0.,  0.,  0., -1.,  0.,  0.,  0., -1.,  0.,  0.,  0.,  0.,  0.,\r
-   0.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,  0., -1.,  0.,  0.,\r
-   0.,  0.,  0.,  0.,  0.,  0.,  1.,  0.,  0., -1.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,\r
-   1.,  0.,  0.,  1.,  0.,  0.,  1.,  0.,  0.,  0.,  0.,  0.,  0., -1.,  1.,  0.,  1.,  0.,  0., -1.,\r
-   0.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,  1., -1.,  0.,  0.,  0., -1.,  0.,  0.,  0.,  0., -1.,\r
-   0.,  0.,  0.,  0.,  1., -1.,  0., -1.,  1.,  0.,  0.,  0.,  0., -1.,  0.,  0.,  0.,  1.,  0.,  0.,\r
-   0.,  0.,  0., -1.,  0.,  0.,  0.,  0.,  0.,  0., -1.,  0., -1.,  1.,  1., -1.,  0.,  0.,  0.,  1.,\r
-   0.,  1.,  0.,  0.,  0., -1.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,  1.,  0.,  1.,  0.,\r
-   0.,  0.,  0.,  0., -1.,  0.,  0.,  0.,  1.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,\r
-   0.,  0., -1.,  0.,  0.,  0.,  1.,  0.,  0.,  0.,  0., -1.,  0.,  1., -1.,  0.,  1.,  0.,  0.,  0.,\r
-   0.,  0., -1.,  0.,  0.,  0.,  1.,  0., -1.,  1., -1.,  0.,  0.,  1.,  0.,  0.,  0.,  0., -1.,  0.,\r
-   0.,  0., -1.,  0.,  0.,  0.,  0., -1.,  0.,  0.,  0.,  0.,  1.,  0.,  0.,  0., -1.,  0.,  0.,  0.,\r
-   0.,  0.,  0.,  1.,  0.,  0.,  0.,  0.,  0.,  0.,  1., -1.,  0.,  0.,  1.,  0.,  0.,  0.,  0., -1.,\r
-   0.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,  0., -1.,  0.,  0.,  0.,  1.,  0.,  0.,  1.,  0.,  0.,\r
-   0.,  0.,  1.,  0.,  0.,  1.,  0.,  0., -1.,  0.,  0.,  0.,  1.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,\r
-   1.,  0.,  0., -1.,  0.,  0., -1.,  0.,  0.,  0.,  1.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,\r
-   0.,  0.,  0.,  1.,  0.,  0.,  0.,  0.,  0.,  1.,  0.,  0., -1.,  1., -1.,  0.,  1.,  0.,  0.,  0.,\r
-   0.,  0.,  0.,  0.,  1., -1.,  0.,  0.,  0.,  0.,  0.,  0.,  0.,  0., -1.,  1.,  0.,  0.,  0.,  0.,\r
-   0.,  0.,  0.,  0.,  0.,  0.,  0.,  1.,  0.,  0.,  0.,  0.,  0., -1.,  0.,  0.,  0.,  0., -1.,  0.,\r
-   0.,  0., -1.,  0., -1.,  0.,  0.,  0.,  0.,  0.,  0., -1.,  0.,  0., -1.,  0.,  0.,  0.,  0.,  0.,\r
-   0.,  0.,  0.,  1., -1.,  0.,  0.,  0.,  0., -1.,  0.,  1.,  0.,  0.,  1.,  0.,  0.,  0.,  0., -1.,\r
-   0.,  0.,  0.,  0.,  1.,  0.,  0.,  0.,  0., -1.,  0.,  0., -1.,  0.,  0.,  0.,  0.,  0.,  0.,  1., \r
-   0., 0.};\r
-   \r
index efeae69..2d823aa 100644 (file)
@@ -19,8 +19,8 @@ int main(int argc, char **argv)
 
    for (i=0;i<FRAME_SIZE;i++)
       bak2[i]=0;
-   st = encoder_init(&nb_mode);
-   dec = decoder_init(&nb_mode);
+   st = encoder_init(&speex_nb_mode);
+   dec = decoder_init(&speex_nb_mode);
    if (argc != 4 && argc != 3)
    {
       fprintf (stderr, "Usage: encode [in file] [out file] [bits file]\nargc = %d", argc);
index 8e936e0..75ee0e2 100644 (file)
@@ -19,8 +19,8 @@ int main(int argc, char **argv)
 
    for (i=0;i<FRAME_SIZE;i++)
       bak2[i]=0;
-   st = encoder_init(&wb_mode);
-   dec = decoder_init(&wb_mode);
+   st = encoder_init(&speex_wb_mode);
+   dec = decoder_init(&speex_wb_mode);
    if (argc != 4 && argc != 3)
    {
       fprintf (stderr, "Usage: encode [in file] [out file] [bits file]\nargc = %d", argc);
@@ -61,7 +61,7 @@ int main(int argc, char **argv)
       }
       speex_bits_rewind(&bits);
       
-      decode(dec, &bits, input);
+      /*decode(dec, &bits, input);*/
 
       /* Save the bits here */
       for (i=0;i<FRAME_SIZE;i++)
index ee657bf..2674d74 100644 (file)
@@ -138,11 +138,11 @@ int main(int argc, char **argv)
       header[5]=0;
       if (strcmp(header,"spexn")==0)
       {
-         mode=&nb_mode;
+         mode=&speex_nb_mode;
          narrowband=1;
       } else if (strcmp(header,"spexw")==0)
       {
-         mode=&wb_mode;
+         mode=&speex_wb_mode;
          wideband=1;
       } else 
       {
index 3a07258..ea79a83 100644 (file)
@@ -126,9 +126,9 @@ int main(int argc, char **argv)
    if (!wideband)
       narrowband=1;
    if (narrowband)
-      mode=&nb_mode;
+      mode=&speex_nb_mode;
    if (wideband)
-      mode=&wb_mode;
+      mode=&speex_wb_mode;
 
    st = encoder_init(mode);