[xiph-cvs] cvs commit: speex/libspeex cb_search.c cb_search.h exc_10_16_table.c exc_10_32_table.c exc_20_32_table.c exc_5_256_table.c exc_5_64_table.c exc_8_128_table.c hexc_10_32_table.c hexc_table.c modes.c exc_8_256_table.c
Jean-Marc Valin
jm at xiph.org
Mon Jan 27 00:31:46 PST 2003
jm 03/01/27 03:31:46
Modified: libspeex cb_search.c cb_search.h exc_10_16_table.c
exc_10_32_table.c exc_20_32_table.c
exc_5_256_table.c exc_5_64_table.c
exc_8_128_table.c hexc_10_32_table.c hexc_table.c
modes.c
Removed: libspeex exc_8_256_table.c
Log:
Transformed all excitation codebooks into sighed short arrays, reducing
their size (in the final binary) by a factor of 4.
Revision Changes Path
1.83 +9 -7 speex/libspeex/cb_search.c
Index: cb_search.c
===================================================================
RCS file: /usr/local/cvsroot/speex/libspeex/cb_search.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- cb_search.c 6 Jan 2003 05:56:56 -0000 1.82
+++ cb_search.c 27 Jan 2003 08:31:45 -0000 1.83
@@ -36,6 +36,8 @@
#include "vq.h"
#include "misc.h"
+#include <math.h>
+
void split_cb_search_shape_sign(
float target[], /* target vector */
float ak[], /* LPCs for this subframe */
@@ -60,7 +62,7 @@
float **ot, **nt;
int **nind, **oind;
int *ind;
- float *shape_cb;
+ signed char *shape_cb;
int shape_cb_size, subvect_size, nb_subvect;
split_cb_params *params;
int N=2;
@@ -126,7 +128,7 @@
for (i=0;i<shape_cb_size;i++)
{
float *res;
- float *shape;
+ signed char *shape;
res = resp+i*subvect_size;
shape = shape_cb+i*subvect_size;
@@ -136,7 +138,7 @@
{
res[j]=0;
for (k=0;k<=j;k++)
- res[j] += shape[k]*r[j-k];
+ res[j] += 0.03125*shape[k]*r[j-k];
}
/* Compute codeword energy */
@@ -220,7 +222,7 @@
rind-=shape_cb_size;
}
- g=sign*shape_cb[rind*subvect_size+m];
+ g=sign*0.03125*shape_cb[rind*subvect_size+m];
q=subvect_size-m;
for (n=subvect_size*(i+1);n<nsf;n++,q++)
t[n] -= g*r[q];
@@ -289,7 +291,7 @@
}
for (j=0;j<subvect_size;j++)
- e[subvect_size*i+j]=sign*shape_cb[rind*subvect_size+j];
+ e[subvect_size*i+j]=sign*0.03125*shape_cb[rind*subvect_size+j];
}
/* Update excitation */
for (j=0;j<nsf;j++)
@@ -313,7 +315,7 @@
{
int i,j;
int *ind, *signs;
- float *shape_cb;
+ signed char *shape_cb;
int shape_cb_size, subvect_size, nb_subvect;
split_cb_params *params;
int have_sign;
@@ -344,7 +346,7 @@
if (signs[i])
s=-1;
for (j=0;j<subvect_size;j++)
- exc[subvect_size*i+j]+=s*shape_cb[ind[i]*subvect_size+j];
+ exc[subvect_size*i+j]+=s*0.03125*shape_cb[ind[i]*subvect_size+j];
}
}
<p><p>1.28 +1 -1 speex/libspeex/cb_search.h
Index: cb_search.h
===================================================================
RCS file: /usr/local/cvsroot/speex/libspeex/cb_search.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- cb_search.h 6 Jan 2003 05:56:56 -0000 1.27
+++ cb_search.h 27 Jan 2003 08:31:45 -0000 1.28
@@ -38,7 +38,7 @@
typedef struct split_cb_params {
int subvect_size;
int nb_subvect;
- float *shape_cb;
+ signed char *shape_cb;
int shape_bits;
int have_sign;
} split_cb_params;
<p><p>1.2 +42 -40 speex/libspeex/exc_10_16_table.c
Index: exc_10_16_table.c
===================================================================
RCS file: /usr/local/cvsroot/speex/libspeex/exc_10_16_table.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- exc_10_16_table.c 18 Jul 2002 22:55:35 -0000 1.1
+++ exc_10_16_table.c 27 Jan 2003 08:31:45 -0000 1.2
@@ -1,48 +1,50 @@
/* Copyright (C) 2002 Jean-Marc Valin
File: exc_10_16_table.c
Codebook for excitation in narrowband CELP mode (3200 bps)
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ - Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ - Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
-
- 3. The name of the author may not be used to endorse or promote products
- derived from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE.
+
+ - Neither the name of the Xiph.org Foundation nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-float exc_10_16_table[16][10]={
-{0.672920,1.231544,0.429817,1.384486,0.338981,1.107532,-0.060037,0.714487,-0.120983,0.178255},
-{1.447673,-0.875039,0.412456,-0.856655,-0.731211,0.387585,0.137510,0.631255,-0.152618,0.274417},
-{1.167214,-0.552696,-0.722937,0.719901,-0.002841,0.287706,-0.196612,-0.636736,0.109596,-0.034344},
-{-0.544655,-0.150252,-0.118561,0.522666,0.009056,0.023425,0.286494,-0.061322,0.018127,0.076392},
-{0.070470,-0.360622,0.253374,-0.774034,1.226684,0.460159,0.287595,0.487105,-1.724375,-0.354565},
-{0.273119,0.358771,0.155824,0.321754,-0.052317,-1.864035,0.245028,0.391091,-0.195698,0.335194},
-{-0.512702,0.852019,-1.458236,-0.380709,0.339188,0.036204,0.504249,-0.216133,0.265968,-0.079673},
-{-0.897480,0.276487,-0.422062,0.796802,-0.580294,1.062758,1.130878,0.376637,1.254328,-0.327360},
-{-0.083722,-0.761485,-0.423256,-1.163996,-0.668986,-1.080118,-0.051286,-1.112546,0.104534,-0.176028},
-{2.097711,0.861951,0.184816,-0.527173,-0.092463,-0.389416,-0.486964,-0.483164,-0.525122,-0.233066},
-{-1.831345,-1.111528,-0.411369,0.033902,0.224034,0.017868,0.073562,0.315528,0.069976,0.343412},
-{0.414476,0.308949,0.256880,-0.046960,0.227517,0.086626,0.149760,0.115483,0.073386,0.062901},
-{-0.081650,-0.250841,0.124951,-0.163551,0.183490,0.208921,-1.298954,0.472797,1.101948,-0.060043},
-{-1.438355,1.183894,0.863996,-0.609935,-0.292002,0.018439,0.206740,-0.082611,-0.005861,-0.062936},
-{-0.142826,-0.119908,-0.076033,-0.140005,-0.239610,-0.081487,-0.235004,-0.164567,-0.230740,-0.138510},
-{-0.475186,-0.873378,1.637971,0.993813,0.147026,-0.162624,-0.522283,-0.627300,-0.326108,-0.022353}};
+
+signed char exc_10_16_table[16][10] = {
+{22,39,14,44,11,35,-2,23,-4,6},
+{46,-28,13,-27,-23,12,4,20,-5,9},
+{37,-18,-23,23,0,9,-6,-20,4,-1},
+{-17,-5,-4,17,0,1,9,-2,1,2},
+{2,-12,8,-25,39,15,9,16,-55,-11},
+{9,11,5,10,-2,-60,8,13,-6,11},
+{-16,27,-47,-12,11,1,16,-7,9,-3},
+{-29,9,-14,25,-19,34,36,12,40,-10},
+{-3,-24,-14,-37,-21,-35,-2,-36,3,-6},
+{67,28,6,-17,-3,-12,-16,-15,-17,-7},
+{-59,-36,-13,1,7,1,2,10,2,11},
+{13,10,8,-2,7,3,5,4,2,2},
+{-3,-8,4,-5,6,7,-42,15,35,-2},
+{-46,38,28,-20,-9,1,7,-3,0,-2},
+{-5,-4,-2,-4,-8,-3,-8,-5,-7,-4},
+{-15,-28,52,32,5,-5,-17,-20,-10,-1}};
<p><p>1.4 +58 -56 speex/libspeex/exc_10_32_table.c
Index: exc_10_32_table.c
===================================================================
RCS file: /usr/local/cvsroot/speex/libspeex/exc_10_32_table.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- exc_10_32_table.c 2 Jul 2002 05:14:28 -0000 1.3
+++ exc_10_32_table.c 27 Jan 2003 08:31:45 -0000 1.4
@@ -1,64 +1,66 @@
/* Copyright (C) 2002 Jean-Marc Valin
File: exc_10_32_table.c
Codebook for excitation in narrowband CELP mode (4000 bps)
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ - Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ - Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
-
- 3. The name of the author may not be used to endorse or promote products
- derived from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE.
+
+ - Neither the name of the Xiph.org Foundation nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-float exc_10_32_table[32][10]={
-{0.222614,0.519906,0.537807,0.834900,0.768574,0.698440,0.362245,0.125146,-0.104380,0.003991},
-{0.867091,-1.114772,1.210990,-0.744193,-0.478554,0.081265,-0.273419,0.480983,-0.147815,0.319687},
-{0.983006,-0.881476,0.343687,0.965425,-0.641360,0.280279,-0.339666,-0.349123,-0.070611,-0.220298},
-{-0.795489,0.441574,-0.674492,0.977338,0.118829,-0.449269,0.601377,-0.363410,0.431172,-0.171828},
-{0.132466,-0.222414,0.121165,-0.156902,0.282957,0.015570,-0.074355,1.327889,-1.478003,-0.502083},
-{0.025235,0.248915,-0.011890,0.286748,0.713845,-1.782006,-0.008702,0.881211,-0.329416,0.198051},
-{-0.958368,1.733103,-1.402455,0.080580,-0.170500,0.118395,0.049854,-0.051642,0.129305,-0.227595},
-{-0.094473,0.183241,-0.070073,0.225667,-0.079733,0.373938,0.168234,0.265017,1.679037,-0.325572},
-{0.254587,-0.206706,-0.263872,-0.761719,-0.786256,-0.845135,-0.446708,-0.143573,0.244240,0.164994},
-{1.366623,0.725273,0.149911,-0.291234,-0.332664,-0.329218,-0.395677,-0.288548,-0.375476,-0.249523},
-{-0.907199,-0.261195,-0.679940,0.191020,-0.481865,0.096753,-0.362971,-0.024393,-0.161747,-0.108619},
-{1.057318,-0.027304,0.915603,-0.509152,0.519639,-0.110496,0.388927,0.051398,0.033018,0.132582},
-{-0.049141,-0.137637,0.061384,-0.022765,0.340992,-0.106803,-1.631081,0.865349,0.950185,-0.268698},
-{-1.004759,0.780442,1.366369,-0.614946,-0.754159,0.127529,0.188085,-0.040931,0.008123,0.012819},
-{-0.079061,0.215337,-0.137278,-0.123618,-0.218604,-0.191322,-0.276231,-0.066509,-0.321451,-0.213928},
-{-0.768461,-0.327320,0.701414,0.896780,0.409488,-0.410814,-0.675160,-0.420661,-0.119706,-0.012850},
-{-0.120626,-0.498542,0.318433,0.453289,-1.135028,-0.760364,0.877979,0.772727,-0.033744,-0.085209},
-{2.061536,-1.026406,-0.351049,-0.474214,0.200347,0.004968,0.105561,0.113149,-0.071619,0.147569},
-{0.741957,-0.619200,-1.478054,0.901890,0.595183,-0.050624,-0.139683,-0.044306,0.011491,-0.043994},
-{-0.063578,0.094618,0.021315,0.255759,-0.355425,0.158380,0.168131,-1.776015,0.859523,0.889441},
-{0.000153,-0.498223,0.137631,-0.113421,0.383822,-0.178743,-0.020550,0.053229,-0.629225,1.892103},
-{-0.275320,0.753062,-0.693922,-1.327873,0.911359,0.184806,0.517060,0.247931,0.139503,0.048961},
-{-2.039659,0.456796,0.264935,0.316707,0.156900,0.181944,0.152528,0.099029,0.053452,-0.076584},
-{-0.103893,0.167002,-0.266384,0.123452,-0.148573,0.707334,0.409610,0.732516,-0.092144,-1.972234},
-{0.085041,-0.153236,-0.134474,-0.175246,0.012377,-0.079804,0.705222,-1.122601,-1.439888,0.288656},
-{0.150406,0.157781,0.257320,0.137059,0.274465,-0.162830,0.026549,-0.084041,0.298488,0.027517},
-{-0.182249,0.319635,-0.350370,0.739379,-1.474439,0.969650,0.693391,-0.361626,0.443915,-0.321488},
-{0.176029,0.347990,-0.206128,-0.228386,0.224059,-0.973617,1.600652,-0.388001,-0.179744,0.217642},
-{0.179759,-0.518558,0.272426,-0.335904,-0.610544,1.624513,-0.601024,0.086539,-0.174046,-0.186019},
-{-0.236881,-0.167430,0.729064,-1.279726,1.152136,0.031319,-0.669390,0.326712,-0.429779,0.251144},
-{0.230600,0.147018,-0.468695,-0.482089,0.709099,1.209565,-0.802651,-1.024772,0.210781,0.047537},
-{-1.007410,-0.923338,-0.662811,-0.258064,0.110833,0.362967,0.519989,0.469280,0.442281,0.340309}};
+
+signed char exc_10_32_table[32][10] = {
+{7,17,17,27,25,22,12,4,-3,0},
+{28,-36,39,-24,-15,3,-9,15,-5,10},
+{31,-28,11,31,-21,9,-11,-11,-2,-7},
+{-25,14,-22,31,4,-14,19,-12,14,-5},
+{4,-7,4,-5,9,0,-2,42,-47,-16},
+{1,8,0,9,23,-57,0,28,-11,6},
+{-31,55,-45,3,-5,4,2,-2,4,-7},
+{-3,6,-2,7,-3,12,5,8,54,-10},
+{8,-7,-8,-24,-25,-27,-14,-5,8,5},
+{44,23,5,-9,-11,-11,-13,-9,-12,-8},
+{-29,-8,-22,6,-15,3,-12,-1,-5,-3},
+{34,-1,29,-16,17,-4,12,2,1,4},
+{-2,-4,2,-1,11,-3,-52,28,30,-9},
+{-32,25,44,-20,-24,4,6,-1,0,0},
+{-3,7,-4,-4,-7,-6,-9,-2,-10,-7},
+{-25,-10,22,29,13,-13,-22,-13,-4,0},
+{-4,-16,10,15,-36,-24,28,25,-1,-3},
+{66,-33,-11,-15,6,0,3,4,-2,5},
+{24,-20,-47,29,19,-2,-4,-1,0,-1},
+{-2,3,1,8,-11,5,5,-57,28,28},
+{0,-16,4,-4,12,-6,-1,2,-20,61},
+{-9,24,-22,-42,29,6,17,8,4,2},
+{-65,15,8,10,5,6,5,3,2,-2},
+{-3,5,-9,4,-5,23,13,23,-3,-63},
+{3,-5,-4,-6,0,-3,23,-36,-46,9},
+{5,5,8,4,9,-5,1,-3,10,1},
+{-6,10,-11,24,-47,31,22,-12,14,-10},
+{6,11,-7,-7,7,-31,51,-12,-6,7},
+{6,-17,9,-11,-20,52,-19,3,-6,-6},
+{-8,-5,23,-41,37,1,-21,10,-14,8},
+{7,5,-15,-15,23,39,-26,-33,7,2},
+{-32,-30,-21,-8,4,12,17,15,14,11}};
<p><p>1.2 +66 -33 speex/libspeex/exc_20_32_table.c
Index: exc_20_32_table.c
===================================================================
RCS file: /usr/local/cvsroot/speex/libspeex/exc_20_32_table.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- exc_20_32_table.c 15 Jan 2003 06:47:42 -0000 1.1
+++ exc_20_32_table.c 27 Jan 2003 08:31:45 -0000 1.2
@@ -1,33 +1,66 @@
-float exc_20_32_table[32][20] = {
-{0.385835,0.992346,0.796313,1.446102,1.139713,1.017143,0.279276,0.425243,-0.106878,0.184183,0.038228,-0.245123,0.012730,-0.324168,-0.163760,-0.217982,-0.213392,-0.227542,-0.170264,-0.151936},
-{0.971193,-0.838796,0.761915,-1.001168,-0.131621,0.314058,-0.358956,0.668808,-0.087411,0.585429,0.717812,-0.296646,0.700731,0.762464,-0.310948,-0.016843,-0.320548,-0.421614,-0.209698,-0.336131},
-{1.300680,-1.036860,0.959123,0.599127,-0.249762,-0.007131,-0.309187,-0.496772,0.043369,-0.668863,-0.518291,0.316086,-0.242373,0.438656,0.249137,0.122018,0.355125,-0.057376,0.161573,-0.067216},
-{-1.025148,0.359204,-0.507815,1.032122,0.345914,-0.127016,0.284016,-0.138467,0.331290,0.054365,0.199766,-0.165487,0.242338,-0.142125,0.356631,-0.127905,-0.188290,0.811983,-1.129505,-0.496041},
-{0.011671,0.129687,-0.053924,-0.240914,0.372778,0.181264,-0.046397,1.065158,-1.452582,-0.696987,0.270583,0.289095,0.658603,0.288260,0.164672,-2.048077,-0.141369,0.821359,0.058932,0.323760},
-{0.408075,0.077340,0.588409,0.293135,0.375968,-2.516703,0.104592,0.393360,0.403192,-0.002328,-0.422742,0.690342,-1.106197,0.187115,-0.225966,-0.122861,0.190001,-0.194680,0.306107,-0.172453},
-{-0.955610,1.183418,-1.024461,0.010252,-0.318900,-0.342537,0.170888,-0.383625,0.381676,-0.530637,0.157411,0.013592,-0.186269,0.404311,-0.292379,0.296958,0.237922,0.794205,1.018358,0.077626},
-{-0.384395,0.259387,-0.201207,0.318145,-0.077994,0.669112,0.215683,0.537019,1.358154,0.151841,0.330280,-0.216059,-0.278106,-0.626328,-1.118496,-0.616814,-0.733059,-0.117618,-0.129731,-0.103909},
-{0.849610,-0.290472,-0.272329,-1.517342,-1.229773,-1.173713,-0.351210,-0.283009,0.172041,0.171681,0.703925,0.781676,0.159396,0.091620,0.083648,0.137389,0.032849,0.052800,-0.107164,-0.029171},
-{2.713863,1.207143,0.544065,-0.666989,-0.278257,-0.583533,-0.294948,-0.460758,-0.406373,-0.448269,-0.521434,-0.358012,-0.313450,-0.335205,-0.263591,-0.189493,-0.040122,-0.103973,-0.099783,-0.029992},
-{-1.691674,-1.066625,-0.831425,-0.256805,-0.343753,-0.123115,-0.156514,0.000917,-0.001975,0.117673,0.246964,0.201293,0.280475,0.217209,0.276448,0.231693,0.196328,0.167198,0.143119,0.153387},
-{1.514880,0.303884,0.603754,-0.310767,0.365980,-0.021511,0.284034,-0.088431,0.066848,0.164088,-0.081589,0.064552,-0.064324,-0.074085,-0.008105,-0.069918,-0.808197,0.190970,0.282203,-0.204342},
-{-0.502056,-0.275469,0.066395,0.205878,0.207856,-0.149065,-1.353599,0.348577,0.699642,-0.329322,-0.271779,1.061478,1.152068,-0.462842,-0.399558,-0.190709,0.037886,-0.030227,0.032629,0.029476},
-{-1.985638,1.765144,1.631739,-0.349145,-0.830419,0.143945,0.119901,0.081185,0.019313,0.064743,0.040646,0.078267,-0.018597,-0.131681,-0.140082,-0.296924,-0.231042,-0.129048,-0.131543,0.051739},
-{-0.030559,-0.231545,-0.221884,-0.377203,-0.323813,-0.460783,-0.295142,-0.157309,-0.148739,-0.333705,-0.505932,-0.393362,0.194903,0.495250,0.129282,-0.420668,-0.495023,-0.307201,-0.109728,0.065070},
-{-1.474353,-0.392089,0.779041,1.474723,0.590693,-0.429642,-0.617767,-0.239793,-0.537290,0.003881,-0.078881,-0.400310,0.046188,0.176495,-0.541946,-0.422946,0.461712,0.037270,0.303429,0.184004},
-{-0.759844,0.012397,-0.320760,0.585986,-2.140632,-0.242911,0.427647,1.524819,0.525373,-0.162524,1.027569,-0.894868,0.108914,-0.118797,-0.012699,0.050330,-0.237233,0.145058,-0.178383,0.074577},
-{3.759964,-1.736372,-0.361864,-1.456705,0.712682,-0.268598,0.198618,-0.143019,0.036373,0.066447,-0.145022,0.035130,-0.313634,0.113027,-0.030529,-0.029092,0.125707,-0.038351,0.013620,-0.081670},
-{0.940485,-1.623113,-2.090365,0.949771,0.689662,0.350968,-0.017770,-0.135986,0.106887,0.015180,0.216693,0.053881,0.014546,0.042327,-0.303911,-0.130736,-0.251271,-0.397434,0.146890,0.020686},
-{0.029633,-0.044113,0.159388,0.417427,-0.278814,-0.083593,-0.319607,-1.946398,0.698646,1.501474,-0.134252,-0.183153,0.077333,0.091292,0.160409,0.046381,0.037752,0.124384,0.020741,0.409460},
-{0.090864,-0.616610,0.306949,-0.284595,0.393090,-0.073778,-0.122314,0.294586,-0.621735,1.383154,-0.026121,0.627200,-1.008127,-2.091311,0.588945,0.007938,0.870969,0.335745,0.254418,0.059720},
-{-0.348770,0.455005,-0.604507,-1.657717,0.959462,0.064076,1.054576,0.297955,0.196952,-0.110019,-1.827442,0.264742,0.303143,0.404530,0.436989,0.044981,0.376071,0.074242,0.009656,-0.014408},
-{-4.262995,1.147041,-0.260538,1.370506,-0.277051,0.799494,-0.078401,0.550266,0.054289,0.190935,0.345641,-0.024946,0.266418,0.022031,0.142033,0.079121,0.007883,0.035092,0.041595,0.073067},
-{0.382906,0.099986,-0.074785,-0.107647,0.204940,0.768958,0.270952,0.555063,-0.184521,-1.169576,0.107498,-0.236252,-0.502023,0.097978,-0.302950,-0.215380,0.541929,-1.065573,-1.367053,0.349255},
-{0.521566,-0.462151,-0.085519,-0.494477,-0.042172,-0.398518,0.346581,-1.449019,-2.034899,-0.047868,0.255850,0.418121,0.049987,0.133044,0.133524,0.163043,0.472510,0.166609,0.274186,0.175704},
-{0.256274,0.072129,0.251612,0.092785,0.319909,-0.024228,0.097667,-0.092256,0.182805,-0.067163,0.097233,0.086064,-0.151065,0.297435,-0.358582,0.213001,0.194301,-0.072778,0.197981,-0.071450},
-{-0.269718,0.603940,-0.379499,0.375257,-0.886130,1.200993,0.910549,-0.028665,0.374531,0.071952,0.160101,0.719147,-0.297580,0.100560,0.113843,-0.481381,0.664543,-0.130710,0.103240,0.103560},
-{0.191717,0.535866,-0.280262,-0.113455,-0.262102,-0.633476,0.817274,0.161083,-0.314874,0.198765,0.023377,-0.582393,0.566044,-0.478782,-0.383030,1.471533,-0.172203,-0.053126,-0.204375,-0.265743},
-{-0.024458,-0.517485,-0.047456,-0.048482,-0.441589,0.928241,-0.433317,0.051121,-0.213779,-0.109931,-0.024182,-0.374648,0.349026,-0.785762,0.494592,-0.083353,-0.371568,0.359167,-0.228303,0.220736},
-{-0.521106,0.025764,0.596348,-0.876477,0.958118,-0.209415,-0.300574,0.227734,-0.322891,0.094214,0.382447,0.140715,-0.510845,0.179149,0.743704,1.285724,-0.909848,-1.685125,0.015615,0.028941},
-{0.228998,-0.020179,0.148300,-0.177826,0.414240,0.308158,-0.137401,-0.248048,0.237154,-0.280059,-0.853601,-1.668661,-1.183038,-0.023576,0.316119,0.599634,0.516425,0.503233,0.378773,0.361508},
-{-0.010699,0.102772,-0.217199,-0.118139,0.392144,0.377085,-0.955779,-0.434499,0.181432,-0.150895,0.105105,0.158355,0.523786,1.346176,1.571707,0.768078,0.301679,0.037410,-0.175212,-0.065956}};
+/* Copyright (C) 2002 Jean-Marc Valin
+ File: exc_20_32_table.c
+ Codebook for excitation in narrowband CELP mode (2000 bps)
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ - Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ - Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ - Neither the name of the Xiph.org Foundation nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+
+signed char exc_20_32_table[32][20] = {
+{12,32,25,46,36,33,9,14,-3,6,1,-8,0,-10,-5,-7,-7,-7,-5,-5},
+{31,-27,24,-32,-4,10,-11,21,-3,19,23,-9,22,24,-10,-1,-10,-13,-7,-11},
+{42,-33,31,19,-8,0,-10,-16,1,-21,-17,10,-8,14,8,4,11,-2,5,-2},
+{-33,11,-16,33,11,-4,9,-4,11,2,6,-5,8,-5,11,-4,-6,26,-36,-16},
+{0,4,-2,-8,12,6,-1,34,-46,-22,9,9,21,9,5,-66,-5,26,2,10},
+{13,2,19,9,12,-81,3,13,13,0,-14,22,-35,6,-7,-4,6,-6,10,-6},
+{-31,38,-33,0,-10,-11,5,-12,12,-17,5,0,-6,13,-9,10,8,25,33,2},
+{-12,8,-6,10,-2,21,7,17,43,5,11,-7,-9,-20,-36,-20,-23,-4,-4,-3},
+{27,-9,-9,-49,-39,-38,-11,-9,6,5,23,25,5,3,3,4,1,2,-3,-1},
+{87,39,17,-21,-9,-19,-9,-15,-13,-14,-17,-11,-10,-11,-8,-6,-1,-3,-3,-1},
+{-54,-34,-27,-8,-11,-4,-5,0,0,4,8,6,9,7,9,7,6,5,5,5},
+{48,10,19,-10,12,-1,9,-3,2,5,-3,2,-2,-2,0,-2,-26,6,9,-7},
+{-16,-9,2,7,7,-5,-43,11,22,-11,-9,34,37,-15,-13,-6,1,-1,1,1},
+{-64,56,52,-11,-27,5,4,3,1,2,1,3,-1,-4,-4,-10,-7,-4,-4,2},
+{-1,-7,-7,-12,-10,-15,-9,-5,-5,-11,-16,-13,6,16,4,-13,-16,-10,-4,2},
+{-47,-13,25,47,19,-14,-20,-8,-17,0,-3,-13,1,6,-17,-14,15,1,10,6},
+{-24,0,-10,19,-69,-8,14,49,17,-5,33,-29,3,-4,0,2,-8,5,-6,2},
+{120,-56,-12,-47,23,-9,6,-5,1,2,-5,1,-10,4,-1,-1,4,-1,0,-3},
+{30,-52,-67,30,22,11,-1,-4,3,0,7,2,0,1,-10,-4,-8,-13,5,1},
+{1,-1,5,13,-9,-3,-10,-62,22,48,-4,-6,2,3,5,1,1,4,1,13},
+{3,-20,10,-9,13,-2,-4,9,-20,44,-1,20,-32,-67,19,0,28,11,8,2},
+{-11,15,-19,-53,31,2,34,10,6,-4,-58,8,10,13,14,1,12,2,0,0},
+{-128,37,-8,44,-9,26,-3,18,2,6,11,-1,9,1,5,3,0,1,1,2},
+{12,3,-2,-3,7,25,9,18,-6,-37,3,-8,-16,3,-10,-7,17,-34,-44,11},
+{17,-15,-3,-16,-1,-13,11,-46,-65,-2,8,13,2,4,4,5,15,5,9,6},
+{8,2,8,3,10,-1,3,-3,6,-2,3,3,-5,10,-11,7,6,-2,6,-2},
+{-9,19,-12,12,-28,38,29,-1,12,2,5,23,-10,3,4,-15,21,-4,3,3},
+{6,17,-9,-4,-8,-20,26,5,-10,6,1,-19,18,-15,-12,47,-6,-2,-7,-9},
+{-1,-17,-2,-2,-14,30,-14,2,-7,-4,-1,-12,11,-25,16,-3,-12,11,-7,7},
+{-17,1,19,-28,31,-7,-10,7,-10,3,12,5,-16,6,24,41,-29,-54,0,1},
+{7,-1,5,-6,13,10,-4,-8,8,-9,-27,-53,-38,-1,10,19,17,16,12,12},
+{0,3,-7,-4,13,12,-31,-14,6,-5,3,5,17,43,50,25,10,1,-6,-2}};
<p><p>1.4 +282 -280 speex/libspeex/exc_5_256_table.c
Index: exc_5_256_table.c
===================================================================
RCS file: /usr/local/cvsroot/speex/libspeex/exc_5_256_table.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- exc_5_256_table.c 2 Jul 2002 05:14:28 -0000 1.3
+++ exc_5_256_table.c 27 Jan 2003 08:31:45 -0000 1.4
@@ -1,288 +1,290 @@
/* Copyright (C) 2002 Jean-Marc Valin
File: exc_5_256_table.c
Codebook for excitation in narrowband CELP mode (12800 bps)
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ - Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ - Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
-
- 3. The name of the author may not be used to endorse or promote products
- derived from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE.
+
+ - Neither the name of the Xiph.org Foundation nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-float exc_5_256_table[256][5]={
-{-0.237490,-1.143185,0.169593,-1.347293,0.145853},
-{2.282029,1.907869,1.214155,0.365887,-0.083613},
-{-1.917444,-1.006032,0.078006,1.317143,0.948997},
-{-0.102532,0.531861,-0.850615,0.270763,1.065384},
-{0.625333,-0.044232,-0.151058,0.060297,0.731948},
-{-0.225324,-1.442585,0.805758,1.654148,-1.472027},
-{0.637158,-0.047452,-1.027989,-2.789764,-1.585092},
-{-2.004120,0.848065,0.343231,0.480114,-1.073209},
-{-0.147939,-1.763385,0.789137,-0.273229,-0.045787},
-{-0.916375,0.030380,1.236911,2.097223,-0.711288},
-{-0.502244,0.498416,1.039226,0.608927,0.220822},
-{0.426680,2.661214,0.678083,-0.325512,-0.312750},
-{-0.362420,-0.230620,-0.038748,1.638908,2.794648},
-{0.897668,0.347415,-0.615305,-1.166983,-1.451614},
-{-0.468914,0.527239,-0.758255,-0.865331,0.749922},
-{0.072859,0.036755,0.004938,0.705453,-3.140831},
-{0.716576,0.445907,-0.043194,-0.714164,-0.566683},
-{0.288359,0.171274,-0.400953,1.191635,0.024874},
-{-0.870050,-0.865377,0.133129,0.837430,1.599925},
-{-0.824536,1.048903,-1.234708,1.096219,1.453526},
-{1.680720,1.174589,-1.698451,-0.811040,-0.181047},
-{1.305296,-0.782831,0.408409,-0.935244,-1.117951},
-{0.551011,1.289470,-0.128784,-1.026468,0.719755},
-{-0.999023,-0.207657,-0.131172,1.586798,-0.103564},
-{0.526495,-1.635804,1.741200,-1.455397,1.120556},
-{-0.050926,-0.669441,1.129219,0.318954,0.264495},
-{-1.035804,0.963022,0.602891,0.280953,-0.156028},
-{-1.258201,0.299914,-0.282269,-0.652484,0.588859},
-{0.553935,-2.435799,-0.552222,-0.144498,-0.002183},
-{-0.812061,-1.139392,-1.461207,-1.603880,-1.373126},
-{0.551616,1.252842,0.834597,-0.065958,0.921771},
-{1.520718,-0.815619,0.077759,0.992491,-1.696187},
-{0.949819,-2.293022,1.680126,0.079528,-0.168435},
-{1.136532,0.685554,1.652139,0.327742,-0.019946},
-{-2.627898,-1.664091,-0.917076,-0.144733,0.108210},
-{-1.383237,1.661278,-1.588413,0.125512,0.672875},
-{2.220547,-1.094048,-0.040326,1.046640,-0.159833},
-{-0.831687,-0.217022,1.132763,0.516049,-0.718965},
-{-1.207856,0.514369,-0.276876,-1.729956,-0.475417},
-{-0.632291,1.224503,-1.100033,0.196469,-1.216005},
-{-0.437477,0.572342,1.498100,-2.009446,-0.544362},
-{-0.483661,0.278221,1.208741,2.519628,1.152933},
-{-2.114403,1.146204,1.482490,-0.645010,-0.200224},
-{-3.256683,0.396660,0.187063,0.269166,-0.064718},
-{1.098232,0.238269,-0.713169,0.573599,1.308075},
-{1.404585,0.642890,1.022616,-0.158758,-1.536089},
-{0.289683,-0.202644,-1.335206,-1.745237,1.212780},
-{0.068826,-0.487846,-0.796365,2.703398,0.037605},
-{-0.093420,-0.288647,0.537690,-0.788034,-0.336765},
-{-0.282264,-0.035466,0.325906,0.073757,-0.436129},
-{-0.441147,0.131624,-0.039582,-0.307290,0.873403},
-{-0.727399,1.262546,-1.006406,0.800668,-0.292161},
-{0.815407,0.125318,-0.833953,-0.721837,0.098634},
-{1.309516,-1.881402,0.020819,1.535917,-0.085784},
-{0.852091,0.324202,-1.632708,-1.240940,-0.058282},
-{0.548795,1.420246,-0.723404,0.539559,-1.363143},
-{0.093279,-0.087619,0.520985,-1.429303,1.633747},
-{-1.262139,-1.482456,0.774305,2.333901,0.953265},
-{-1.522472,1.653068,0.930418,-0.928553,-0.988570},
-{-1.124685,1.193134,-0.184266,-0.468161,-0.494262},
-{1.686199,-0.846011,-1.490896,0.103816,1.185602},
-{-0.905393,-0.993489,-0.698452,-0.425371,-0.140388},
-{-0.733567,-0.407297,0.984456,-1.227205,0.277382},
-{0.262909,-1.405699,-0.393251,1.047763,-0.504130},
-{1.534588,1.253100,1.010053,0.967494,0.874562},
-{0.703934,0.703752,1.013826,1.453567,1.828965},
-{-2.135674,0.237163,1.942164,1.368833,0.786527},
-{-0.438943,-0.751491,-2.022763,-0.509142,1.136884},
-{2.096044,-0.779826,-1.183293,-0.664704,0.129661},
-{-1.019083,-0.063546,1.315377,0.160114,-1.969163},
-{1.235455,0.339629,0.821209,-1.322199,-0.707144},
-{-1.912577,2.477290,-0.959275,0.727331,-0.627238},
-{0.309120,-0.992473,1.649549,-0.787349,-1.114847},
-{0.301261,-0.806354,-0.168984,0.102566,0.006322},
-{-2.230768,0.157070,-0.325876,-1.169784,0.026636},
-{-0.740452,0.671119,-1.698043,-0.540594,0.039289},
-{-0.916720,-0.795500,-0.456103,-0.828801,0.996582},
-{2.126760,1.405075,-0.487894,-1.152900,-0.547410},
-{-0.140861,0.022415,0.012865,-2.410275,2.227177},
-{-0.187330,0.088501,-0.616484,2.233887,-2.089702},
-{0.921840,-1.098992,0.315908,-0.951877,0.583245},
-{0.125248,0.485888,0.531679,0.158882,0.010191},
-{-0.444659,0.586426,0.073443,0.881859,0.811644},
-{1.834116,0.107207,0.054902,0.764563,1.206275},
-{1.729793,-1.573319,-1.410877,-0.548206,-0.523803},
-{1.040945,-1.092189,0.438768,-0.023495,0.017181},
-{0.260810,2.722228,-1.080897,-0.910895,-0.015318},
-{-0.854465,0.415037,-0.209929,0.730699,-0.418210},
-{1.147116,-1.244100,1.549513,-1.086968,0.450802},
-{0.606518,-0.224389,-0.440378,1.542224,1.674585},
-{-0.146370,0.701725,-0.074202,-0.919303,-0.243196},
-{-0.830643,1.194300,0.413085,0.854889,1.509228},
-{0.378910,-1.273831,-0.654142,-0.482317,0.874973},
-{0.207290,-0.487979,-0.734850,-0.596906,-0.638005},
-{0.358123,-0.623600,0.269431,0.067744,0.404291},
-{0.730410,-0.617025,0.340155,0.850285,-0.845128},
-{2.224645,-2.163902,0.253904,0.058791,-0.195806},
-{0.673231,0.384296,0.512587,0.500735,0.288364},
-{-0.508938,-0.238578,-0.523755,0.039320,0.788281},
-{0.038009,1.236247,-1.151307,-1.025572,2.070569},
-{2.937592,1.658959,0.113843,-0.675215,-0.796474},
-{-1.290535,-1.318024,0.779934,1.087802,-0.504724},
-{-0.458799,1.768295,0.969990,-0.912502,-0.985948},
-{0.654864,0.514286,-1.881885,1.402762,0.466901},
-{-0.039371,0.217141,1.782933,-0.822767,-1.477100},
-{-0.921193,0.344953,0.246566,0.454925,0.578369},
-{-3.281119,-0.262983,1.675093,0.846747,0.322978},
-{-0.526518,0.178787,-0.374239,-0.044430,-0.321721},
-{0.130555,0.009876,0.733984,-0.311299,0.981688},
-{0.415851,0.334582,0.310308,0.384204,-2.011845},
-{0.732594,-0.085433,-0.251654,-0.591676,0.508180},
-{1.638423,0.740970,-1.253260,0.510985,0.298942},
-{1.236445,0.151672,0.272685,-0.005675,-0.405615},
-{-0.204947,-0.641425,-0.239561,-0.197927,-0.203245},
-{-0.664961,1.836657,0.494243,-1.664738,0.564285},
-{-1.867832,0.334376,-1.475997,0.449648,-0.557838},
-{0.769515,-0.397243,-0.748284,0.122863,-1.213451},
-{0.510456,-0.863180,1.696700,0.802662,-2.080803},
-{0.948355,0.839432,-0.636461,-1.623075,0.631299},
-{-0.359829,1.708258,0.373454,0.569732,-0.490442},
-{1.211346,-0.442310,-0.191107,-0.821124,1.758013},
-{-2.739990,-1.733954,0.362254,0.790418,0.816343},
-{-1.167359,0.188308,2.347375,-0.004311,-1.055182},
-{-2.520289,1.690341,-0.950575,0.036677,-0.211055},
-{1.529692,-0.712544,-0.446714,0.653271,0.307403},
-{-1.932004,-1.801185,-1.774508,-1.455865,-1.076385},
-{0.481799,-0.127697,1.063191,-2.430217,0.975859},
-{0.783380,-0.349613,0.231802,1.576342,-0.299123},
-{1.321438,-1.975989,0.444613,-1.126934,-0.120772},
-{1.767587,1.726074,1.789547,1.650339,1.300294},
-{-1.320591,-0.021087,0.467677,1.235861,1.159889},
-{0.472353,0.778945,-0.345924,0.185862,0.023489},
-{0.976761,-0.049321,-0.187924,-0.032560,-0.219486},
-{-1.988678,1.067921,0.861563,0.924831,-0.043678},
-{0.079461,0.671520,-0.010516,-2.735029,-0.368439},
-{-1.739775,0.773082,-0.869245,1.261457,0.239504},
-{-0.884101,-0.444766,0.287351,0.362427,0.075910},
-{-0.187381,-0.522243,0.687928,1.524120,-0.191623},
-{-0.824627,0.450629,0.888709,-0.612916,0.126629},
-{-0.387682,1.552810,1.081412,1.247160,0.399254},
-{-1.175274,-1.803604,-0.898581,0.538098,0.949505},
-{0.683291,1.868813,0.814127,-1.677352,-1.232676},
-{-0.368707,1.806760,-0.882627,-1.959961,0.326686},
-{-0.654148,-0.241966,-0.390202,0.812996,-1.921986},
-{0.183536,-0.302033,-0.350024,-0.677788,-0.173793},
-{-0.219579,0.131887,0.041401,0.551546,0.059255},
-{-2.195261,0.339380,0.440082,0.131060,0.416838},
-{0.592208,-0.752618,-1.065400,0.749174,2.084597},
-{0.539968,1.583781,-0.667340,0.415546,0.704140},
-{1.672265,-0.945839,1.508705,0.043261,-0.411751},
-{2.494625,0.811584,-0.502530,-0.074187,0.402822},
-{-0.129194,0.196569,-0.952572,0.893145,-0.739012},
-{2.286799,-1.798589,0.934779,-0.843560,0.615458},
-{-0.049100,-0.647380,1.282294,1.400613,0.943306},
-{-0.829075,-0.107640,-0.160871,-0.549651,-0.615489},
-{-1.520783,-0.096937,-1.087481,0.302542,1.314978},
-{-0.590268,-2.078278,-1.662984,-0.357445,0.290511},
-{0.405666,-0.461039,-1.030301,-1.594154,-0.929513},
-{0.467651,0.209407,0.771860,-0.945564,0.120815},
-{0.879624,-0.672485,-1.076939,1.672229,-0.896547},
-{1.226287,-1.427687,0.623423,0.487838,1.059391},
-{-0.112611,1.476012,2.332795,0.027173,-1.372062},
-{-1.712299,-0.741591,0.220303,-0.037289,0.287947},
-{-1.313515,1.568209,-0.242583,-1.125216,1.296033},
-{2.128819,-0.000202,-0.127317,-0.323292,-0.712285},
-{-0.481919,-1.574391,2.011321,1.118290,-0.287147},
-{-0.834813,0.369250,0.772486,-1.192059,-1.467855},
-{-1.160510,1.013416,-1.518733,1.604893,-1.132023},
-{0.065437,-0.130093,2.142449,-0.824300,0.585279},
-{0.217516,1.390685,2.087718,1.444317,0.393951},
-{-1.965380,1.423437,0.463137,-1.458863,0.129408},
-{-1.276771,0.399516,-0.181007,0.161340,-0.647473},
-{1.158774,0.811547,-1.724151,-0.222809,1.042694},
-{-0.025592,-0.870210,0.296906,-0.533732,-2.005479},
-{-0.426015,-0.008205,-1.110873,-0.533805,2.897039},
-{-0.078628,-0.273738,-2.052340,1.365382,-0.641033},
-{0.094530,-0.385063,1.186364,-0.196294,-0.402083},
-{-0.377287,0.592461,0.416138,1.342275,-1.345124},
-{-0.326100,-0.372055,0.177385,-0.154609,0.279860},
-{-1.517009,1.004951,-0.168499,0.071791,0.136728},
-{0.142833,0.463098,-0.486232,0.308931,-0.647979},
-{0.256930,-1.930003,-0.262798,1.989224,0.258632},
-{2.463261,-0.041199,-2.074486,-1.515627,-0.573898},
-{0.144182,1.257711,-0.153253,-0.924319,-1.402832},
-{0.026153,-0.200518,0.650758,-1.004331,2.896873},
-{-0.565282,-0.922527,-0.649679,0.992938,0.641581},
-{-0.551082,0.688001,0.254383,0.144191,-1.294243},
-{-1.685997,2.488625,0.673537,-0.316294,-0.226387},
-{-0.259635,-0.714486,-2.005490,2.059224,1.749423},
-{-0.438927,-0.938864,-1.278976,-1.427825,-0.429366},
-{-0.910525,-1.153751,0.845444,-0.424541,1.311529},
-{-0.055832,-0.295727,-0.894049,1.076591,0.447636},
-{1.026862,-0.452182,0.701255,0.134431,0.301766},
-{0.810617,0.806744,0.860610,0.997277,0.709153},
-{-2.249011,-1.008224,0.107200,-0.006099,-0.432912},
-{1.104328,-1.316145,-2.423342,-1.011666,0.193540},
-{0.893918,-0.551728,-1.393633,-0.167099,0.217447},
-{-1.036975,-1.408499,-0.093773,-0.696908,-1.056517},
-{0.251892,-0.238172,0.138507,-1.590215,-0.765916},
-{-0.288627,1.858300,-2.441963,0.665071,-0.151990},
-{-0.796230,-1.500815,2.047680,-0.483518,-0.524927},
-{-0.735792,-1.542143,-0.403761,0.786063,-0.721085},
-{-2.007396,-0.179960,1.263152,-0.736846,-0.596891},
-{-0.339633,1.787301,-1.043404,-0.261831,0.033607},
-{0.303760,-1.614090,-1.683049,0.877255,1.206159},
-{1.522410,1.047292,-0.348319,-1.908848,-1.288885},
-{-1.355471,0.298949,0.456469,-0.460846,1.582720},
-{0.950498,0.461328,-1.605406,0.992614,-1.072060},
-{-0.067245,-1.051726,0.441800,0.565649,0.490512},
-{0.034274,0.016215,-0.104667,-0.088058,0.033954},
-{0.035645,-0.552930,0.191087,0.507699,1.510268},
-{0.378791,-0.163210,-1.300047,0.216828,1.127200},
-{1.485399,0.231760,-0.612296,-0.314449,0.214765},
-{0.389814,0.063046,1.677153,1.203378,-1.181019},
-{1.144310,1.701280,0.140221,-0.352224,-0.255645},
-{-1.428605,-0.309726,0.159643,-0.312052,-1.072305},
-{1.431807,-0.368790,0.901943,-1.157026,1.216558},
-{1.132834,-0.337966,0.745579,1.735078,0.521934},
-{0.434581,0.626904,0.783042,-0.011025,-0.774859},
-{-0.864085,1.712395,-0.233626,-0.140994,0.855874},
-{0.084798,0.268131,-0.799099,-0.249884,0.182995},
-{-0.749883,-0.314867,-0.932863,-0.981966,-1.076037},
-{0.568342,0.117895,0.695575,0.654022,1.243202},
-{-0.028249,-0.920314,-1.159500,-0.252974,-0.667330},
-{2.884654,-0.901748,0.345218,-0.107313,0.359116},
-{2.269582,0.717803,0.688785,0.230416,0.133072},
-{-1.361770,-0.281947,-0.333282,0.651909,-0.402058},
-{0.336835,0.270386,-2.444829,-0.024210,1.455680},
-{3.577211,-0.364136,-1.142711,-0.589789,-0.148638},
-{-0.330944,-0.700313,0.607647,0.384170,-0.937977},
-{0.219312,1.192991,1.416036,-0.665606,-0.238848},
-{-0.267118,1.726629,-1.404944,1.748959,-0.668202},
-{0.231249,0.518833,1.432378,-1.791417,-2.715753},
-{-0.190609,0.842703,0.977178,0.956382,0.214204},
-{-1.739599,-0.380572,1.446263,0.650688,-0.156868},
-{-0.381698,1.133569,0.106957,0.079129,-0.671195},
-{1.350048,0.584280,0.362761,-0.231573,0.295979},
-{-0.424824,-0.012923,-0.281562,-1.037573,-2.837317},
-{0.213285,0.826367,0.084319,-0.352444,1.988971},
-{2.608741,-0.983670,-1.428316,0.769233,0.078000},
-{0.266188,0.147080,0.058180,0.076184,-0.035790},
-{0.615874,-0.535720,0.303301,-0.160849,-0.854527},
-{-0.252553,0.610928,0.253137,-0.607959,0.509103},
-{-0.662696,-0.393405,-0.978673,0.154664,0.161319},
-{1.319581,0.759991,0.282980,1.068894,-0.618567},
-{0.886271,-1.908543,0.701646,0.359079,-1.217602},
-{1.989436,-0.626814,-0.046220,-0.928131,-0.272808},
-{-0.610346,0.760465,-0.771226,-0.758075,-0.893955},
-{0.693531,-1.879951,0.197925,-0.164563,1.286364},
-{-0.288780,-2.729071,0.439511,1.065562,0.456857},
-{-1.778857,1.622610,2.151497,0.459413,-0.096012},
-{-3.178057,1.826172,0.501727,0.093708,0.196590},
-{1.875431,-2.358467,-0.999200,0.812455,0.228148},
-{-1.796573,-0.849192,-1.014730,-0.749490,-0.664323},
-{-0.912877,-0.494399,1.929179,-1.447123,0.954288},
-{0.940052,-0.847589,-0.482205,0.210276,0.453678}};
+
+signed char exc_5_256_table[256][5] = {
+{-8,-37,5,-43,5},
+{73,61,39,12,-3},
+{-61,-32,2,42,30},
+{-3,17,-27,9,34},
+{20,-1,-5,2,23},
+{-7,-46,26,53,-47},
+{20,-2,-33,-89,-51},
+{-64,27,11,15,-34},
+{-5,-56,25,-9,-1},
+{-29,1,40,67,-23},
+{-16,16,33,19,7},
+{14,85,22,-10,-10},
+{-12,-7,-1,52,89},
+{29,11,-20,-37,-46},
+{-15,17,-24,-28,24},
+{2,1,0,23,-101},
+{23,14,-1,-23,-18},
+{9,5,-13,38,1},
+{-28,-28,4,27,51},
+{-26,34,-40,35,47},
+{54,38,-54,-26,-6},
+{42,-25,13,-30,-36},
+{18,41,-4,-33,23},
+{-32,-7,-4,51,-3},
+{17,-52,56,-47,36},
+{-2,-21,36,10,8},
+{-33,31,19,9,-5},
+{-40,10,-9,-21,19},
+{18,-78,-18,-5,0},
+{-26,-36,-47,-51,-44},
+{18,40,27,-2,29},
+{49,-26,2,32,-54},
+{30,-73,54,3,-5},
+{36,22,53,10,-1},
+{-84,-53,-29,-5,3},
+{-44,53,-51,4,22},
+{71,-35,-1,33,-5},
+{-27,-7,36,17,-23},
+{-39,16,-9,-55,-15},
+{-20,39,-35,6,-39},
+{-14,18,48,-64,-17},
+{-15,9,39,81,37},
+{-68,37,47,-21,-6},
+{-104,13,6,9,-2},
+{35,8,-23,18,42},
+{45,21,33,-5,-49},
+{9,-6,-43,-56,39},
+{2,-16,-25,87,1},
+{-3,-9,17,-25,-11},
+{-9,-1,10,2,-14},
+{-14,4,-1,-10,28},
+{-23,40,-32,26,-9},
+{26,4,-27,-23,3},
+{42,-60,1,49,-3},
+{27,10,-52,-40,-2},
+{18,45,-23,17,-44},
+{3,-3,17,-46,52},
+{-40,-47,25,75,31},
+{-49,53,30,-30,-32},
+{-36,38,-6,-15,-16},
+{54,-27,-48,3,38},
+{-29,-32,-22,-14,-4},
+{-23,-13,32,-39,9},
+{8,-45,-13,34,-16},
+{49,40,32,31,28},
+{23,23,32,47,59},
+{-68,8,62,44,25},
+{-14,-24,-65,-16,36},
+{67,-25,-38,-21,4},
+{-33,-2,42,5,-63},
+{40,11,26,-42,-23},
+{-61,79,-31,23,-20},
+{10,-32,53,-25,-36},
+{10,-26,-5,3,0},
+{-71,5,-10,-37,1},
+{-24,21,-54,-17,1},
+{-29,-25,-15,-27,32},
+{68,45,-16,-37,-18},
+{-5,1,0,-77,71},
+{-6,3,-20,71,-67},
+{29,-35,10,-30,19},
+{4,16,17,5,0},
+{-14,19,2,28,26},
+{59,3,2,24,39},
+{55,-50,-45,-18,-17},
+{33,-35,14,-1,1},
+{8,87,-35,-29,0},
+{-27,13,-7,23,-13},
+{37,-40,50,-35,14},
+{19,-7,-14,49,54},
+{-5,22,-2,-29,-8},
+{-27,38,13,27,48},
+{12,-41,-21,-15,28},
+{7,-16,-24,-19,-20},
+{11,-20,9,2,13},
+{23,-20,11,27,-27},
+{71,-69,8,2,-6},
+{22,12,16,16,9},
+{-16,-8,-17,1,25},
+{1,40,-37,-33,66},
+{94,53,4,-22,-25},
+{-41,-42,25,35,-16},
+{-15,57,31,-29,-32},
+{21,16,-60,45,15},
+{-1,7,57,-26,-47},
+{-29,11,8,15,19},
+{-105,-8,54,27,10},
+{-17,6,-12,-1,-10},
+{4,0,23,-10,31},
+{13,11,10,12,-64},
+{23,-3,-8,-19,16},
+{52,24,-40,16,10},
+{40,5,9,0,-13},
+{-7,-21,-8,-6,-7},
+{-21,59,16,-53,18},
+{-60,11,-47,14,-18},
+{25,-13,-24,4,-39},
+{16,-28,54,26,-67},
+{30,27,-20,-52,20},
+{-12,55,12,18,-16},
+{39,-14,-6,-26,56},
+{-88,-55,12,25,26},
+{-37,6,75,0,-34},
+{-81,54,-30,1,-7},
+{49,-23,-14,21,10},
+{-62,-58,-57,-47,-34},
+{15,-4,34,-78,31},
+{25,-11,7,50,-10},
+{42,-63,14,-36,-4},
+{57,55,57,53,42},
+{-42,-1,15,40,37},
+{15,25,-11,6,1},
+{31,-2,-6,-1,-7},
+{-64,34,28,30,-1},
+{3,21,0,-88,-12},
+{-56,25,-28,40,8},
+{-28,-14,9,12,2},
+{-6,-17,22,49,-6},
+{-26,14,28,-20,4},
+{-12,50,35,40,13},
+{-38,-58,-29,17,30},
+{22,60,26,-54,-39},
+{-12,58,-28,-63,10},
+{-21,-8,-12,26,-62},
+{6,-10,-11,-22,-6},
+{-7,4,1,18,2},
+{-70,11,14,4,13},
+{19,-24,-34,24,67},
+{17,51,-21,13,23},
+{54,-30,48,1,-13},
+{80,26,-16,-2,13},
+{-4,6,-30,29,-24},
+{73,-58,30,-27,20},
+{-2,-21,41,45,30},
+{-27,-3,-5,-18,-20},
+{-49,-3,-35,10,42},
+{-19,-67,-53,-11,9},
+{13,-15,-33,-51,-30},
+{15,7,25,-30,4},
+{28,-22,-34,54,-29},
+{39,-46,20,16,34},
+{-4,47,75,1,-44},
+{-55,-24,7,-1,9},
+{-42,50,-8,-36,41},
+{68,0,-4,-10,-23},
+{-15,-50,64,36,-9},
+{-27,12,25,-38,-47},
+{-37,32,-49,51,-36},
+{2,-4,69,-26,19},
+{7,45,67,46,13},
+{-63,46,15,-47,4},
+{-41,13,-6,5,-21},
+{37,26,-55,-7,33},
+{-1,-28,10,-17,-64},
+{-14,0,-36,-17,93},
+{-3,-9,-66,44,-21},
+{3,-12,38,-6,-13},
+{-12,19,13,43,-43},
+{-10,-12,6,-5,9},
+{-49,32,-5,2,4},
+{5,15,-16,10,-21},
+{8,-62,-8,64,8},
+{79,-1,-66,-49,-18},
+{5,40,-5,-30,-45},
+{1,-6,21,-32,93},
+{-18,-30,-21,32,21},
+{-18,22,8,5,-41},
+{-54,80,22,-10,-7},
+{-8,-23,-64,66,56},
+{-14,-30,-41,-46,-14},
+{-29,-37,27,-14,42},
+{-2,-9,-29,34,14},
+{33,-14,22,4,10},
+{26,26,28,32,23},
+{-72,-32,3,0,-14},
+{35,-42,-78,-32,6},
+{29,-18,-45,-5,7},
+{-33,-45,-3,-22,-34},
+{8,-8,4,-51,-25},
+{-9,59,-78,21,-5},
+{-25,-48,66,-15,-17},
+{-24,-49,-13,25,-23},
+{-64,-6,40,-24,-19},
+{-11,57,-33,-8,1},
+{10,-52,-54,28,39},
+{49,34,-11,-61,-41},
+{-43,10,15,-15,51},
+{30,15,-51,32,-34},
+{-2,-34,14,18,16},
+{1,1,-3,-3,1},
+{1,-18,6,16,48},
+{12,-5,-42,7,36},
+{48,7,-20,-10,7},
+{12,2,54,39,-38},
+{37,54,4,-11,-8},
+{-46,-10,5,-10,-34},
+{46,-12,29,-37,39},
+{36,-11,24,56,17},
+{14,20,25,0,-25},
+{-28,55,-7,-5,27},
+{3,9,-26,-8,6},
+{-24,-10,-30,-31,-34},
+{18,4,22,21,40},
+{-1,-29,-37,-8,-21},
+{92,-29,11,-3,11},
+{73,23,22,7,4},
+{-44,-9,-11,21,-13},
+{11,9,-78,-1,47},
+{114,-12,-37,-19,-5},
+{-11,-22,19,12,-30},
+{7,38,45,-21,-8},
+{-9,55,-45,56,-21},
+{7,17,46,-57,-87},
+{-6,27,31,31,7},
+{-56,-12,46,21,-5},
+{-12,36,3,3,-21},
+{43,19,12,-7,9},
+{-14,0,-9,-33,-91},
+{7,26,3,-11,64},
+{83,-31,-46,25,2},
+{9,5,2,2,-1},
+{20,-17,10,-5,-27},
+{-8,20,8,-19,16},
+{-21,-13,-31,5,5},
+{42,24,9,34,-20},
+{28,-61,22,11,-39},
+{64,-20,-1,-30,-9},
+{-20,24,-25,-24,-29},
+{22,-60,6,-5,41},
+{-9,-87,14,34,15},
+{-57,52,69,15,-3},
+{-102,58,16,3,6},
+{60,-75,-32,26,7},
+{-57,-27,-32,-24,-21},
+{-29,-16,62,-46,31},
+{30,-27,-15,7,15}};
<p><p>1.6 +90 -88 speex/libspeex/exc_5_64_table.c
Index: exc_5_64_table.c
===================================================================
RCS file: /usr/local/cvsroot/speex/libspeex/exc_5_64_table.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- exc_5_64_table.c 2 Jul 2002 05:14:28 -0000 1.5
+++ exc_5_64_table.c 27 Jan 2003 08:31:45 -0000 1.6
@@ -1,96 +1,98 @@
/* Copyright (C) 2002 Jean-Marc Valin
File: exc_5_64_table.c
Codebook for excitation in narrowband CELP mode (9600 bps)
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ - Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ - Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
-
- 3. The name of the author may not be used to endorse or promote products
- derived from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE.
+
+ - Neither the name of the Xiph.org Foundation nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-float exc_5_64_table[64][5]={
-{0.016425,0.164821,-0.455056,1.521999,-2.059523},
-{-1.497349,-0.115601,1.570538,-1.361093,0.205962},
-{1.151146,0.508757,-0.557767,0.772791,-0.799325},
-{-0.810097,-0.481152,0.603676,0.600439,-0.853233},
-{-1.458905,0.890366,1.770542,0.159820,-0.542156},
-{-1.006928,-1.284240,2.129538,0.655228,-0.073966},
-{1.992338,1.747207,0.256161,-0.506332,-0.391711},
-{-0.819146,-0.294833,-0.512275,0.352284,0.178854},
-{-1.227813,0.796305,-0.607210,0.702680,-0.969435},
-{0.623384,-1.411248,1.722776,-1.336201,0.322234},
-{-0.488714,1.474460,-1.236522,1.238058,-0.629270},
-{-1.586113,0.101721,-0.536277,-0.426806,-0.462127},
-{-0.762491,1.670345,-0.617061,-1.448912,1.442240},
-{0.859321,-2.138098,1.003799,0.094170,-0.552824},
-{-0.151130,0.268730,-0.975037,0.506791,-0.287829},
-{-0.312000,-0.046558,-0.703808,1.484750,2.980198},
-{1.455910,0.793829,-1.284661,-0.997638,-0.079170},
-{0.454090,-0.794912,-1.714429,1.138468,1.286793},
-{-0.831814,0.636744,0.148971,0.407093,0.450897},
-{-0.682911,0.157601,0.049977,-0.730020,0.560741},
-{1.428390,-0.462806,0.516030,-0.573858,-1.071932},
-{-0.150569,-0.236990,0.852551,-1.718521,2.285548},
-{0.509981,0.058892,-0.038486,-0.540349,1.239104},
-{-2.427606,1.016775,0.000204,0.062276,0.604466},
-{0.112731,1.655656,-0.497184,-0.469912,-0.514272},
-{-0.871593,-0.080876,-0.400744,1.546034,0.254059},
-{-0.214401,-0.918700,0.848037,-0.391396,0.985990},
-{0.637319,0.987229,-1.912017,0.510648,0.452777},
-{1.289286,1.361489,1.243136,0.745559,0.629101},
-{0.221755,0.110369,1.497499,-1.866076,-2.412023},
-{0.521552,-0.177768,-1.502221,2.043690,-0.457538},
-{0.990912,-0.941359,-2.224753,-0.306236,-0.084343},
-{-0.189443,0.324083,-0.057534,-0.211584,-0.912040},
-{-1.742935,2.108264,-0.926809,0.221314,-0.141621},
-{2.699771,-0.196509,-0.315119,-0.002794,0.162299},
-{-0.954093,1.883489,1.057448,-1.192817,-0.083695},
-{0.758001,0.311436,-0.067548,0.947225,0.729640},
-{0.761101,-1.269708,0.368809,2.191157,-1.350343},
-{0.482979,-0.516259,0.186630,0.421651,0.499098},
-{-0.419075,0.249524,0.930801,-0.480737,-0.250079},
-{0.144482,0.706673,-1.061049,-3.064299,-0.119050},
-{-0.407456,0.397080,-1.487227,-0.972597,2.180493},
-{0.385484,0.954514,0.783306,0.743739,-0.751818},
-{0.814466,-0.221329,1.031572,-0.488241,0.239573},
-{0.147759,-0.351756,-0.424495,-0.255435,-2.030463},
-{0.395448,0.322306,-0.064008,-0.293987,-0.010031},
-{-0.099471,-2.129689,0.157911,1.092050,0.234232},
-{-0.013781,-0.958944,-0.025326,-0.523649,-0.283380},
-{-0.288134,0.487280,-1.144492,-0.576315,-0.032503},
-{2.154917,-1.504361,-0.884742,0.696558,-0.666552},
-{-0.354968,0.158908,1.516310,1.711743,0.706369},
-{-2.691027,-1.115349,0.495318,0.051273,0.394966},
-{1.958577,-1.603046,0.942450,-0.353549,0.404380},
-{0.756039,-0.561417,-0.174660,0.427855,-0.595641},
-{0.033467,1.269746,0.272333,-0.169324,0.857155},
-{-1.131429,-1.381577,-1.046973,-1.154687,-0.651732},
-{-0.805458,0.982794,-1.225625,0.482374,1.355390},
-{0.147033,-0.253670,0.912658,0.629937,-0.259011},
-{-0.618178,-1.622831,-0.879296,-0.032382,0.421314},
-{0.805434,-1.053450,-0.299412,-0.283747,0.828159},
-{-0.251504,0.246571,0.838313,-2.071605,0.115638},
-{0.385483,-0.677712,1.525247,0.320203,-2.399798},
-{0.992324,-0.561696,0.105794,-1.178257,0.363873},
-{-0.089378,-0.019323,0.071215,0.068134,0.011356}};
+
+signed char exc_5_64_table[64][5]={
+{1,5,-15,49,-66},
+{-48,-4,50,-44,7},
+{37,16,-18,25,-26},
+{-26,-15,19,19,-27},
+{-47,28,57,5,-17},
+{-32,-41,68,21,-2},
+{64,56,8,-16,-13},
+{-26,-9,-16,11,6},
+{-39,25,-19,22,-31},
+{20,-45,55,-43,10},
+{-16,47,-40,40,-20},
+{-51,3,-17,-14,-15},
+{-24,53,-20,-46,46},
+{27,-68,32,3,-18},
+{-5,9,-31,16,-9},
+{-10,-1,-23,48,95},
+{47,25,-41,-32,-3},
+{15,-25,-55,36,41},
+{-27,20,5,13,14},
+{-22,5,2,-23,18},
+{46,-15,17,-18,-34},
+{-5,-8,27,-55,73},
+{16,2,-1,-17,40},
+{-78,33,0,2,19},
+{4,53,-16,-15,-16},
+{-28,-3,-13,49,8},
+{-7,-29,27,-13,32},
+{20,32,-61,16,14},
+{41,44,40,24,20},
+{7,4,48,-60,-77},
+{17,-6,-48,65,-15},
+{32,-30,-71,-10,-3},
+{-6,10,-2,-7,-29},
+{-56,67,-30,7,-5},
+{86,-6,-10,0,5},
+{-31,60,34,-38,-3},
+{24,10,-2,30,23},
+{24,-41,12,70,-43},
+{15,-17,6,13,16},
+{-13,8,30,-15,-8},
+{5,23,-34,-98,-4},
+{-13,13,-48,-31,70},
+{12,31,25,24,-24},
+{26,-7,33,-16,8},
+{5,-11,-14,-8,-65},
+{13,10,-2,-9,0},
+{-3,-68,5,35,7},
+{0,-31,-1,-17,-9},
+{-9,16,-37,-18,-1},
+{69,-48,-28,22,-21},
+{-11,5,49,55,23},
+{-86,-36,16,2,13},
+{63,-51,30,-11,13},
+{24,-18,-6,14,-19},
+{1,41,9,-5,27},
+{-36,-44,-34,-37,-21},
+{-26,31,-39,15,43},
+{5,-8,29,20,-8},
+{-20,-52,-28,-1,13},
+{26,-34,-10,-9,27},
+{-8,8,27,-66,4},
+{12,-22,49,10,-77},
+{32,-18,3,-38,12},
+{-3,-1,2,2,0}};
<p><p>1.4 +154 -152 speex/libspeex/exc_8_128_table.c
Index: exc_8_128_table.c
===================================================================
RCS file: /usr/local/cvsroot/speex/libspeex/exc_8_128_table.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- exc_8_128_table.c 4 Jul 2002 21:55:06 -0000 1.3
+++ exc_8_128_table.c 27 Jan 2003 08:31:45 -0000 1.4
@@ -1,160 +1,162 @@
/* Copyright (C) 2002 Jean-Marc Valin
File: exc_8_128_table.c
Codebook for excitation in narrowband CELP mode (7000 bps)
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ - Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ - Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
-
- 3. The name of the author may not be used to endorse or promote products
- derived from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE.
+
+ - Neither the name of the Xiph.org Foundation nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-float exc_8_128_table[128][8]={
-{-0.440209,0.273340,0.421230,-0.990141,0.074150,-0.308295,0.969924,-0.322739},
-{-0.235455,-0.253452,0.195431,-0.140620,-0.020165,0.301426,-1.992919,0.725283},
-{0.188793,0.627719,0.400359,0.202578,0.257720,-0.692949,0.485636,1.051264},
-{0.227220,1.306012,-1.520155,-0.880260,0.160746,0.820779,0.116605,-0.460476},
-{1.294556,1.059627,1.273352,0.990052,1.028890,0.741280,0.710104,0.439398},
-{0.256527,1.264409,1.068041,0.121164,-0.751280,-1.269965,-0.583346,-0.478961},
-{0.398218,-0.408748,1.028420,-1.679564,0.751526,0.851163,-1.372758,1.023263},
-{0.854349,-0.478950,-0.476286,0.740334,-0.585578,0.433635,-1.110296,0.440467},
-{-0.271959,0.739094,-0.367004,-0.138522,1.159415,-0.156268,0.500726,-1.063731},
-{0.159039,0.298868,1.028724,-0.473248,-1.677714,-0.493226,0.363822,0.792605},
-{0.375573,0.034913,0.051916,0.009582,0.088997,-0.035504,-0.138829,-0.115506},
-{0.339736,0.062797,-1.762375,1.682792,0.842433,-0.625709,0.406050,-0.186889},
-{-1.438385,-1.290728,-1.041264,-0.346883,-0.165196,0.209502,0.376260,0.441535},
-{-0.426541,-0.171196,0.238229,0.614162,0.177188,0.088300,0.111526,-0.264175},
-{-0.161417,-1.299864,0.359354,0.257343,-0.424872,0.770983,-0.069469,0.060547},
-{0.394250,0.339224,-0.700379,1.213389,-0.266192,0.267410,0.152063,-1.402130},
-{-0.295941,0.226261,-0.276194,0.369577,-0.206416,1.067068,-0.546655,-3.187194},
-{0.219706,0.073921,-1.313042,0.574320,1.080375,-0.294733,-1.059267,0.330484},
-{-0.159990,-0.073414,0.096321,0.687182,1.450175,-1.638639,-0.786407,-0.279307},
-{-2.934337,0.244615,0.339640,-0.154801,-0.158632,-0.152274,0.139622,-0.207009},
-{-1.095397,-0.226704,1.698695,0.163333,-1.008102,0.091002,0.762525,-0.292923},
-{-0.682605,0.245594,2.027259,1.154524,-0.018578,-0.377769,-0.711784,-0.180511},
-{-0.278579,-0.874143,1.718059,-1.033529,0.438971,-0.099574,0.070517,0.558049},
-{-1.867396,1.274070,-0.545672,0.254920,-0.486399,0.533699,-0.353638,-0.009116},
-{-0.353189,0.891188,-0.868183,1.141589,0.283966,-1.656511,1.046157,-0.423803},
-{-0.283496,0.223183,-0.767145,-0.210507,-0.358784,0.819084,-1.009996,-0.254649},
-{0.755671,-0.643341,0.682418,-0.606495,0.590546,-0.311620,0.915645,-0.424893},
-{-0.319921,-0.123017,-0.083760,-0.064292,0.107337,-0.028358,-0.121573,-0.134104},
-{-0.164551,-1.638152,0.317039,1.292859,0.180347,-0.926660,-0.123829,0.499106},
-{1.003262,0.679589,-0.849956,-0.690206,0.992721,-0.082465,-0.861998,-0.095914},
-{0.080237,-1.082985,0.185081,0.538217,0.709687,0.661192,0.252347,0.047921},
-{0.121300,-1.394626,-0.529677,0.425812,0.714133,-0.136025,-0.980383,-0.338218},
-{-0.092394,0.445056,0.028946,0.594925,-0.348391,0.071024,1.894898,-0.241275},
-{0.287634,-0.383049,0.230485,-0.325745,0.373622,-0.104272,-0.738611,3.081865},
-{-1.511103,0.714339,1.557136,-1.170162,-0.150314,-0.713046,0.012282,0.251208},
-{-0.443695,1.099559,-1.986766,-0.165563,1.448793,-0.778839,0.394945,-0.019634},
-{-1.523514,-0.593368,-0.469155,0.282296,1.055567,1.556622,0.796390,0.336205},
-{-0.190992,-0.281203,-0.500049,-0.624679,-1.007471,-1.042527,-0.986752,-0.859269},
-{0.323181,-0.255750,0.373644,-0.461807,1.734581,-0.444288,-1.003287,1.022413},
-{0.080186,-0.279721,0.042911,2.022584,-0.284462,-0.292439,-0.318977,-0.070931},
-{-0.188365,-0.724960,0.276727,0.532690,0.081499,-0.883494,0.408873,-1.006974},
-{0.128601,-0.074915,-0.324714,0.123902,-0.510054,2.367983,0.368344,-1.611875},
-{0.191694,0.392124,1.031468,-0.202233,0.121179,-0.453118,-0.282950,-0.092529},
-{0.041827,-0.466621,-0.503252,0.881785,0.040554,-0.474003,0.354016,0.487959},
-{0.280886,0.117801,-0.663431,-1.141207,-1.235840,-0.183842,0.688299,0.388519},
-{-0.480326,-0.719308,-0.443280,-0.527689,-0.514195,-0.289393,-0.314046,-0.286314},
-{0.411492,-1.229925,1.283923,0.154810,-0.287955,0.506158,-1.184867,0.787455},
-{1.442594,-1.469420,0.138826,1.525207,-0.443765,0.528002,-0.051972,0.187096},
-{0.559345,0.144991,-0.191311,-1.036226,-0.672212,1.376640,1.560263,-0.060138},
-{0.019067,0.102090,-0.201497,0.225588,0.213387,-0.096054,-0.666167,1.201710},
-{-0.561747,1.072979,-0.422811,-1.271971,1.864467,-0.420550,0.183658,0.506526},
-{-0.739877,1.079620,0.590943,-0.391175,-1.133933,0.765233,0.086294,-0.518646},
-{-0.449999,-0.306959,1.140423,1.360476,-1.382375,-0.906873,-0.105282,0.084515},
-{-1.675896,-0.243645,0.386548,1.709129,0.809993,0.110196,-0.051119,-0.170413},
-{0.065074,-0.353532,0.676078,-0.708692,0.054357,0.675992,0.032780,-0.792573},
-{-1.229861,2.073976,-1.517144,0.657863,-0.253218,-0.067470,0.297113,-0.436357},
-{-1.873596,0.777386,0.197769,0.325535,0.840564,-0.781543,0.503762,0.159766},
-{-0.061355,-0.265723,0.808740,-0.397230,-0.616473,1.811502,-0.061759,0.216438},
-{1.625873,-0.292887,0.049337,0.148593,-0.131627,-0.480527,0.726850,-0.028990},
-{-1.172563,0.721130,0.259350,0.835541,-0.186959,0.015334,-0.856750,-0.219698},
-{1.232879,-0.305305,-0.424029,0.807826,0.337241,-1.393602,-0.374476,0.270435},
-{-0.151490,1.075476,0.121597,-1.097677,0.311867,1.345010,-0.698561,-0.351011},
-{1.759724,-0.229752,0.619029,0.017884,0.300752,0.019313,-0.798874,0.280083},
-{2.937132,0.342866,-0.835334,-0.439876,-0.392298,0.041026,-0.331267,0.009450},
-{0.442088,-0.146082,-0.174985,-0.298302,-0.118945,-0.467346,-0.255841,-1.287472},
-{0.654450,-0.153560,0.019993,-0.880298,-0.239648,0.672133,-0.289205,1.040185},
-{-0.703672,-0.121847,-0.111805,-0.383489,1.220179,0.112177,-0.229566,0.109266},
-{-1.862451,2.514407,0.260791,-0.522501,0.073240,-0.181374,0.386551,-0.150779},
-{0.016185,0.294431,0.475553,0.836909,0.980010,0.945125,0.858492,0.709558},
-{1.902229,1.457782,0.823922,0.299812,-0.154828,-0.238938,-0.380643,-0.412521},
-{0.171274,-0.565066,0.765978,-0.461373,-0.123549,-0.456335,-0.338333,0.386170},
-{-0.051563,-0.071956,-0.491000,-0.052942,-0.198472,0.761760,0.383132,0.337150},
-{-0.127354,0.270082,0.024048,-0.275121,0.422672,-1.400979,1.790439,0.382037},
-{0.621375,-1.099103,0.822322,0.352199,-2.010984,0.989301,-0.306311,-0.309952},
-{1.322374,-0.119047,-0.271280,-0.499733,1.009109,0.753622,0.216731,0.301295},
-{1.623099,-0.330463,-1.766000,0.904907,-0.013925,0.241108,-0.015060,-0.175721},
-{0.530370,-0.529288,-1.755495,-1.235977,0.224799,0.624983,0.559275,0.377396},
-{-0.181589,0.494639,0.154267,0.214312,-0.031595,0.276187,0.038616,0.313490},
-{0.920079,0.371745,0.487981,0.402303,-0.069467,0.720754,0.219846,0.277182},
-{-0.084784,-0.113356,-0.154791,0.557954,-2.002928,0.395946,1.726892,-0.772417},
-{0.293573,-0.266253,0.738516,0.437423,-0.793654,0.468088,-0.343375,-1.265403},
-{-0.931848,1.148578,0.039719,-0.600906,0.686995,-0.152936,-0.979656,0.416990},
-{-0.050559,-0.002657,0.229092,-0.139243,0.499061,-2.086393,0.387943,2.067403},
-{-1.126354,0.743655,-0.237537,0.552552,-0.470507,-0.719084,0.591212,0.012943},
-{-1.418979,-0.216739,0.122342,0.107189,-0.406021,0.402405,1.085848,0.164782},
-{0.410941,1.043281,0.311945,0.855907,0.716419,-0.012933,-0.207447,-0.332864},
-{1.336812,-2.326974,1.124153,-0.381328,0.048855,0.168738,-0.239824,0.186709},
-{-1.035653,0.344654,-0.512547,-0.452773,-0.169779,-0.206465,-0.092401,0.544609},
-{-1.077425,0.845860,-0.486464,0.337380,-0.274547,0.458245,1.018421,-0.971318},
-{0.263372,-0.510953,0.212300,-0.188152,-0.231098,1.954780,-1.723402,-0.527146},
-{0.351306,-0.033159,0.624417,-1.448357,1.059710,-0.934597,0.178139,0.296405},
-{0.591618,0.871439,-0.279616,0.144441,-0.764144,-0.259282,-0.731355,-0.077064},
-{0.965413,-0.584741,-0.488026,-0.156873,-0.480630,-0.564575,0.005245,0.826691},
-{0.560797,1.156819,-0.153801,-0.456126,-0.078016,0.531793,0.157628,-0.843989},
-{0.660894,-1.036284,1.376876,0.367981,-0.842214,-0.296518,0.543452,0.342226},
-{0.778515,-0.646737,-0.957448,-0.216737,0.413988,1.046702,-0.252638,-0.780174},
-{-0.220971,0.217115,-0.311465,0.118130,-0.172400,-0.291017,1.503577,-2.566345},
-{-0.712834,-0.262880,0.174684,0.355930,-0.717927,0.081974,-0.088953,1.529076},
-{-0.916730,0.794294,0.953196,0.110870,0.444874,0.513023,0.278578,-0.117735},
-{-0.547797,0.323758,-0.823990,0.106568,0.149142,-1.388158,-0.273639,0.291594},
-{-1.480040,-1.728378,0.464549,0.289121,0.877505,0.032864,0.109703,-0.092692},
-{1.438900,0.178008,-0.176589,-1.179663,-0.904852,-0.955948,-0.476471,-0.191671},
-{0.091998,0.001461,0.424492,-0.178571,0.264783,-1.679740,-1.553977,1.030046},
-{-0.166675,0.018539,-0.449393,1.025711,-1.484387,0.826303,-0.133666,-0.146481},
-{-0.098289,-0.149512,-0.094035,-0.167089,-0.890057,-0.697410,2.391871,1.711848},
-{-0.017988,0.048029,0.300480,0.299395,-0.271250,-0.436519,-2.077457,-1.524005},
-{0.333550,-1.137314,-0.190293,-0.638368,0.316045,-0.299497,0.513517,0.385333},
-{0.134796,-0.015804,-0.497530,1.419523,-1.362281,-1.570649,0.953225,-0.056237},
-{0.773205,1.297137,0.719808,-1.014000,-0.672344,0.015251,0.341651,0.620154},
-{-1.254313,-1.086749,-1.254136,-1.123546,-1.010699,-0.803937,-0.656507,-0.415595},
-{1.610993,-0.683383,0.189755,-0.753595,-0.633289,0.528172,-0.170391,-0.260497},
-{1.110684,-0.779924,-0.344293,0.670829,-0.798364,0.192399,1.048478,-0.256969},
-{0.232167,0.617939,-0.105135,0.167796,-0.789294,-0.234391,0.556381,-0.165805},
-{-0.274167,-0.139400,0.029948,-0.275967,0.632076,0.638655,1.222328,1.509617},
-{-0.763954,0.269550,0.149069,-2.044361,0.683150,0.916312,0.110956,0.088938},
-{-1.356811,-0.356445,0.985340,-0.202151,0.270436,0.603571,-0.842233,-0.314097},
-{-1.460358,-0.429828,0.747921,0.324944,-0.214346,-1.134490,-0.208501,-0.025324},
-{-0.123526,-0.147036,-0.143506,0.491161,1.659339,0.781735,-0.810421,-0.913695},
-{-0.125853,-0.367272,1.419399,-1.798167,-1.065505,1.039910,-0.156728,0.058469},
-{-0.023124,0.838108,-1.499405,0.970537,-0.474697,0.680283,-0.144994,0.134319},
-{0.226337,0.228643,-0.775011,-0.100227,0.335835,-0.702807,0.510145,-0.362861},
-{0.261554,-0.088342,0.224174,-0.351359,1.402729,0.444095,-2.286083,-0.587054},
-{1.764535,-1.439976,0.739064,-0.638654,0.873024,-0.368594,-0.074047,-0.043682},
-{-1.114137,-0.091824,-1.035757,0.581750,-0.177257,0.219909,0.075805,-0.460661},
-{0.166840,-0.983327,-1.396506,0.249538,1.086687,0.399029,0.613073,0.013111},
-{-0.296097,1.496153,-0.397550,-1.352330,-0.103921,-0.408197,0.049093,-0.154039},
-{2.243456,-2.114991,-0.843886,0.073110,0.019537,-0.058194,-0.213027,0.149033},
-{1.128901,1.027933,-1.249758,-0.373057,-0.130179,-0.144671,0.718174,0.578604}};
+
+signed char exc_8_128_table[128][8] = {
+{-14,9,13,-32,2,-10,31,-10},
+{-8,-8,6,-4,-1,10,-64,23},
+{6,20,13,6,8,-22,16,34},
+{7,42,-49,-28,5,26,4,-15},
+{41,34,41,32,33,24,23,14},
+{8,40,34,4,-24,-41,-19,-15},
+{13,-13,33,-54,24,27,-44,33},
+{27,-15,-15,24,-19,14,-36,14},
+{-9,24,-12,-4,37,-5,16,-34},
+{5,10,33,-15,-54,-16,12,25},
+{12,1,2,0,3,-1,-4,-4},
+{11,2,-56,54,27,-20,13,-6},
+{-46,-41,-33,-11,-5,7,12,14},
+{-14,-5,8,20,6,3,4,-8},
+{-5,-42,11,8,-14,25,-2,2},
+{13,11,-22,39,-9,9,5,-45},
+{-9,7,-9,12,-7,34,-17,-102},
+{7,2,-42,18,35,-9,-34,11},
+{-5,-2,3,22,46,-52,-25,-9},
+{-94,8,11,-5,-5,-5,4,-7},
+{-35,-7,54,5,-32,3,24,-9},
+{-22,8,65,37,-1,-12,-23,-6},
+{-9,-28,55,-33,14,-3,2,18},
+{-60,41,-17,8,-16,17,-11,0},
+{-11,29,-28,37,9,-53,33,-14},
+{-9,7,-25,-7,-11,26,-32,-8},
+{24,-21,22,-19,19,-10,29,-14},
+{-10,-4,-3,-2,3,-1,-4,-4},
+{-5,-52,10,41,6,-30,-4,16},
+{32,22,-27,-22,32,-3,-28,-3},
+{3,-35,6,17,23,21,8,2},
+{4,-45,-17,14,23,-4,-31,-11},
+{-3,14,1,19,-11,2,61,-8},
+{9,-12,7,-10,12,-3,-24,99},
+{-48,23,50,-37,-5,-23,0,8},
+{-14,35,-64,-5,46,-25,13,-1},
+{-49,-19,-15,9,34,50,25,11},
+{-6,-9,-16,-20,-32,-33,-32,-27},
+{10,-8,12,-15,56,-14,-32,33},
+{3,-9,1,65,-9,-9,-10,-2},
+{-6,-23,9,17,3,-28,13,-32},
+{4,-2,-10,4,-16,76,12,-52},
+{6,13,33,-6,4,-14,-9,-3},
+{1,-15,-16,28,1,-15,11,16},
+{9,4,-21,-37,-40,-6,22,12},
+{-15,-23,-14,-17,-16,-9,-10,-9},
+{13,-39,41,5,-9,16,-38,25},
+{46,-47,4,49,-14,17,-2,6},
+{18,5,-6,-33,-22,44,50,-2},
+{1,3,-6,7,7,-3,-21,38},
+{-18,34,-14,-41,60,-13,6,16},
+{-24,35,19,-13,-36,24,3,-17},
+{-14,-10,36,44,-44,-29,-3,3},
+{-54,-8,12,55,26,4,-2,-5},
+{2,-11,22,-23,2,22,1,-25},
+{-39,66,-49,21,-8,-2,10,-14},
+{-60,25,6,10,27,-25,16,5},
+{-2,-9,26,-13,-20,58,-2,7},
+{52,-9,2,5,-4,-15,23,-1},
+{-38,23,8,27,-6,0,-27,-7},
+{39,-10,-14,26,11,-45,-12,9},
+{-5,34,4,-35,10,43,-22,-11},
+{56,-7,20,1,10,1,-26,9},
+{94,11,-27,-14,-13,1,-11,0},
+{14,-5,-6,-10,-4,-15,-8,-41},
+{21,-5,1,-28,-8,22,-9,33},
+{-23,-4,-4,-12,39,4,-7,3},
+{-60,80,8,-17,2,-6,12,-5},
+{1,9,15,27,31,30,27,23},
+{61,47,26,10,-5,-8,-12,-13},
+{5,-18,25,-15,-4,-15,-11,12},
+{-2,-2,-16,-2,-6,24,12,11},
+{-4,9,1,-9,14,-45,57,12},
+{20,-35,26,11,-64,32,-10,-10},
+{42,-4,-9,-16,32,24,7,10},
+{52,-11,-57,29,0,8,0,-6},
+{17,-17,-56,-40,7,20,18,12},
+{-6,16,5,7,-1,9,1,10},
+{29,12,16,13,-2,23,7,9},
+{-3,-4,-5,18,-64,13,55,-25},
+{9,-9,24,14,-25,15,-11,-40},
+{-30,37,1,-19,22,-5,-31,13},
+{-2,0,7,-4,16,-67,12,66},
+{-36,24,-8,18,-15,-23,19,0},
+{-45,-7,4,3,-13,13,35,5},
+{13,33,10,27,23,0,-7,-11},
+{43,-74,36,-12,2,5,-8,6},
+{-33,11,-16,-14,-5,-7,-3,17},
+{-34,27,-16,11,-9,15,33,-31},
+{8,-16,7,-6,-7,63,-55,-17},
+{11,-1,20,-46,34,-30,6,9},
+{19,28,-9,5,-24,-8,-23,-2},
+{31,-19,-16,-5,-15,-18,0,26},
+{18,37,-5,-15,-2,17,5,-27},
+{21,-33,44,12,-27,-9,17,11},
+{25,-21,-31,-7,13,33,-8,-25},
+{-7,7,-10,4,-6,-9,48,-82},
+{-23,-8,6,11,-23,3,-3,49},
+{-29,25,31,4,14,16,9,-4},
+{-18,10,-26,3,5,-44,-9,9},
+{-47,-55,15,9,28,1,4,-3},
+{46,6,-6,-38,-29,-31,-15,-6},
+{3,0,14,-6,8,-54,-50,33},
+{-5,1,-14,33,-48,26,-4,-5},
+{-3,-5,-3,-5,-28,-22,77,55},
+{-1,2,10,10,-9,-14,-66,-49},
+{11,-36,-6,-20,10,-10,16,12},
+{4,-1,-16,45,-44,-50,31,-2},
+{25,42,23,-32,-22,0,11,20},
+{-40,-35,-40,-36,-32,-26,-21,-13},
+{52,-22,6,-24,-20,17,-5,-8},
+{36,-25,-11,21,-26,6,34,-8},
+{7,20,-3,5,-25,-8,18,-5},
+{-9,-4,1,-9,20,20,39,48},
+{-24,9,5,-65,22,29,4,3},
+{-43,-11,32,-6,9,19,-27,-10},
+{-47,-14,24,10,-7,-36,-7,-1},
+{-4,-5,-5,16,53,25,-26,-29},
+{-4,-12,45,-58,-34,33,-5,2},
+{-1,27,-48,31,-15,22,-5,4},
+{7,7,-25,-3,11,-22,16,-12},
+{8,-3,7,-11,45,14,-73,-19},
+{56,-46,24,-20,28,-12,-2,-1},
+{-36,-3,-33,19,-6,7,2,-15},
+{5,-31,-45,8,35,13,20,0},
+{-9,48,-13,-43,-3,-13,2,-5},
+{72,-68,-27,2,1,-2,-7,5},
+{36,33,-40,-12,-4,-5,23,19}};
<p><p>1.3 +57 -56 speex/libspeex/hexc_10_32_table.c
Index: hexc_10_32_table.c
===================================================================
RCS file: /usr/local/cvsroot/speex/libspeex/hexc_10_32_table.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hexc_10_32_table.c 2 Jul 2002 05:14:28 -0000 1.2
+++ hexc_10_32_table.c 27 Jan 2003 08:31:45 -0000 1.3
@@ -1,64 +1,65 @@
/* Copyright (C) 2002 Jean-Marc Valin
File: hexc_10_32_table.c
Codebook for high-band excitation in SB-CELP mode (4000 bps)
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ - Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ - Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
-
- 3. The name of the author may not be used to endorse or promote products
- derived from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE.
+
+ - Neither the name of the Xiph.org Foundation nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-float hexc_10_32_table[32][10]={
-{0.051364,0.004356,-0.004322,0.001384,0.120476,0.357375,0.785727,-1.508356,-0.450928,0.454636},
-{-1.752247,-0.954283,-1.560063,-0.008506,-0.295434,0.296760,0.194227,0.395801,0.055508,-0.033656},
-{0.466473,-0.431319,0.437330,-0.087312,0.203919,-0.331154,0.227619,-0.236355,0.348642,-0.331026},
-{-0.016064,0.007879,0.021213,-0.014318,0.047478,0.060166,-0.393304,0.464035,-1.708652,1.684782},
-{-0.392888,-0.953182,1.487882,-0.952867,0.481303,-0.044535,-0.261095,0.297167,-0.412005,0.240419},
-{-0.034502,0.100662,-0.091294,-0.031752,-0.161733,-0.289738,-1.207797,1.074361,0.341492,0.380422},
-{0.201441,-0.122678,-0.118435,0.500207,-0.880341,0.761293,-0.246244,-0.101848,1.033872,-0.898595},
-{-0.047698,0.753306,0.070868,1.300748,-1.324289,0.020769,-0.215234,-0.067174,-0.036744,0.126553},
-{0.012139,-0.024232,-0.041471,0.353640,0.627918,-0.472855,-0.992323,-1.010560,0.863156,0.698430},
-{1.370679,0.196801,0.227321,-1.294604,-1.041896,-0.074951,0.292348,0.616852,0.440378,0.118910},
-{-0.072268,0.006660,-0.028443,-0.034885,0.035330,-0.057347,0.528408,-0.830019,1.659012,-1.520934},
-{-0.134400,0.005341,-0.030818,-0.061556,-0.111165,0.270597,0.603371,1.258344,-1.241643,-0.634452},
-{1.539236,-0.381021,1.289311,0.481035,-0.620896,0.840511,-0.936456,0.528998,-0.513098,0.197301},
-{1.968439,0.886318,-0.273808,0.671632,-0.057046,0.080523,-0.216307,-0.062329,-0.081718,0.048866},
-{-1.260717,-1.440788,-0.320781,-0.114824,0.798784,0.810185,0.304607,-0.079885,-0.241416,-0.629623},
-{-0.486179,1.416242,-0.832432,-0.004218,0.185920,-0.622372,0.489864,-0.521085,0.379386,-0.113544},
-{-0.443210,0.419914,1.069873,1.428810,0.565141,0.136896,-0.249190,-0.580576,-0.651433,-0.293431},
-{-0.253229,-0.453966,-0.400100,-0.984486,0.679340,-0.300030,1.538374,-0.257918,0.142489,-0.573646},
-{0.538639,-0.580006,1.217292,-1.433887,1.418098,-1.034428,0.748440,-0.569872,0.300507,0.034179},
-{0.024804,0.086340,-0.211142,0.290998,-0.798505,0.979495,-1.595515,1.922215,-0.951234,0.541487},
-{0.559070,-1.699680,-0.404422,-0.270891,-0.065401,0.222026,0.029040,0.451988,-0.144311,0.224000},
-{-0.241696,0.083297,0.004277,-0.703106,1.345270,-1.317389,0.252710,0.202348,-0.414938,0.487314},
-{-0.009329,0.010869,-0.001348,-0.008489,-0.010858,0.039764,-0.031642,0.028523,-0.059353,0.062010},
-{-0.487052,0.672704,-1.889003,1.325382,-1.187024,0.999405,-0.501302,0.340239,0.025195,-0.231435},
-{0.957949,1.366740,1.375151,0.051362,0.508726,-0.024864,-0.382025,-0.378570,-0.286660,-0.017188},
-{-0.359989,-0.316801,-1.213553,-0.536663,-0.472621,-0.101476,0.482269,0.325869,0.611524,-0.102750},
-{-0.180824,0.001945,0.050018,0.099263,0.336777,-1.703052,1.615420,-1.369483,1.016551,-0.236258},
-{-0.175850,0.001881,-0.299965,0.220411,-0.370262,1.936677,-1.135033,0.043155,-0.389060,-0.207132},
-{2.409395,-0.727781,1.590088,-0.627343,0.587975,-0.178415,-0.247722,0.247041,-0.439136,0.492128},
-{1.113168,1.025882,0.750539,0.196165,-0.798223,-1.368542,-0.203361,0.011581,0.294730,0.813502},
-{-2.171338,-0.064544,-0.075549,-0.554025,0.159198,-0.173585,0.265976,-0.015812,0.122712,-0.061426},
-{-2.047335,0.958457,-1.489224,0.855781,-0.334934,0.081884,0.340905,-0.509467,0.487732,-0.570032}};
+signed char hexc_10_32_table[32][10] = {
+{2,0,0,0,4,11,25,-48,-14,15},
+{-56,-31,-50,0,-9,9,6,13,2,-1},
+{15,-14,14,-3,7,-11,7,-8,11,-11},
+{-1,0,1,0,2,2,-13,15,-55,54},
+{-13,-31,48,-30,15,-1,-8,10,-13,8},
+{-1,3,-3,-1,-5,-9,-39,34,11,12},
+{6,-4,-4,16,-28,24,-8,-3,33,-29},
+{-2,24,2,42,-42,1,-7,-2,-1,4},
+{0,-1,-1,11,20,-15,-32,-32,28,22},
+{44,6,7,-41,-33,-2,9,20,14,4},
+{-2,0,-1,-1,1,-2,17,-27,53,-49},
+{-4,0,-1,-2,-4,9,19,40,-40,-20},
+{49,-12,41,15,-20,27,-30,17,-16,6},
+{63,28,-9,21,-2,3,-7,-2,-3,2},
+{-40,-46,-10,-4,26,26,10,-3,-8,-20},
+{-16,45,-27,0,6,-20,16,-17,12,-4},
+{-14,13,34,46,18,4,-8,-19,-21,-9},
+{-8,-15,-13,-32,22,-10,49,-8,5,-18},
+{17,-19,39,-46,45,-33,24,-18,10,1},
+{1,3,-7,9,-26,31,-51,62,-30,17},
+{18,-54,-13,-9,-2,7,1,14,-5,7},
+{-8,3,0,-22,43,-42,8,6,-13,16},
+{0,0,0,0,0,1,-1,1,-2,2},
+{-16,22,-60,42,-38,32,-16,11,1,-7},
+{31,44,44,2,16,-1,-12,-12,-9,-1},
+{-12,-10,-39,-17,-15,-3,15,10,20,-3},
+{-6,0,2,3,11,-54,52,-44,33,-8},
+{-6,0,-10,7,-12,62,-36,1,-12,-7},
+{77,-23,51,-20,19,-6,-8,8,-14,16},
+{36,33,24,6,-26,-44,-7,0,9,26},
+{-69,-2,-2,-18,5,-6,9,-1,4,-2},
+{-66,31,-48,27,-11,3,11,-16,16,-18}};
<p><p>1.9 +155 -153 speex/libspeex/hexc_table.c
Index: hexc_table.c
===================================================================
RCS file: /usr/local/cvsroot/speex/libspeex/hexc_table.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- hexc_table.c 2 Jul 2002 05:14:28 -0000 1.8
+++ hexc_table.c 27 Jan 2003 08:31:45 -0000 1.9
@@ -1,160 +1,162 @@
/* Copyright (C) 2002 Jean-Marc Valin
- File: hexc_8_128_table.c
+ File: hexc_table.c
Codebook for high-band excitation in SB-CELP mode (8000 bps with sign)
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ - Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ - Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
-
- 3. The name of the author may not be used to endorse or promote products
- derived from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE.
+
+ - Neither the name of the Xiph.org Foundation nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-float hexc_table[128][8]={
-{-0.832280,0.602346,-0.560115,0.167680,-0.314430,-0.214323,0.482515,-0.353925},
-{0.223509,-0.620498,0.624377,-0.595327,0.053103,-0.994383,0.742378,0.465689},
-{0.123678,-0.308868,-1.493745,0.588987,0.705033,-0.737404,-0.826796,1.359984},
-{1.394344,0.774886,-0.879959,0.706302,-0.467630,0.468063,-0.984297,0.845379},
-{-0.368248,-0.858701,-0.876197,0.336581,0.593624,0.055559,-0.143175,-0.220802},
-{2.155218,-1.027000,-0.454930,1.590675,-1.021255,0.635631,-0.170857,0.134992},
-{0.690515,-0.393873,-0.586696,-0.519591,1.558230,1.070732,-1.411309,0.205749},
-{0.454174,-0.301409,0.830701,-1.119527,0.124592,1.518211,-2.118384,1.229133},
-{-0.604917,-0.691883,-0.587432,1.000739,-0.635092,0.421306,-0.815323,1.041446},
-{1.725259,-0.732087,0.034233,-0.069087,-0.434880,0.721474,0.272473,-0.494338},
-{-0.214157,-0.200435,-0.762648,0.967241,0.113683,-0.880408,0.387549,0.274355},
-{0.899149,1.403463,0.692711,1.160717,0.117461,-0.038202,0.155570,-0.676557},
-{-0.271212,0.199861,-1.899348,-0.330220,1.481044,-0.813378,1.511461,-0.752603},
-{-0.170258,0.038102,-0.000386,0.231904,-0.190576,-0.304610,-0.063720,0.316574},
-{0.073603,-0.226561,0.470825,-0.088988,-0.644688,0.339521,0.051494,0.002446},
-{-0.102045,0.392581,0.155490,2.974790,-1.996640,-0.359992,-0.509910,-0.039892},
-{-1.599489,0.239436,0.623951,-0.797969,0.562948,-1.101736,1.078782,-0.562288},
-{0.338906,-0.985567,1.493714,-1.683343,0.668433,-0.104435,1.204108,-0.876913},
-{-0.148561,0.054664,-1.091334,0.331119,-0.801290,-0.579339,1.612688,-0.127755},
-{0.489030,-0.014172,1.164302,-0.755285,-0.645843,-1.072932,-0.131331,1.469590},
-{-0.241129,0.438264,0.206105,-0.039306,0.206308,0.637525,-0.674223,-0.340431},
-{4.096793,0.191578,0.353805,0.833658,-0.175351,0.496152,-0.034709,0.134797},
-{-0.023852,0.230532,-0.191825,0.190761,-0.683548,0.629999,-2.761560,2.880906},
-{0.042227,0.397761,-0.147964,0.874548,-0.406355,0.902272,-2.334215,0.529654},
-{0.100123,-0.193177,-0.366872,-0.748251,-0.566081,-0.910172,0.935383,2.597818},
-{0.369373,-1.160451,0.315336,-0.629979,2.072574,-0.960778,0.924840,-1.040264},
-{0.998154,1.928411,-1.190751,-0.825741,-0.719263,0.364534,0.356495,0.341056},
-{0.231155,0.951067,0.136711,0.015627,-0.971382,0.722064,0.086276,-0.258284},
-{-0.387367,-0.038091,-0.412356,-0.171179,0.469019,0.179470,0.536647,-0.640090},
-{-1.559246,-0.049700,-0.298943,-0.557185,0.685624,-0.246528,-0.034443,-0.174674},
-{0.203791,0.196831,-0.288128,0.207277,-0.540519,1.438115,-0.876295,-0.055813},
-{-0.556169,-0.758462,1.302039,-0.718046,0.984675,-0.165604,-0.476743,-0.081323},
-{-0.981381,0.601008,-0.919132,0.874686,-0.770209,0.251448,0.642656,-0.675310},
-{0.015478,-0.098347,0.410328,-1.299897,2.276125,-2.379774,1.867343,-0.862582},
-{-0.180873,0.165740,-0.441134,0.239003,-0.854430,0.447657,-1.395852,4.785034},
-{0.656946,0.279702,0.121700,0.732308,-2.086384,-1.377342,2.019109,-0.035635},
-{-0.146154,-0.217754,0.149005,-0.630533,2.745872,-0.581260,-0.969982,-0.301015},
-{0.425965,-2.894024,-0.072881,0.354270,-0.349737,-0.274695,0.328390,0.302141},
-{-0.416644,0.038268,-0.413069,0.399314,-0.925991,2.845834,-2.005719,0.451704},
-{-0.261579,-0.216498,0.699231,-0.439508,0.140732,0.070305,-0.079718,0.027726},
-{0.059041,-2.230085,1.974291,0.562896,-0.714065,0.731473,-0.518938,0.092363},
-{2.203601,0.481734,0.065948,-1.136962,-0.439324,-0.086786,0.719763,0.169942},
-{-0.176329,-0.462994,-2.333004,1.039957,1.125143,0.200339,-0.102680,-0.189562},
-{0.016981,0.034504,-0.016484,0.120725,-0.086147,0.116413,-0.039664,-0.021697},
-{0.342947,-1.719988,-1.350704,-0.330378,0.805778,0.474144,0.906205,-0.675453},
-{0.042829,0.138848,0.471025,-0.789681,0.808724,-0.376155,0.095035,-0.095014},
-{0.386595,-1.371873,2.338925,-0.787709,0.140351,-0.541997,0.234354,0.116136},
-{-3.004894,0.209202,-0.245636,1.114270,-1.049203,0.204091,-0.357611,0.188928},
-{-1.147810,-0.046399,0.743520,-0.191627,-0.181239,0.395339,0.359034,-0.832205},
-{1.256774,0.097483,1.075037,-0.767940,0.854298,-1.041373,0.544401,-0.296204},
-{0.828614,0.248557,-0.199247,0.452193,-1.706949,0.273385,-0.013889,1.004178},
-{1.602618,2.096315,0.232427,0.337458,0.171404,-0.466847,-0.127899,-0.157426},
-{0.675444,-0.574150,0.981215,0.243498,0.104767,-0.568385,1.029990,-1.141564},
-{2.497265,-0.488979,-1.179411,0.757833,0.823635,-0.042440,-0.596424,0.241332},
-{-2.171172,1.463427,-1.353310,0.606630,-1.204981,1.030154,-0.933891,0.523175},
-{0.301360,0.324486,0.559120,0.420470,0.218546,-0.264922,-1.166298,-0.374077},
-{-0.630407,-0.647944,-0.107679,-0.119954,-0.014076,-0.074598,0.189276,0.030661},
-{-0.783204,0.694240,-0.511951,-1.505997,0.515796,-0.587731,-0.344406,1.617094},
-{1.045699,1.345509,-0.267897,-0.106000,1.287672,-0.516164,-0.719459,0.211953},
-{-0.999976,0.984652,0.081610,-1.196359,0.754654,0.400453,-1.066100,0.437713},
-{-1.084924,-0.573553,-0.380590,0.194507,-0.166434,1.168553,0.984201,-1.293893},
-{0.787696,0.092015,0.109413,-0.235304,0.073398,-0.086010,-0.225405,0.115092},
-{0.257367,-0.218819,1.435003,0.745216,-1.503138,0.089044,0.946732,-1.017036},
-{0.200816,0.012988,0.144469,0.442492,-0.024241,-0.607072,-1.705528,1.750982},
-{-0.830128,1.048074,-0.373913,-0.176251,0.041243,0.237614,-0.251550,0.206515},
-{0.443499,-0.149056,0.153578,-0.284995,-0.306524,-2.281193,3.129705,-0.118274},
-{-0.129108,0.054034,-0.353900,-0.208948,-0.182241,0.144986,-0.041409,0.601953},
-{1.416017,0.532981,-0.981492,0.728147,-0.332914,0.250446,0.751655,-0.909366},
-{-1.950695,-1.540158,-0.242649,0.541209,0.801851,0.455435,-0.148904,-0.545304},
-{2.347112,-1.658450,1.774442,-0.504975,-0.023925,0.428164,-0.364922,0.341901},
-{-0.166228,-0.061801,-0.171083,0.201799,-0.657055,2.480911,0.174099,-1.916991},
-{-0.547850,-1.268582,1.168489,-0.843246,-0.655711,0.682729,-0.733602,0.941106},
-{-0.369495,-1.197877,-0.033952,1.809013,-1.129699,-0.030686,0.439634,-0.208864},
-{0.456134,-0.209331,-0.496804,-0.151786,-0.182905,0.082390,0.276059,0.024224},
-{1.869258,0.252611,-0.688416,1.099229,-0.022152,-0.960212,0.560657,0.069736},
-{3.274954,1.506363,1.778409,1.021140,1.046098,0.511055,-0.190809,0.311272},
-{-1.164931,-1.152651,-1.497099,-0.121768,-0.081895,0.706283,0.099963,0.306703},
-{-0.054276,-0.094741,0.020378,0.798964,-0.383634,-0.073826,0.119401,-0.491029},
-{-0.733339,1.273912,0.869925,0.130914,-0.556640,-0.840988,0.619486,-0.271043},
-{0.014981,-1.134990,0.073203,0.868539,-0.022179,-0.600950,-0.243091,0.497803},
-{-3.660710,1.232092,-0.885276,-0.369324,0.061247,-0.260303,-0.371883,0.198639},
-{1.153146,-0.897095,1.736239,-1.902701,1.629850,-1.530732,1.588206,-0.801185},
-{-0.845448,0.244247,0.314377,-1.059838,-0.290153,-0.161003,0.548616,0.172438},
-{-0.408399,2.130193,-0.997421,0.473956,-0.476695,-0.983620,0.371059,0.201112},
-{0.190533,0.291515,0.328523,0.091677,0.306143,-0.328350,0.400929,-1.851406},
-{1.323022,0.342972,-1.070776,-0.893991,0.961938,-0.089411,0.038467,0.078289},
-{0.067018,0.028972,-0.099610,0.149615,-0.284795,0.485201,-0.671551,0.480180},
-{0.187650,-0.172929,0.448778,-0.255444,1.534490,-0.658232,-2.404972,1.484805},
-{0.284101,-1.202617,-0.747633,-1.301354,-0.732936,0.587194,0.658519,1.014653},
-{0.842230,-0.378030,0.521340,-1.178764,0.354198,0.196210,0.415769,-0.213960},
-{0.367643,0.778878,-0.560292,-0.525382,0.364347,-0.899824,0.953784,0.032542},
-{0.842926,1.331821,-0.521174,-1.610593,0.293996,1.525177,-0.355238,-0.325794},
-{0.137842,0.008957,0.006281,0.016926,-0.168158,-0.328214,2.456947,-1.818164},
-{-0.616171,0.374509,0.301159,-0.099137,0.326755,-1.394168,-0.314204,1.044775},
-{0.119023,-1.123636,-0.217497,0.515819,-0.613546,0.638016,0.014644,-0.074251},
-{-0.236468,0.240783,1.722621,1.105436,0.290573,-1.047014,-0.501289,-0.513975},
-{-1.369977,2.343551,-1.966917,1.531762,-0.949734,0.032643,0.112204,-0.130345},
-{-1.318450,1.948178,-1.287431,-0.747651,1.492822,-1.090136,0.680508,-0.506093},
-{-1.258388,0.192852,0.057604,0.135939,-1.001607,0.558940,-0.766022,0.932338},
-{-0.745050,-0.047848,0.371824,0.570995,-1.204112,-1.233286,0.405072,1.249406},
-{-0.629357,0.190334,-0.827573,-0.601408,2.722264,-1.909022,0.721005,-0.357665},
-{1.169332,-0.810400,0.393158,0.334853,-0.691230,1.378341,-1.196513,0.466419},
-{-0.008721,-0.498672,0.081530,-1.452605,-0.113727,2.440697,-0.488621,-0.128960},
-{-1.262450,0.195722,1.013261,-0.115690,-0.850997,1.166724,-0.738126,-0.195526},
-{-2.435908,-1.591555,0.789726,-0.371691,-0.326302,-0.595849,0.488604,0.055721},
-{0.456449,0.489112,-0.312675,-1.140395,-0.789736,0.812687,1.339665,-0.431598},
-{-0.771968,0.306481,-1.408258,2.167170,-0.130136,-1.026478,1.132890,-1.057900},
-{0.671300,-0.596799,-0.238445,0.100173,0.441947,-0.104096,0.463029,-0.098153},
-{0.356589,0.857521,-2.450599,-0.047046,-0.631894,1.282488,-0.250394,0.412160},
-{0.059856,-0.585458,0.423195,-0.303706,0.283444,-0.089959,0.321341,-0.431920},
-{0.060669,-0.385921,2.764031,-2.148305,-0.547237,0.661333,-0.225978,-0.024212},
-{-1.612045,0.089003,-0.580094,0.460054,0.863515,-0.712456,0.469113,-0.433370},
-{-2.028606,-1.077142,1.453258,-1.919952,0.993344,-0.428486,0.150522,0.008683},
-{1.744490,-0.937855,0.849633,0.233917,0.649430,-0.671007,0.073790,0.014633},
-{0.036939,0.856177,0.396913,-1.478972,-1.423382,0.624502,-0.063128,1.197376},
-{0.937510,0.056992,0.351854,0.081729,-0.148350,-0.187182,0.260690,-0.155276},
-{0.142627,-0.131972,0.291355,-0.016157,0.734708,-0.327626,0.968334,-2.906772},
-{1.216957,0.094049,0.403230,0.071355,0.849479,-0.096772,-0.311777,-0.517607},
-{-0.149855,0.451617,-1.580693,2.373276,-2.136219,1.190228,-0.145455,-0.285199},
-{-0.541653,1.402525,0.286591,0.955480,-0.454946,-0.272534,-1.226290,0.577949},
-{-0.319323,0.012771,0.335767,0.257900,-0.653751,-0.392800,1.011664,-0.361068},
-{0.411514,1.045434,1.467921,-2.659990,0.468622,-0.166632,-0.111635,0.416977},
-{0.038933,0.894807,-1.161452,-0.308040,0.566157,0.291836,-0.073931,-0.244760},
-{-2.069564,2.074868,0.405906,-1.008995,-0.894998,0.386126,0.085950,-0.047490},
-{-0.181617,0.011234,-0.656782,0.494631,-1.942429,2.432688,0.098158,-0.313548},
-{-3.029000,-1.749642,-0.747152,-0.843399,-0.811249,-0.313704,-0.448934,0.319464},
-{0.498320,-0.742194,1.308212,-0.495912,-0.666645,0.991647,0.217673,-0.595566},
-{0.217734,0.205176,0.033304,0.641149,0.996732,-1.952382,1.013184,-1.100263}};
+
+signed char hexc_table[128][8] = {
+{-27,19,-18,5,-10,-7,15,-11},
+{7,-20,20,-19,2,-32,24,15},
+{4,-10,-48,19,23,-24,-26,44},
+{45,25,-28,23,-15,15,-31,27},
+{-12,-27,-28,11,19,2,-5,-7},
+{69,-33,-15,51,-33,20,-5,4},
+{22,-13,-19,-17,50,34,-45,7},
+{15,-10,27,-36,4,49,-68,39},
+{-19,-22,-19,32,-20,13,-26,33},
+{55,-23,1,-2,-14,23,9,-16},
+{-7,-6,-24,31,4,-28,12,9},
+{29,45,22,37,4,-1,5,-22},
+{-9,6,-61,-11,47,-26,48,-24},
+{-5,1,0,7,-6,-10,-2,10},
+{2,-7,15,-3,-21,11,2,0},
+{-3,13,5,95,-64,-12,-16,-1},
+{-51,8,20,-26,18,-35,35,-18},
+{11,-32,48,-54,21,-3,39,-28},
+{-5,2,-35,11,-26,-19,52,-4},
+{16,0,37,-24,-21,-34,-4,47},
+{-8,14,7,-1,7,20,-22,-11},
+{127,6,11,27,-6,16,-1,4},
+{-1,7,-6,6,-22,20,-88,92},
+{1,13,-5,28,-13,29,-75,17},
+{3,-6,-12,-24,-18,-29,30,83},
+{12,-37,10,-20,66,-31,30,-33},
+{32,62,-38,-26,-23,12,11,11},
+{7,30,4,1,-31,23,3,-8},
+{-12,-1,-13,-5,15,6,17,-20},
+{-50,-2,-10,-18,22,-8,-1,-6},
+{7,6,-9,7,-17,46,-28,-2},
+{-18,-24,42,-23,32,-5,-15,-3},
+{-31,19,-29,28,-25,8,21,-22},
+{0,-3,13,-42,73,-76,60,-28},
+{-6,5,-14,8,-27,14,-45,127},
+{21,9,4,23,-67,-44,65,-1},
+{-5,-7,5,-20,88,-19,-31,-10},
+{14,-93,-2,11,-11,-9,11,10},
+{-13,1,-13,13,-30,91,-64,14},
+{-8,-7,22,-14,5,2,-3,1},
+{2,-71,63,18,-23,23,-17,3},
+{71,15,2,-36,-14,-3,23,5},
+{-6,-15,-75,33,36,6,-3,-6},
+{1,1,-1,4,-3,4,-1,-1},
+{11,-55,-43,-11,26,15,29,-22},
+{1,4,15,-25,26,-12,3,-3},
+{12,-44,75,-25,4,-17,7,4},
+{-96,7,-8,36,-34,7,-11,6},
+{-37,-1,24,-6,-6,13,11,-27},
+{40,3,34,-25,27,-33,17,-9},
+{27,8,-6,14,-55,9,0,32},
+{51,67,7,11,5,-15,-4,-5},
+{22,-18,31,8,3,-18,33,-37},
+{80,-16,-38,24,26,-1,-19,8},
+{-69,47,-43,19,-39,33,-30,17},
+{10,10,18,13,7,-8,-37,-12},
+{-20,-21,-3,-4,0,-2,6,1},
+{-25,22,-16,-48,17,-19,-11,52},
+{33,43,-9,-3,41,-17,-23,7},
+{-32,32,3,-38,24,13,-34,14},
+{-35,-18,-12,6,-5,37,31,-41},
+{25,3,4,-8,2,-3,-7,4},
+{8,-7,46,24,-48,3,30,-33},
+{6,0,5,14,-1,-19,-55,56},
+{-27,34,-12,-6,1,8,-8,7},
+{14,-5,5,-9,-10,-73,100,-4},
+{-4,2,-11,-7,-6,5,-1,19},
+{45,17,-31,23,-11,8,24,-29},
+{-62,-49,-8,17,26,15,-5,-17},
+{75,-53,57,-16,-1,14,-12,11},
+{-5,-2,-5,6,-21,79,6,-61},
+{-18,-41,37,-27,-21,22,-23,30},
+{-12,-38,-1,58,-36,-1,14,-7},
+{15,-7,-16,-5,-6,3,9,1},
+{60,8,-22,35,-1,-31,18,2},
+{105,48,57,33,33,16,-6,10},
+{-37,-37,-48,-4,-3,23,3,10},
+{-2,-3,1,26,-12,-2,4,-16},
+{-23,41,28,4,-18,-27,20,-9},
+{0,-36,2,28,-1,-19,-8,16},
+{-117,39,-28,-12,2,-8,-12,6},
+{37,-29,56,-61,52,-49,51,-26},
+{-27,8,10,-34,-9,-5,18,6},
+{-13,68,-32,15,-15,-31,12,6},
+{6,9,11,3,10,-11,13,-59},
+{42,11,-34,-29,31,-3,1,3},
+{2,1,-3,5,-9,16,-21,15},
+{6,-6,14,-8,49,-21,-77,48},
+{9,-38,-24,-42,-23,19,21,32},
+{27,-12,17,-38,11,6,13,-7},
+{12,25,-18,-17,12,-29,31,1},
+{27,43,-17,-52,9,49,-11,-10},
+{4,0,0,1,-5,-11,79,-58},
+{-20,12,10,-3,10,-45,-10,33},
+{4,-36,-7,17,-20,20,0,-2},
+{-8,8,55,35,9,-34,-16,-16},
+{-44,75,-63,49,-30,1,4,-4},
+{-42,62,-41,-24,48,-35,22,-16},
+{-40,6,2,4,-32,18,-25,30},
+{-24,-2,12,18,-39,-39,13,40},
+{-20,6,-26,-19,87,-61,23,-11},
+{37,-26,13,11,-22,44,-38,15},
+{0,-16,3,-46,-4,78,-16,-4},
+{-40,6,32,-4,-27,37,-24,-6},
+{-78,-51,25,-12,-10,-19,16,2},
+{15,16,-10,-36,-25,26,43,-14},
+{-25,10,-45,69,-4,-33,36,-34},
+{21,-19,-8,3,14,-3,15,-3},
+{11,27,-78,-2,-20,41,-8,13},
+{2,-19,14,-10,9,-3,10,-14},
+{2,-12,88,-69,-18,21,-7,-1},
+{-52,3,-19,15,28,-23,15,-14},
+{-65,-34,47,-61,32,-14,5,0},
+{56,-30,27,7,21,-21,2,0},
+{1,27,13,-47,-46,20,-2,38},
+{30,2,11,3,-5,-6,8,-5},
+{5,-4,9,-1,24,-10,31,-93},
+{39,3,13,2,27,-3,-10,-17},
+{-5,14,-51,76,-68,38,-5,-9},
+{-17,45,9,31,-15,-9,-39,18},
+{-10,0,11,8,-21,-13,32,-12},
+{13,33,47,-85,15,-5,-4,13},
+{1,29,-37,-10,18,9,-2,-8},
+{-66,66,13,-32,-29,12,3,-2},
+{-6,0,-21,16,-62,78,3,-10},
+{-97,-56,-24,-27,-26,-10,-14,10},
+{16,-24,42,-16,-21,32,7,-19},
+{7,7,1,21,32,-62,32,-35}};
<p><p>1.101 +8 -8 speex/libspeex/modes.c
Index: modes.c
===================================================================
RCS file: /usr/local/cvsroot/speex/libspeex/modes.c,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- modes.c 15 Jan 2003 07:51:45 -0000 1.100
+++ modes.c 27 Jan 2003 08:31:45 -0000 1.101
@@ -50,14 +50,14 @@
/* Extern declarations for all codebooks we use here */
extern float gain_cdbk_nb[];
extern float gain_cdbk_lbr[];
-extern float hexc_table[];
-extern float exc_5_256_table[];
-extern float exc_5_64_table[];
-extern float exc_8_128_table[];
-extern float exc_10_32_table[];
-extern float exc_10_16_table[];
-extern float exc_20_32_table[];
-extern float hexc_10_32_table[];
+extern signed char hexc_table[];
+extern signed char exc_5_256_table[];
+extern signed char exc_5_64_table[];
+extern signed char exc_8_128_table[];
+extern signed char exc_10_32_table[];
+extern signed char exc_10_16_table[];
+extern signed char exc_20_32_table[];
+extern signed char hexc_10_32_table[];
static int nb_mode_query(void *mode, int request, void *ptr);
static int wb_mode_query(void *mode, int request, void *ptr);
<p><p>--- >8 ----
List archives: http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body. No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.
More information about the commits
mailing list