[xiph-cvs] cvs commit: speex/libspeex cb_search.c lsp_tables_nb.c quant_lsp.c
Jean-Marc Valin
jm at xiph.org
Mon Jan 27 14:09:39 PST 2003
jm 03/01/27 17:09:39
Modified: libspeex cb_search.c lsp_tables_nb.c quant_lsp.c
Log:
Some work for shrinking the LSP codebook size
Revision Changes Path
1.84 +0 -2 speex/libspeex/cb_search.c
Index: cb_search.c
===================================================================
RCS file: /usr/local/cvsroot/speex/libspeex/cb_search.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- cb_search.c 27 Jan 2003 08:31:45 -0000 1.83
+++ cb_search.c 27 Jan 2003 22:09:39 -0000 1.84
@@ -36,8 +36,6 @@
#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 */
<p><p>1.4 +325 -335 speex/libspeex/lsp_tables_nb.c
Index: lsp_tables_nb.c
===================================================================
RCS file: /usr/local/cvsroot/speex/libspeex/lsp_tables_nb.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lsp_tables_nb.c 2 Jul 2002 05:14:28 -0000 1.3
+++ lsp_tables_nb.c 27 Jan 2003 22:09:39 -0000 1.4
@@ -29,342 +29,332 @@
POSSIBILITY OF SUCH DAMAGE.
*/
-float cdbk_nb[]={ 0.367035, 0.575953, 0.898663, 1.13373, 1.40566, 1.62544, 1.92849, 2.16854, 2.47686, 2.66605 ,
- 0.26779, 0.431383, 0.653283, 0.843937, 1.11966, 1.28682, 1.54849, 2.07668, 2.38104, 2.61105 ,
- 0.173254, 0.25467, 0.372603, 0.642321, 1.4879, 1.70812, 1.93244, 2.19301, 2.45614, 2.79342 ,
- 0.196671, 0.291205, 0.449721, 0.689854, 1.25155, 1.48783, 1.73158, 2.07264, 2.33654, 2.60108 ,
- 0.215377, 0.293094, 0.53662, 1.25932, 1.60318, 1.78126, 2.08341, 2.26368, 2.53963, 2.70363 ,
- 0.23301, 0.338112, 0.523528, 0.878811, 1.18096, 1.38066, 1.85498, 2.12369, 2.3669, 2.56975 ,
- 0.342609, 0.512949, 0.782604, 1.0188, 1.20318, 1.48743, 1.85073, 2.11077, 2.53763, 2.74534 ,
- 0.240393, 0.346512, 0.489522, 0.699007, 0.836088, 1.20917, 1.98025, 2.22925, 2.53334, 2.75449 ,
- 0.42132, 0.658093, 1.02821, 1.28021, 1.57016, 1.82602, 2.13208, 2.34411, 2.59749, 2.73327 ,
- 0.225215, 0.377676, 0.567715, 0.813698, 1.19828, 1.34819, 1.71529, 2.02672, 2.25597, 2.81041 ,
- 0.246778, 0.346181, 0.513985, 0.934545, 1.5887, 1.81542, 2.00261, 2.19365, 2.42688, 2.57366 ,
- 0.167697, 0.238104, 0.393122, 0.65945, 1.08939, 1.30371, 1.77716, 2.07021, 2.40273, 2.78811 ,
- 0.289269, 0.379576, 0.641341, 1.15328, 1.34496, 1.54903, 1.83999, 2.0176, 2.47019, 2.67557 ,
- 0.361896, 0.540396, 0.731005, 0.947568, 1.2082, 1.36318, 1.67865, 1.968, 2.21211, 2.47035 ,
- 0.15242, 0.221809, 0.450146, 0.918539, 1.25862, 1.5641, 1.94522, 2.24559, 2.58896, 2.84137 ,
- 0.267598, 0.376077, 0.592361, 0.799625, 0.984059, 1.50127, 1.79648, 2.02228, 2.46238, 2.63094 ,
- 0.269282, 0.451375, 0.873055, 1.20188, 1.5161, 1.75161, 2.01821, 2.23171, 2.50244, 2.67494 ,
- 0.306341, 0.437526, 0.630143, 0.842874, 0.997642, 1.2375, 1.90856, 2.18998, 2.43332, 2.64423 ,
- 0.206493, 0.297253, 0.458976, 0.672736, 1.23316, 1.72212, 1.93644, 2.16589, 2.41509, 2.6283 ,
- 0.206974, 0.300372, 0.482896, 0.977987, 1.30214, 1.50072, 1.77937, 1.9706, 2.35186, 2.62437 ,
- 0.161739, 0.293498, 0.750352, 1.14108, 1.4695, 1.79847, 2.12734, 2.41103, 2.68178, 2.88082 ,
- 0.245223, 0.389905, 0.597516, 0.842865, 1.08094, 1.28717, 1.57985, 1.84349, 2.18123, 2.63773 ,
- 0.310906, 0.420754, 0.67551, 0.889343, 1.0848, 1.61375, 1.93425, 2.14918, 2.53831, 2.67773 ,
- 0.259958, 0.385162, 0.564362, 0.757558, 0.937199, 1.09384, 1.61991, 2.21732, 2.48045, 2.72994 ,
- 0.287192, 0.565225, 0.930261, 1.28001, 1.57965, 1.89633, 2.20854, 2.48192, 2.72915, 2.91311 ,
- 0.223286, 0.372512, 0.558304, 0.800757, 0.976949, 1.23743, 1.64279, 1.87956, 2.52232, 2.76128 ,
- 0.187882, 0.258756, 0.418514, 0.920433, 1.56911, 1.77718, 2.08412, 2.31111, 2.5811, 2.78776 ,
- 0.177027, 0.274312, 0.457775, 0.825684, 1.138, 1.36985, 1.6799, 1.90166, 2.42745, 2.72088 ,
- 0.202292, 0.337834, 0.730847, 1.04873, 1.35848, 1.63942, 1.95132, 2.24826, 2.56831, 2.8185 ,
- 0.302137, 0.463177, 0.643237, 0.889641, 1.33777, 1.5108, 1.75877, 2.08555, 2.35332, 2.52371 ,
- 0.227649, 0.327766, 0.551744, 1.00953, 1.30957, 1.53929, 1.93661, 2.16818, 2.44174, 2.63407 ,
- 0.175323, 0.25803, 0.420214, 0.650584, 0.851368, 1.4043, 1.77971, 2.06582, 2.48996, 2.76639 ,
- 0.404216, 0.594619, 0.839407, 1.07253, 1.31312, 1.47937, 1.797, 2.05934, 2.35659, 2.55952 ,
- 0.220075, 0.329547, 0.559292, 0.766277, 1.18092, 1.37353, 1.64254, 2.20476, 2.45907, 2.74191 ,
- 0.2203, 0.312618, 0.449644, 0.727487, 1.50902, 1.89349, 2.07603, 2.24585, 2.48956, 2.64322 ,
- 0.20266, 0.302779, 0.456359, 0.751206, 1.37829, 1.56471, 1.79961, 2.0996, 2.3091, 2.80267 ,
- 0.254325, 0.334424, 0.636195, 1.282, 1.49824, 1.68036, 1.94142, 2.1197, 2.48833, 2.6718 ,
- 0.217288, 0.317172, 0.53777, 0.820736, 1.13427, 1.57597, 1.8278, 1.99663, 2.18912, 2.50053 ,
- 0.311891, 0.451331, 0.678841, 0.963902, 1.14959, 1.39302, 1.71115, 1.91591, 2.45885, 2.67752 ,
- 0.210187, 0.315014, 0.456798, 0.680469, 0.8416, 1.0745, 1.78185, 2.09831, 2.44248, 2.8 ,
- 0.444823, 0.752926, 1.19713, 1.45757, 1.73412, 1.96133, 2.19845, 2.37662, 2.60311, 2.73736 ,
- 0.216631, 0.323809, 0.504835, 0.766456, 0.957018, 1.27856, 1.78136, 2.04253, 2.32629, 2.61229 ,
- 0.250759, 0.364797, 0.557004, 0.830932, 1.40575, 1.68495, 1.88862, 2.15676, 2.46429, 2.64789 ,
- 0.155684, 0.202937, 0.347718, 0.563459, 1.14451, 1.51289, 1.83888, 2.13244, 2.45355, 2.79266 ,
- 0.281653, 0.387984, 0.583826, 1.04575, 1.49593, 1.64899, 1.88842, 2.11353, 2.34186, 2.53206 ,
- 0.345731, 0.543693, 0.753033, 0.942473, 1.17889, 1.33156, 1.72415, 2.14305, 2.40481, 2.58342 ,
- 0.172136, 0.280092, 0.67532, 0.926855, 1.23417, 1.49098, 1.79291, 2.11383, 2.45036, 2.74616 ,
- 0.240432, 0.328266, 0.508878, 0.708945, 0.903124, 1.61814, 1.97214, 2.20005, 2.53857, 2.69858 ,
- 0.446155, 0.680737, 1.01668, 1.25181, 1.50382, 1.70459, 1.99545, 2.21562, 2.50307, 2.66896 ,
- 0.319664, 0.462923, 0.649715, 0.861833, 1.0345, 1.2312, 1.7636, 2.02521, 2.2818, 2.56682 ,
- 0.192446, 0.260581, 0.414147, 0.619682, 1.25403, 1.83399, 2.11414, 2.29023, 2.55518, 2.76142 ,
- 0.245535, 0.351668, 0.493493, 0.81223, 1.4378, 1.65193, 1.86504, 2.0986, 2.3149, 2.49647 ,
- 0.302334, 0.549254, 0.864186, 1.15347, 1.44497, 1.70065, 2.02105, 2.32051, 2.62965, 2.88214 ,
- 0.241261, 0.360127, 0.572191, 0.893244, 1.18806, 1.38311, 1.70064, 1.98243, 2.22451, 2.48535 ,
- 0.347636, 0.479383, 0.707211, 0.978367, 1.15117, 1.41752, 1.88067, 2.04724, 2.37166, 2.61324 ,
- 0.217293, 0.351092, 0.545836, 0.754327, 0.986065, 1.15278, 1.62241, 1.99417, 2.28855, 2.78878 ,
- 0.243149, 0.441618, 0.980969, 1.35677, 1.6583, 1.90822, 2.14269, 2.33971, 2.57871, 2.74341 ,
- 0.220822, 0.372806, 0.552862, 0.862762, 1.03939, 1.31703, 1.84821, 2.06511, 2.5689, 2.81458 ,
- 0.199178, 0.281245, 0.426964, 1.08273, 1.47465, 1.6228, 1.91594, 2.09642, 2.53099, 2.75292 ,
- 0.158004, 0.243646, 0.394741, 0.782171, 1.2858, 1.49413, 1.83016, 2.04101, 2.51809, 2.79457 ,
- 0.257164, 0.407658, 0.791966, 1.08704, 1.34676, 1.6078, 1.89718, 2.13118, 2.43724, 2.62698 ,
- 0.277396, 0.385463, 0.647108, 1.06563, 1.30758, 1.4963, 1.80423, 2.00172, 2.24215, 2.50116 ,
- 0.227732, 0.339801, 0.486371, 1.02253, 1.24377, 1.46395, 1.82262, 2.009, 2.58232, 2.78822 ,
- 0.165873, 0.240104, 0.420613, 0.722822, 1.05524, 1.51018, 1.79156, 1.96547, 2.259, 2.74067
-};
+float cdbk_nb[]={
+30,19,38,34,40,32,46,43,58,43,
+5,-18,-25,-40,-33,-55,-52,20,34,28,
+-20,-63,-97,-92,61,53,47,49,53,75,
+-14,-53,-77,-79,0,-3,-5,19,22,26,
+-9,-53,-55,66,90,72,85,68,74,52,
+-4,-41,-58,-31,-18,-31,27,32,30,18,
+24,3,8,5,-12,-3,26,28,74,63,
+-2,-39,-67,-77,-106,-74,59,59,73,65,
+44,40,71,72,82,83,98,88,89,60,
+-6,-31,-47,-48,-13,-39,-9,7,2,79,
+-1,-39,-60,-17,87,81,65,50,45,19,
+-21,-67,-91,-87,-41,-50,7,18,39,74,
+10,-31,-28,39,24,13,23,5,56,45,
+29,10,-5,-13,-11,-35,-18,-8,-10,-8,
+-25,-71,-77,-21,2,16,50,63,87,87,
+5,-32,-40,-51,-68,0,12,6,54,34,
+5,-12,32,52,68,64,69,59,65,45,
+14,-16,-31,-40,-65,-67,41,49,47,37,
+-11,-52,-75,-84,-4,57,48,42,42,33,
+-11,-51,-68,-6,13,0,8,-8,26,32,
+-23,-53,0,36,56,76,97,105,111,97,
+-1,-28,-39,-40,-43,-54,-44,-40,-18,35,
+16,-20,-19,-28,-42,29,47,38,74,45,
+3,-29,-48,-62,-80,-104,-33,56,59,59,
+10,17,46,72,84,101,117,123,123,106,
+-7,-33,-49,-51,-70,-67,-27,-31,70,67,
+-16,-62,-85,-20,82,71,86,80,85,74,
+-19,-58,-75,-45,-29,-33,-18,-25,45,57,
+-12,-42,-5,12,28,36,52,64,81,82,
+13,-9,-27,-28,22,3,2,22,26,6,
+-6,-44,-51,2,15,10,48,43,49,34,
+-19,-62,-84,-89,-102,-24,8,17,61,68,
+39,24,23,19,16,-5,12,15,27,15,
+-8,-44,-49,-60,-18,-32,-28,52,54,62,
+-8,-48,-77,-70,66,101,83,63,61,37,
+-12,-50,-75,-64,33,17,13,25,15,77,
+1,-42,-29,72,64,46,49,31,61,44,
+-8,-47,-54,-46,-30,19,20,-1,-16,0,
+16,-12,-18,-9,-26,-27,-10,-22,53,45,
+-10,-47,-75,-82,-105,-109,8,25,49,77,
+50,65,114,117,124,118,115,96,90,61,
+-9,-45,-63,-60,-75,-57,8,11,20,29,
+0,-35,-49,-43,40,47,35,40,55,38,
+-24,-76,-103,-112,-27,3,23,34,52,75,
+8,-29,-43,12,63,38,35,29,24,8,
+25,11,1,-15,-18,-43,-7,37,40,21,
+-20,-56,-19,-19,-4,-2,11,29,51,63,
+-2,-44,-62,-75,-89,30,57,51,74,51,
+50,46,68,64,65,52,63,55,65,43,
+18,-9,-26,-35,-55,-69,3,6,8,17,
+-15,-61,-86,-97,1,86,93,74,78,67,
+-1,-38,-66,-48,48,39,29,25,17,-1,
+13,13,29,39,50,51,69,82,97,98,
+-2,-36,-46,-27,-16,-30,-13,-4,-7,-4,
+25,-5,-11,-6,-25,-21,33,12,31,29,
+-8,-38,-52,-63,-68,-89,-33,-1,10,74,
+-2,-15,59,91,105,105,101,87,84,62,
+-7,-33,-50,-35,-54,-47,25,17,82,81,
+-13,-56,-83,21,58,31,42,25,72,65,
+-24,-66,-91,-56,9,-2,21,10,69,75,
+2,-24,11,22,25,28,38,34,48,33,
+7,-29,-26,17,15,-1,14,0,-2,0,
+-6,-41,-67,6,-2,-9,19,2,85,74,
+-22,-67,-84,-71,-50,3,11,-9,2,62};
+float cdbk_nb_low1[]={
+-34,-52,-15,45,2,
+23,21,52,24,-33,
+-9,-1,9,-44,-41,
+-13,-17,44,22,-17,
+-6,-4,-1,22,38,
+26,16,2,50,27,
+-35,-34,-9,-41,6,
+0,-16,-34,51,8,
+-14,-31,-49,15,-33,
+45,49,33,-11,-37,
+-62,-54,45,11,-5,
+-72,11,-1,-12,-11,
+24,27,-11,-43,46,
+43,33,-12,-9,-1,
+1,-4,-23,-57,-71,
+11,8,16,17,-8,
+-20,-31,-41,53,48,
+-16,3,65,-24,-8,
+-23,-32,-37,-32,-49,
+-10,-17,6,38,5,
+-9,-17,-46,8,52,
+3,6,45,40,39,
+-7,-6,-34,-74,31,
+8,1,-16,43,68,
+-11,-19,-31,4,6,
+0,-6,-17,-16,-38,
+-16,-30,2,9,-39,
+-16,-1,43,-10,48,
+3,3,-16,-31,-3,
+62,68,43,13,3,
+-10,8,20,-56,12,
+12,-2,-18,22,-15,
+-40,-36,1,7,41,
+0,1,46,-6,-62,
+-4,-12,-2,-11,-83,
+-13,-2,91,33,-10,
+0,4,-11,-16,79,
+32,37,14,9,51,
+-21,-28,-56,-34,0,
+21,9,-26,11,28,
+-42,-54,-23,-2,-15,
+31,30,8,-39,-66,
+-39,-36,31,-28,-40,
+-46,35,40,22,24,
+33,48,23,-34,14,
+40,32,17,27,-3,
+25,26,-13,-61,-17,
+11,4,31,60,-6,
+-26,-41,-64,13,16,
+-26,54,31,-11,-23,
+-9,-11,-34,-71,-21,
+-34,-35,55,50,29,
+-22,-27,-50,-38,57,
+33,42,57,48,26,
+11,0,-49,-31,26,
+-4,-14,5,78,37,
+17,0,-49,-12,-23,
+26,14,2,2,-43,
+-17,-12,10,-8,-4,
+8,18,12,-6,20,
+-12,-6,-13,-25,34,
+15,40,49,7,8,
+13,20,20,-19,-22,
+-2,-8,2,51,-51};
-
-float cdbk_nb_low1[]={ -0.0655543, -0.101129, -0.0298978, 0.0882873, 0.00337778 ,
- 0.0444603, 0.0409333, 0.10182, 0.0461466, -0.0650902 ,
- -0.0172001, -0.00107768, 0.017437, -0.0854496, -0.0804818 ,
- -0.0250186, -0.033342, 0.0859539, 0.0422287, -0.0336373 ,
- -0.0122282, -0.00702939, -0.00273717, 0.0436743, 0.0750326 ,
- 0.0509004, 0.0307107, 0.00385482, 0.0975481, 0.0520072 ,
- -0.0693214, -0.0657402, -0.01715, -0.0802262, 0.0126328 ,
- -0.000227006, -0.0310426, -0.0654538, 0.099594, 0.0156321 ,
- -0.0278677, -0.0601328, -0.0962925, 0.0296747, -0.0647882 ,
- 0.0880463, 0.0952325, 0.064322, -0.0224025, -0.0718566 ,
- -0.122052, -0.104625, 0.088844, 0.0213181, -0.00914904 ,
- -0.139819, 0.0206462, -0.00202082, -0.0242757, -0.0205778 ,
- 0.0462255, 0.0522061, -0.0217426, -0.0846706, 0.0888732 ,
- 0.0835503, 0.0652306, -0.0235534, -0.0172334, -0.00277483 ,
- 0.00150936, -0.00877738, -0.0444865, -0.111987, -0.138896 ,
- 0.0219605, 0.016342, 0.031852, 0.0337835, -0.0147081 ,
- -0.0381873, -0.0598413, -0.079579, 0.104383, 0.0942897 ,
- -0.0302849, 0.00665801, 0.127664, -0.0467457, -0.0153641 ,
- -0.0443721, -0.0617561, -0.0723298, -0.062182, -0.0952357 ,
- -0.0191426, -0.0326638, 0.0119874, 0.0735538, 0.00987799 ,
- -0.0169503, -0.0333773, -0.0889741, 0.0159132, 0.101053 ,
- 0.00518823, 0.0122941, 0.0883399, 0.0775766, 0.0754684 ,
- -0.0129463, -0.0111309, -0.0666994, -0.145152, 0.0609637 ,
- 0.0149505, 0.00288834, -0.0322146, 0.0846859, 0.13334 ,
- -0.0215246, -0.0375458, -0.0597056, 0.00844475, 0.0115602 ,
- 9.18713e-05, -0.0126033, -0.0326302, -0.0306023, -0.0746021 ,
- -0.0312898, -0.0592624, 0.00344474, 0.0179648, -0.0752463 ,
- -0.0318479, -0.00145497, 0.083032, -0.0201982, 0.0946814 ,
- 0.00498007, 0.00582578, -0.0321795, -0.0603405, -0.00580713 ,
- 0.12181, 0.132346, 0.0848409, 0.0246252, 0.00535887 ,
- -0.0199198, 0.0159214, 0.039223, -0.110065, 0.0228657 ,
- 0.0233148, -0.00312667, -0.0346861, 0.0428938, -0.0297953 ,
- -0.0776093, -0.0704185, 0.00185731, 0.0141093, 0.0804856 ,
- -0.000235904, 0.0026389, 0.0897934, -0.0118589, -0.121998 ,
- -0.00723547, -0.0233072, -0.00330989, -0.0212308, -0.161398 ,
- -0.0255158, -0.00454821, 0.177098, 0.0649557, -0.0187818 ,
- -0.000390172, 0.0073975, -0.0207349, -0.0306636, 0.153513 ,
- 0.0622679, 0.0715318, 0.0267595, 0.0174141, 0.0988135 ,
- -0.0406207, -0.0545689, -0.109045, -0.0656236, -0.000884104 ,
- 0.0401535, 0.0175747, -0.0502592, 0.0211702, 0.0547423 ,
- -0.082678, -0.105789, -0.0440659, -0.00441166, -0.0287188 ,
- 0.0603695, 0.0577467, 0.0152909, -0.0769367, -0.128555 ,
- -0.0754509, -0.0693817, 0.0606266, -0.0538219, -0.0784887 ,
- -0.0897885, 0.0690449, 0.0776909, 0.0436813, 0.0471098 ,
- 0.0641614, 0.0939191, 0.044401, -0.0661894, 0.026984 ,
- 0.0781983, 0.0616256, 0.0338938, 0.0532354, -0.00592076 ,
- 0.0497276, 0.0509346, -0.0250973, -0.118397, -0.0324086 ,
- 0.0208215, 0.00715322, 0.0606004, 0.117552, -0.0108358 ,
- -0.0513235, -0.0807871, -0.125875, 0.026021, 0.0309376 ,
- -0.0501016, 0.106063, 0.0596738, -0.0209521, -0.0453132 ,
- -0.0169995, -0.0215964, -0.0666571, -0.139192, -0.0406381 ,
- -0.0658071, -0.0683402, 0.106692, 0.0973516, 0.0563357 ,
- -0.043158, -0.0531559, -0.0982735, -0.0747131, 0.111161 ,
- 0.0650995, 0.0828947, 0.111352, 0.0934352, 0.0506575 ,
- 0.0223406, -0.000525354, -0.0962768, -0.0605878, 0.0503502 ,
- -0.00846221, -0.0282482, 0.00914371, 0.152428, 0.0721601 ,
- 0.0327924, -0.000156104, -0.09595, -0.0237955, -0.044508 ,
- 0.050491, 0.0264203, 0.00393974, 0.00315918, -0.0846835 ,
- -0.0323181, -0.0228242, 0.0194378, -0.0151592, -0.00841336 ,
- 0.0146836, 0.0345354, 0.0225321, -0.0119043, 0.039804 ,
- -0.0237711, -0.0113373, -0.0256323, -0.0493186, 0.0671639 ,
- 0.0294226, 0.0784092, 0.0958702, 0.0138153, 0.0158757 ,
- 0.025846, 0.0385042, 0.038218, -0.037266, -0.0432286 ,
- -0.00383273, -0.0165184, 0.00472654, 0.099767, -0.0999449
-};
-
-
-
-float cdbk_nb_low2[]={ -0.00553417, 0.051551, -0.0206, -0.0236118, 0.00363419 ,
- 0.0258439, 0.0162547, -0.00375006, -0.0363438, 0.0247921 ,
- 0.0165057, -0.0352534, -0.0125269, 0.0304936, 0.00262701 ,
- -0.00583667, 0.0263556, 0.0151064, -0.00997957, 0.0298423 ,
- 0.0274432, 0.0254502, -0.00985422, -0.00954423, -0.0395286 ,
- 0.0154365, -0.00681299, 0.0145233, 0.0130981, 0.039625 ,
- -0.00890096, 0.000264599, -0.00434403, 0.0488133, -0.0059634 ,
- -0.00637707, 0.0140688, 0.0369816, 0.0214196, 0.000111946 ,
- -0.0464447, 0.00175744, 0.000897567, -0.0127923, -0.0185842 ,
- 0.0309533, -0.00269354, -0.0585772, 0.0105241, -0.0168645 ,
- -0.000884906, -0.0234174, -0.0328042, -0.00053199, 0.0338048 ,
- -0.00465172, -0.0262954, 0.0275862, 0.0429352, 0.0123076 ,
- 0.0244735, 0.014398, 0.0412805, -0.0109519, 0.0150057 ,
- 0.0494515, 0.0339368, -0.0349237, 0.0194881, 0.00777093 ,
- -0.00404876, -0.0119337, -0.0279294, 0.0183178, -0.0456247 ,
- 0.0482093, -0.0149973, -0.00360052, 0.0156161, -0.0279961 ,
- -0.0381402, 0.0139395, -0.0294856, 0.00431026, 0.0240724 ,
- -0.00887403, -0.00463013, -0.0502563, -0.0141036, -0.00253083 ,
- -0.0394498, -0.0310626, 0.0373318, 0.00491526, -0.00850795 ,
- -0.00735437, -0.00406555, -0.00145146, -0.0218061, 0.0688501 ,
- -0.00338479, 0.0136075, 0.0258571, -0.0171041, -0.021574 ,
- 0.0236386, -0.0400467, -0.024559, -0.0234444, 0.00552196 ,
- 0.0223936, 0.0183723, -0.0100089, 0.0383622, -0.0258619 ,
- -0.0267077, 0.0630433, 0.0439962, 0.0018735, -0.00721039 ,
- -0.0251396, -0.00789336, 0.021444, -0.0117388, 0.0159689 ,
- 0.0146708, 0.0159553, -0.0340823, -0.00494922, 0.0326371 ,
- -0.0207368, -0.007705, -0.000472901, 0.0221478, 0.0319243 ,
- 0.0330039, 0.00624302, 0.0208645, 0.0354114, 0.00574869 ,
- -0.00667464, -0.021198, 0.00823423, -0.0363503, -0.013873 ,
- 0.030341, 0.0366775, 0.0106626, -0.00378801, -0.00246903 ,
- -0.0378636, -0.0316933, -0.00801628, 0.031722, -0.022742 ,
- -0.00614319, -0.0119342, 0.015641, 0.0194738, -0.0269902 ,
- -0.00425604, 0.0226167, 0.0130164, -0.0507161, -0.000816131 ,
- 0.0219625, 0.00631556, -0.0318796, -0.0389182, -0.00625858 ,
- 0.00351259, -0.0608217, 0.0126861, 0.00446846, -0.0252368 ,
- 0.0341673, 0.0381394, 0.0110244, 0.00199993, 0.0556177 ,
- -0.0107369, 0.00904716, -0.0190746, -0.0272831, -0.0325124 ,
- 0.0508565, -0.0045395, -0.00621427, -0.00184118, 0.0212109 ,
- -0.0140032, -0.0159059, -0.0469765, 0.0339782, 0.00117445 ,
- -0.0568115, 0.0191909, 0.0128089, 0.0323505, -0.0007419 ,
- -0.0721642, 0.0549319, -0.0174275, -0.021641, -0.0301466 ,
- 0.011882, 0.0055706, -0.0136104, 0.0036586, -0.0017436 ,
- -0.00875541, -0.0459846, 0.0100172, -0.00318508, 0.0279886 ,
- -0.0167395, -0.00439621, 0.0599351, 0.0139864, 0.0456879 ,
- -0.0116237, 0.0015521, 0.0698578, -0.0380055, -0.0163906 ,
- 0.0902863, 0.062899, -0.0522311, -0.050024, -0.0151131 ,
- -0.0296949, -0.0373982, -0.0402556, -0.028698, -0.0273534 ,
- 0.0259646, 0.00888874, 0.0353482, 0.00917048, -0.0346128 ,
- -0.0409628, 0.0790229, -0.0202591, 0.0196149, 0.0242309 ,
- -0.0158649, -0.00483786, -0.0163035, -0.0341089, 0.020219 ,
- 0.0145009, -0.0272164, 0.0470234, 0.00160258, -0.00223571 ,
- 0.00891682, -0.0182521, 0.0281905, -0.0390396, 0.028879 ,
- -0.0179987, -0.0171056, 0.0176083, -0.0155917, -0.0560607 ,
- 0.0149986, -0.0194534, -0.0119414, -0.015046, -0.0359571 ,
- -0.0147374, 0.0323392, -0.0385576, 0.0201228, -0.0219236 ,
- -0.0131108, 0.0339223, 0.0104308, 0.0126651, -0.0369895 ,
- -0.0616962, 0.0284283, 0.0220792, -0.026152, 0.0316787 ,
- 0.0176728, 0.00296456, -0.0251621, 0.0408358, 0.031802 ,
- -0.0624609, -0.0643229, -0.0169164, 0.0159737, 0.0551334 ,
- 0.00227561, 0.0350103, 0.00340551, 0.0302082, 0.0207096 ,
- -0.0398203, -0.0384344, 0.00764509, -0.0556771, 0.0140278 ,
- 0.0358373, -0.00199262, 0.0185304, -0.0353151, -0.018159 ,
- -0.0220537, -0.0284294, -0.0157719, 0.00109848, -0.00257404 ,
- -0.00733046, -0.0101345, 0.030504, 0.0629051, -0.0637191
-};
-
-
-
-float cdbk_nb_high1[]={ -0.0514632, -0.0149474, 0.0567285, 0.0407909, 0.00804444 ,
- 0.0374946, -0.0769294, 0.0636051, -0.01463, -0.0709558 ,
- 0.108931, 0.106076, 0.0929974, 0.0790108, 0.0568998 ,
- -0.00688702, -0.046929, -0.0819052, -0.129691, -0.0840913 ,
- -0.116433, 0.0373375, -0.00351471, 0.0714152, 0.0802774 ,
- -0.0191122, -0.0714742, -0.116297, -0.125167, 0.0343212 ,
- -0.0432517, 0.149973, 0.142551, 0.0781639, 0.0482722 ,
- 0.00864491, 0.0365118, -0.0375072, -0.128788, -0.00321888 ,
- 0.0218819, 0.00917262, 0.0408439, 0.0274798, 0.0500807 ,
- -0.0496658, -0.1675, -0.0069665, 0.0350367, 0.00208764 ,
- 0.0509967, -0.0719502, 0.0197218, 0.0731945, -0.00176543 ,
- 0.0464488, -0.0237592, -0.114873, -0.0205777, 0.0396074 ,
- -0.0120158, 0.0671637, -0.0308286, -0.0311967, 0.08237 ,
- 0.0366128, -0.0546398, -0.100573, 0.104394, 0.0626587 ,
- 0.00739884, 0.019887, 0.121718, 0.0407406, -0.0236939 ,
- -0.0657593, 0.0518818, 0.00855842, -0.0929197, -0.0943174 ,
- -0.0982508, -0.0950299, 0.0607593, -0.0136917, -0.0410818 ,
- -0.0826128, -0.0482003, -0.00726314, -0.0843069, -0.0431272 ,
- 0.115375, 0.00302776, 0.0522988, 0.024396, -0.0179167 ,
- -0.0118116, -0.0320664, -0.0161883, -0.0625738, -0.112483 ,
- -0.0318402, -0.0564005, -0.00952645, 0.0798927, 0.0440974 ,
- -0.0591082, -0.0653166, -0.0895089, -0.0245719, -0.0195083 ,
- -0.0735116, 0.10198, 0.100863, 0.00183414, -0.0337223 ,
- -0.0181129, 0.0195384, 0.0510139, -0.0493603, -0.0110726 ,
- 0.0637268, -0.0390636, 0.103909, 0.107868, 0.0488991 ,
- -0.0632583, -0.00991787, -0.0825218, 0.0450102, 0.0407687 ,
- 0.129521, 0.00945617, -0.0554423, 0.038553, 0.0182096 ,
- 0.146605, 0.057274, -0.0130397, -0.0815098, -0.076859 ,
- 0.0295986, 0.00524244, -0.0456347, 0.0414466, 0.0122503 ,
- 0.0205365, 0.00124128, -0.0561717, 0.0267084, 0.122171 ,
- 0.018961, 0.106064, 0.050566, -0.0468927, -0.0994168 ,
- -0.0956199, 0.014591, -0.0454897, -0.0988353, 0.0290255 ,
- -0.129542, 0.00182508, 0.116327, 0.0495164, 0.0188288 ,
- 5.76836e-05, -0.0588056, -0.00790935, -0.0286409, 0.033912 ,
- 0.03673, 0.114875, 0.0775452, 0.00775305, -0.00912589 ,
- 0.0637986, 0.0125472, -0.0438922, -0.113595, -0.136739 ,
- -0.0104411, 0.0449807, -0.0118554, 0.117396, 0.0860067 ,
- -0.0564834, -0.0314148, -0.0919665, -0.0557033, 0.101813 ,
- -0.036728, 0.0986246, 0.0553852, 0.0312889, 0.0675714 ,
- 0.0611349, 0.070091, -0.000445569, -0.0415652, 0.0108021 ,
- 0.0401143, 0.052035, 0.0437807, 0.0818356, 0.0136719 ,
- -0.128526, -0.078133, -0.0158878, 0.0146359, 0.036366 ,
- 0.0905963, -0.00022972, -0.00868102, 0.116366, 0.0706039 ,
- 0.0879287, -0.0131352, -0.0567071, -0.0110493, -0.0625303 ,
- -0.0753564, 0.00361523, 0.0116234, -0.017862, 0.0652315 ,
- 0.0381553, -0.100041, -0.065865, 0.0353102, -0.0126853 ,
- 0.037603, 0.0112572, 0.0208825, 0.0100104, -0.0363122 ,
- -0.0560478, -0.00458696, 0.0827052, -0.0213077, -0.0877915 ,
- -0.0408236, -0.107874, 0.110818, 0.0716945, 0.0047753 ,
- -0.0273641, -0.131826, -0.0307261, -0.051942, -0.0734081 ,
- 0.134498, 0.0944139, 0.0365214, 0.00395949, -0.034129 ,
- 0.0391766, -0.0381358, -0.0308189, -0.0663438, -0.0335281 ,
- -0.0485652, -0.119194, 0.0204136, 0.141991, 0.0877492 ,
- 0.0313724, -0.0790709, -0.125472, -0.0323092, -0.0567239 ,
- -0.0434374, 0.109476, 0.0339618, -0.0758288, 0.0156046 ,
- -0.0213135, 0.0165884, -0.0479112, -0.035771, -0.0260249 ,
- -0.0374654, 0.0158105, 0.105759, 0.111292, 0.0707682 ,
- -0.0335704, -0.0498432, -0.00841032, 0.011728, -0.0400605 ,
- 0.078344, 0.0814653, -0.00775459, 0.038916, 0.0614271 ,
- 0.103764, 0.0187912, -0.0668583, -0.103635, 0.0613721 ,
- -0.0331981, 0.0682425, 0.000967936, 0.0289237, -0.0115247 ,
- -0.0384158, -0.123288, -0.14305, 0.0421315, 0.049136 ,
- 0.0557817, 0.0330269, 0.0161556, -0.0557267, -0.0754571 ,
- -0.134596, 0.0355043, 0.0294491, -0.0297548, -0.0102754
-};
-
-
-
-float cdbk_nb_high2[]={ 0.0111702, 0.0457024, 0.0154358, -0.00832608, -0.0444777 ,
- -0.0308269, 0.0256853, -0.062012, 0.033007, -0.00459552 ,
- 0.0375619, -0.00683076, 0.0455989, 0.0190509, 0.00147197 ,
- -0.0713018, -0.0967067, -0.00269214, -0.0438367, 0.0197952 ,
- 0.0686924, -0.0505969, 0.0141609, -0.00542073, -0.00647079 ,
- -0.0797842, 0.0303315, 0.020797, 0.0457188, 0.0502447 ,
- 0.0379932, -0.00289734, 0.00916184, 7.824e-05, -0.0401547 ,
- -0.00663197, -0.014259, -0.05304, 0.00164523, -0.000302136 ,
- 0.0261437, -0.0305321, 0.00870998, -0.043686, -0.0217671 ,
- -0.0367651, -0.0235639, -0.023853, 0.0074253, -0.0327088 ,
- 0.0224611, 0.00441881, 0.049065, -0.0349505, -0.0166166 ,
- -0.0175955, -0.0497184, -0.00159429, 0.0127071, 0.0186188 ,
- 0.0421135, 0.0112857, -0.0151329, -0.0115667, 0.0593189 ,
- 0.0373968, 0.0370836, 0.00712526, 0.0129038, -0.000411518 ,
- 0.00561365, -0.00138152, 0.00277187, 0.0610071, 0.00857801 ,
- 0.0267474, 0.021476, -0.0326073, 0.0370953, -0.03464 ,
- -0.00913278, 0.0292081, -0.0420155, -0.00836348, -0.0314839 ,
- -0.000938885, 0.00416228, -0.00404124, 0.000910572, -0.0051524 ,
- -0.0104142, -0.00808596, 0.0375118, 0.0304658, 0.0106932 ,
- -0.0102391, -0.0406037, -0.0202769, -0.035942, 0.00105143 ,
- 0.0415115, 0.0149999, -0.012536, -0.0346291, -0.0186308 ,
- -0.0178844, 0.0148517, 0.0220885, -0.0254783, 0.0580693 ,
- 0.00107311, -0.0209262, 0.0516524, 0.00789469, -0.040038 ,
- -0.0487962, -0.0141184, -0.0275737, 0.00378801, 0.0209105 ,
- 0.0248704, -0.0277798, -0.0390184, 0.00528142, -0.0386159 ,
- -0.0402828, 0.0037014, 0.0493212, -0.0321917, -0.00786431 ,
- -0.00794263, 0.00121461, 0.0165288, -0.0584242, 0.0113561 ,
- 0.0246673, -0.0398795, 0.0168772, 0.0335133, 0.0417614 ,
- 0.0188213, 0.0441653, 0.0071928, -0.0360922, 0.0230144 ,
- -0.0145525, 0.0547813, -0.00242151, 0.034053, -0.00956897 ,
- 0.0464904, 0.00412051, -0.0457123, -0.00186604, 0.00507841 ,
- -0.005357, -0.0530386, 0.00481644, -0.00341195, -0.0325387 ,
- -0.010087, 0.0297755, -0.00160409, -0.0428472, -0.0237488 ,
- -0.0369163, 0.00877759, -0.0088037, 0.0411541, 0.00374025 ,
- 0.00551308, -0.0546508, 0.0430117, -0.015268, 0.00861582 ,
- -0.038905, -0.0252308, 0.0178888, -0.0194219, 0.0102434 ,
- 0.0276825, -0.039738, -0.0209166, -0.00359507, 0.0126482 ,
- -0.0180423, 0.0316965, -0.0289268, -0.003131, 0.0359975 ,
- 0.0147477, 0.0210486, 0.0277366, 0.048864, -0.0390901 ,
- 0.00334605, -0.0287453, -0.0621972, 0.00722314, 0.0496931 ,
- -0.0188014, -0.0108535, 0.0162467, -0.0261308, -0.039174 ,
- -0.0627715, 0.0236443, -0.0114683, -0.00701279, -0.0263067 ,
- 0.00295387, 0.0364453, 0.0464697, -0.00111337, 0.00211881 ,
- -0.00883851, -0.0370306, -0.0330139, 0.0447865, 0.00101962 ,
- 0.02649, -0.00574201, 0.018793, -0.0124134, 0.0257427 ,
- 0.00934304, 0.0331119, 0.019222, 0.0247408, 0.0393881 ,
- 0.0487185, -0.0062744, -0.00637552, 0.0289155, 0.00843959 ,
- -0.0230267, 0.000116788, -0.0220273, 0.0693036, -0.059517 ,
- 0.0214401, 0.0568095, -0.0335535, -0.00410495, 0.00190329 ,
- -0.0481655, -0.0319722, 0.0247623, 0.0288602, -0.00782512 ,
- -0.0061042, -0.0153888, 0.0748594, 0.00159915, 0.0374199 ,
- -0.00765444, -0.0342589, -0.00555328, -0.0295472, 0.0546254 ,
- 0.076028, 0.0298688, 0.0325117, -0.0195416, 0.0123627 ,
- -0.0378534, 0.0194714, 0.0216102, 0.00416067, 0.0203319 ,
- -0.00772793, 0.00415324, -0.00626552, 0.00956295, -0.0812301 ,
- -0.0405194, 0.00857382, -0.0241562, -0.0418562, 0.0144944 ,
- -0.00674151, -0.0114772, -0.0328757, -0.0382963, -0.0362973 ,
- -0.0317651, 0.0182464, 0.0289085, 0.0152755, -0.0322027 ,
- 0.0414898, -0.0240614, 0.0246489, -0.0665802, 0.0430969 ,
- -0.0147647, -0.0106911, -0.00351295, 0.0223647, 0.0483556 ,
- 0.0138326, 0.00434786, -0.0378286, -0.0416217, 0.0193109 ,
- -0.0292459, 0.0584988, 0.00844317, -0.0195525, 0.00644965 ,
- 0.0159521, 0.018142, -0.0318083, 0.036259, 0.0286272 ,
- 0.0160133, -0.0343231, 0.0070628, 0.0368015, -0.0263024
-};
+float cdbk_nb_low2[]={
+-6,53,-21,-24,4,
+26,17,-4,-37,25,
+17,-36,-13,31,3,
+-6,27,15,-10,31,
+28,26,-10,-10,-40,
+16,-7,15,13,41,
+-9,0,-4,50,-6,
+-7,14,38,22,0,
+-48,2,1,-13,-19,
+32,-3,-60,11,-17,
+-1,-24,-34,-1,35,
+-5,-27,28,44,13,
+25,15,42,-11,15,
+51,35,-36,20,8,
+-4,-12,-29,19,-47,
+49,-15,-4,16,-29,
+-39,14,-30,4,25,
+-9,-5,-51,-14,-3,
+-40,-32,38,5,-9,
+-8,-4,-1,-22,71,
+-3,14,26,-18,-22,
+24,-41,-25,-24,6,
+23,19,-10,39,-26,
+-27,65,45,2,-7,
+-26,-8,22,-12,16,
+15,16,-35,-5,33,
+-21,-8,0,23,33,
+34,6,21,36,6,
+-7,-22,8,-37,-14,
+31,38,11,-4,-3,
+-39,-32,-8,32,-23,
+-6,-12,16,20,-28,
+-4,23,13,-52,-1,
+22,6,-33,-40,-6,
+4,-62,13,5,-26,
+35,39,11,2,57,
+-11,9,-20,-28,-33,
+52,-5,-6,-2,22,
+-14,-16,-48,35,1,
+-58,20,13,33,-1,
+-74,56,-18,-22,-31,
+12,6,-14,4,-2,
+-9,-47,10,-3,29,
+-17,-5,61,14,47,
+-12,2,72,-39,-17,
+92,64,-53,-51,-15,
+-30,-38,-41,-29,-28,
+27,9,36,9,-35,
+-42,81,-21,20,25,
+-16,-5,-17,-35,21,
+15,-28,48,2,-2,
+9,-19,29,-40,30,
+-18,-18,18,-16,-57,
+15,-20,-12,-15,-37,
+-15,33,-39,21,-22,
+-13,35,11,13,-38,
+-63,29,23,-27,32,
+18,3,-26,42,33,
+-64,-66,-17,16,56,
+2,36,3,31,21,
+-41,-39,8,-57,14,
+37,-2,19,-36,-19,
+-23,-29,-16,1,-3,
+-8,-10,31,64,-65};
+float cdbk_nb_high1[]={
+-26,-8,29,21,4,
+19,-39,33,-7,-36,
+56,54,48,40,29,
+-4,-24,-42,-66,-43,
+-60,19,-2,37,41,
+-10,-37,-60,-64,18,
+-22,77,73,40,25,
+4,19,-19,-66,-2,
+11,5,21,14,26,
+-25,-86,-4,18,1,
+26,-37,10,37,-1,
+24,-12,-59,-11,20,
+-6,34,-16,-16,42,
+19,-28,-51,53,32,
+4,10,62,21,-12,
+-34,27,4,-48,-48,
+-50,-49,31,-7,-21,
+-42,-25,-4,-43,-22,
+59,2,27,12,-9,
+-6,-16,-8,-32,-58,
+-16,-29,-5,41,23,
+-30,-33,-46,-13,-10,
+-38,52,52,1,-17,
+-9,10,26,-25,-6,
+33,-20,53,55,25,
+-32,-5,-42,23,21,
+66,5,-28,20,9,
+75,29,-7,-42,-39,
+15,3,-23,21,6,
+11,1,-29,14,63,
+10,54,26,-24,-51,
+-49,7,-23,-51,15,
+-66,1,60,25,10,
+0,-30,-4,-15,17,
+19,59,40,4,-5,
+33,6,-22,-58,-70,
+-5,23,-6,60,44,
+-29,-16,-47,-29,52,
+-19,50,28,16,35,
+31,36,0,-21,6,
+21,27,22,42,7,
+-66,-40,-8,7,19,
+46,0,-4,60,36,
+45,-7,-29,-6,-32,
+-39,2,6,-9,33,
+20,-51,-34,18,-6,
+19,6,11,5,-19,
+-29,-2,42,-11,-45,
+-21,-55,57,37,2,
+-14,-67,-16,-27,-38,
+69,48,19,2,-17,
+20,-20,-16,-34,-17,
+-25,-61,10,73,45,
+16,-40,-64,-17,-29,
+-22,56,17,-39,8,
+-11,8,-25,-18,-13,
+-19,8,54,57,36,
+-17,-26,-4,6,-21,
+40,42,-4,20,31,
+53,10,-34,-53,31,
+-17,35,0,15,-6,
+-20,-63,-73,22,25,
+29,17,8,-29,-39,
+-69,18,15,-15,-5};
+float cdbk_nb_high2[]={
+11,47,16,-9,-46,
+-32,26,-64,34,-5,
+38,-7,47,20,2,
+-73,-99,-3,-45,20,
+70,-52,15,-6,-7,
+-82,31,21,47,51,
+39,-3,9,0,-41,
+-7,-15,-54,2,0,
+27,-31,9,-45,-22,
+-38,-24,-24,8,-33,
+23,5,50,-36,-17,
+-18,-51,-2,13,19,
+43,12,-15,-12,61,
+38,38,7,13,0,
+6,-1,3,62,9,
+27,22,-33,38,-35,
+-9,30,-43,-9,-32,
+-1,4,-4,1,-5,
+-11,-8,38,31,11,
+-10,-42,-21,-37,1,
+43,15,-13,-35,-19,
+-18,15,23,-26,59,
+1,-21,53,8,-41,
+-50,-14,-28,4,21,
+25,-28,-40,5,-40,
+-41,4,51,-33,-8,
+-8,1,17,-60,12,
+25,-41,17,34,43,
+19,45,7,-37,24,
+-15,56,-2,35,-10,
+48,4,-47,-2,5,
+-5,-54,5,-3,-33,
+-10,30,-2,-44,-24,
+-38,9,-9,42,4,
+6,-56,44,-16,9,
+-40,-26,18,-20,10,
+28,-41,-21,-4,13,
+-18,32,-30,-3,37,
+15,22,28,50,-40,
+3,-29,-64,7,51,
+-19,-11,17,-27,-40,
+-64,24,-12,-7,-27,
+3,37,48,-1,2,
+-9,-38,-34,46,1,
+27,-6,19,-13,26,
+10,34,20,25,40,
+50,-6,-7,30,9,
+-24,0,-23,71,-61,
+22,58,-34,-4,2,
+-49,-33,25,30,-8,
+-6,-16,77,2,38,
+-8,-35,-6,-30,56,
+78,31,33,-20,13,
+-39,20,22,4,21,
+-8,4,-6,10,-83,
+-41,9,-25,-43,15,
+-7,-12,-34,-39,-37,
+-33,19,30,16,-33,
+42,-25,25,-68,44,
+-15,-11,-4,23,50,
+14,4,-39,-43,20,
+-30,60,9,-20,7,
+16,19,-33,37,29,
+16,-35,7,38,-27};
<p><p>1.19 +39 -10 speex/libspeex/quant_lsp.c
Index: quant_lsp.c
===================================================================
RCS file: /usr/local/cvsroot/speex/libspeex/quant_lsp.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- quant_lsp.c 6 Jan 2003 04:18:12 -0000 1.18
+++ quant_lsp.c 27 Jan 2003 22:09:39 -0000 1.19
@@ -116,22 +116,39 @@
#endif
quant_weight[i] = tmp1 > tmp2 ? tmp1 : tmp2;
}
+ for (i=0;i<order;i++)
+ qlsp[i]-=(.25*i+.25);
+ for (i=0;i<order;i++)
+ qlsp[i]*=256;
+
id = lsp_quant(qlsp, cdbk_nb, NB_CDBK_SIZE, order);
speex_bits_pack(bits, id, 6);
+ for (i=0;i<order;i++)
+ qlsp[i]*=2;
+
id = lsp_weight_quant(qlsp, quant_weight, cdbk_nb_low1, NB_CDBK_SIZE_LOW1, 5);
speex_bits_pack(bits, id, 6);
+ for (i=0;i<5;i++)
+ qlsp[i]*=2;
+
id = lsp_weight_quant(qlsp, quant_weight, cdbk_nb_low2, NB_CDBK_SIZE_LOW2, 5);
speex_bits_pack(bits, id, 6);
id = lsp_weight_quant(qlsp+5, quant_weight+5, cdbk_nb_high1, NB_CDBK_SIZE_HIGH1, 5);
speex_bits_pack(bits, id, 6);
+ for (i=5;i<10;i++)
+ qlsp[i]*=2;
+
id = lsp_weight_quant(qlsp+5, quant_weight+5, cdbk_nb_high2, NB_CDBK_SIZE_HIGH2, 5);
speex_bits_pack(bits, id, 6);
for (i=0;i<order;i++)
+ qlsp[i]*=.00097656;
+
+ for (i=0;i<order;i++)
qlsp[i]=lsp[i]-qlsp[i];
}
@@ -139,28 +156,28 @@
{
int i, id;
for (i=0;i<order;i++)
- lsp[i]=0;
+ lsp[i]=.25*i+.25;
id=speex_bits_unpack_unsigned(bits, 6);
for (i=0;i<10;i++)
- lsp[i] += cdbk_nb[id*10+i];
+ lsp[i] += 0.0039062*cdbk_nb[id*10+i];
id=speex_bits_unpack_unsigned(bits, 6);
for (i=0;i<5;i++)
- lsp[i] += cdbk_nb_low1[id*5+i];
+ lsp[i] += 0.0019531 * cdbk_nb_low1[id*5+i];
id=speex_bits_unpack_unsigned(bits, 6);
for (i=0;i<5;i++)
- lsp[i] += cdbk_nb_low2[id*5+i];
+ lsp[i] += 0.00097656 * cdbk_nb_low2[id*5+i];
id=speex_bits_unpack_unsigned(bits, 6);
for (i=0;i<5;i++)
- lsp[i+5] += cdbk_nb_high1[id*5+i];
+ lsp[i+5] += 0.0019531 * cdbk_nb_high1[id*5+i];
id=speex_bits_unpack_unsigned(bits, 6);
for (i=0;i<5;i++)
- lsp[i+5] += cdbk_nb_high2[id*5+i];
+ lsp[i+5] += 0.00097656 * cdbk_nb_high2[id*5+i];
}
@@ -186,9 +203,18 @@
#endif
quant_weight[i] = tmp1 > tmp2 ? tmp1 : tmp2;
}
+
+ for (i=0;i<order;i++)
+ qlsp[i]-=(.25*i+.25);
+ for (i=0;i<order;i++)
+ qlsp[i]*=256;
+
id = lsp_quant(qlsp, cdbk_nb, NB_CDBK_SIZE, order);
speex_bits_pack(bits, id, 6);
+ for (i=0;i<order;i++)
+ qlsp[i]*=2;
+
id = lsp_weight_quant(qlsp, quant_weight, cdbk_nb_low1, NB_CDBK_SIZE_LOW1, 5);
speex_bits_pack(bits, id, 6);
@@ -196,6 +222,9 @@
speex_bits_pack(bits, id, 6);
for (i=0;i<order;i++)
+ qlsp[i]*=0.0019531;
+
+ for (i=0;i<order;i++)
qlsp[i]=lsp[i]-qlsp[i];
}
@@ -203,20 +232,20 @@
{
int i, id;
for (i=0;i<order;i++)
- lsp[i]=0;
+ lsp[i]=.25*i+.25;
id=speex_bits_unpack_unsigned(bits, 6);
for (i=0;i<10;i++)
- lsp[i] += cdbk_nb[id*10+i];
+ lsp[i] += 0.0039062*cdbk_nb[id*10+i];
id=speex_bits_unpack_unsigned(bits, 6);
for (i=0;i<5;i++)
- lsp[i] += cdbk_nb_low1[id*5+i];
+ lsp[i] += 0.0019531*cdbk_nb_low1[id*5+i];
id=speex_bits_unpack_unsigned(bits, 6);
for (i=0;i<5;i++)
- lsp[i+5] += cdbk_nb_high1[id*5+i];
+ lsp[i+5] += 0.0019531*cdbk_nb_high1[id*5+i];
}
<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