[xiph-cvs] cvs commit: speex/libspeex gain_table.c gain_table_lbr.c ltp.c
Jean-Marc Valin
jm at xiph.org
Fri Jan 24 21:45:48 PST 2003
jm 03/01/25 00:45:48
Modified: libspeex gain_table.c gain_table_lbr.c ltp.c
Log:
Shrunk the pitch gain codebook by removing redundent data.
Revision Changes Path
1.6 +128 -128 speex/libspeex/gain_table.c
Index: gain_table.c
===================================================================
RCS file: /usr/local/cvsroot/speex/libspeex/gain_table.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gain_table.c 4 Jul 2002 21:55:06 -0000 1.5
+++ gain_table.c 25 Jan 2003 05:45:48 -0000 1.6
@@ -30,132 +30,132 @@
*/
float gain_cdbk_nb[] = {
-0,0,0,0,0,0,0,0,0,0,0,0,
-0.062755, -0.551342, 0.421540, 0.12551, -1.10268, 0.84308, 0.0691989, 0.464825, -0.0529075, -0.00393819, -0.303978, -0.177696,
--0.150363, 0.404424, 0.001225, -0.300726, 0.808848, 0.00245, 0.121621, -0.000990839, 0.000368389, -0.022609, -0.163559, -1.50062e-06,
--0.385059, 0.344518, -0.339050, -0.770118, 0.689036, -0.6781, 0.26532, 0.233618, -0.261109, -0.14827, -0.118693, -0.114955,
-0.253004, 0.922525, -0.134325, 0.506008, 1.84505, -0.26865, -0.466805, 0.247836, 0.0679695, -0.064011, -0.851052, -0.0180432,
-0.797711, 0.207298, -0.132452, 1.59542, 0.414596, -0.264904, -0.330728, 0.0549141, 0.211317, -0.636343, -0.0429725, -0.0175435,
--0.205284, 0.869993, 0.168836, -0.410568, 1.73999, 0.337672, 0.357191, -0.293772, 0.0693187, -0.0421415, -0.756888, -0.0285056,
-0.381250, 0.282361, 0.213362, 0.7625, 0.564722, 0.426724, -0.2153, -0.12049, -0.162689, -0.145352, -0.0797277, -0.0455233,
-0.511557, 0.726356, -0.411456, 1.02311, 1.45271, -0.822912, -0.743145, 0.597727, 0.420966, -0.261691, -0.527593, -0.169296,
-0.213205, -0.880939, -0.114481, 0.42641, -1.76188, -0.228962, 0.375641, -0.201702, 0.0488158, -0.0454564, -0.776054, -0.0131059,
--0.087361, 0.828807, 0.223046, -0.174722, 1.65761, 0.446092, 0.144811, -0.369724, 0.038971, -0.00763194, -0.686921, -0.0497495,
-0.203493, 0.809983, -0.176178, 0.406986, 1.61997, -0.352356, -0.329652, 0.285402, 0.071702, -0.0414094, -0.656072, -0.0310387,
-0.661478, 0.762294, -0.250586, 1.32296, 1.52459, -0.501172, -1.00848, 0.38204, 0.331514, -0.437553, -0.581092, -0.0627933,
--0.315981, -0.411233, 0.300318, -0.631962, -0.822466, 0.600636, -0.259884, 0.247001, 0.18979, -0.099844, -0.169113, -0.0901909,
--0.194221, 0.489564, 0.332354, -0.388442, 0.979128, 0.664708, 0.190167, -0.325417, 0.1291, -0.0377218, -0.239673, -0.110459,
-0.314585, 0.331551, -0.034170, 0.62917, 0.663102, -0.06834, -0.208602, 0.0226582, 0.0214987, -0.0989637, -0.109926, -0.00116759,
-0.714691, 0.503023, -0.211847, 1.42938, 1.00605, -0.423694, -0.719012, 0.213128, 0.30281, -0.510783, -0.253032, -0.0448792,
--0.077114, -0.046936, -0.034251, -0.154228, -0.093872, -0.068502, -0.00723885, -0.00321521, -0.00528246, -0.00594657, -0.00220299, -0.00117313,
-0.111448, 1.194711, 0.036302, 0.222896, 2.38942, 0.072604, -0.266296, -0.0867408, -0.00809157, -0.0124207, -1.42733, -0.00131784,
-0.591707, 0.440950, -0.478105, 1.18341, 0.8819, -0.95621, -0.521826, 0.421641, 0.565796, -0.350117, -0.194437, -0.228584,
-0.015255, 1.174960, -0.140954, 0.03051, 2.34992, -0.281908, -0.035848, 0.331231, 0.00430051, -0.000232715, -1.38053, -0.019868,
-0.135889, 0.968711, -0.179098, 0.271778, 1.93742, -0.358196, -0.263274, 0.346988, 0.0486749, -0.0184658, -0.938401, -0.0320761,
--0.167709, 0.904867, 0.283567, -0.335418, 1.80973, 0.567134, 0.303509, -0.513181, 0.0951135, -0.0281263, -0.818784, -0.0804102,
--0.015464, 0.519642, 0.302785, -0.030928, 1.03928, 0.60557, 0.0160715, -0.31468, 0.00936453, -0.000239135, -0.270028, -0.0916788,
-0.292544, 0.778571, -0.073074, 0.585088, 1.55714, -0.146148, -0.455533, 0.113787, 0.0427547, -0.085582, -0.606173, -0.00533981,
--0.223209, -0.647006, -0.201825, -0.446418, -1.29401, -0.40365, -0.288835, -0.261164, -0.0900983, -0.0498223, -0.418617, -0.0407333,
--0.060343, 0.879177, 0.109328, -0.120686, 1.75835, 0.218656, 0.106104, -0.192237, 0.0131944, -0.00364128, -0.772952, -0.0119526,
--0.065641, 0.331451, 0.192766, -0.131282, 0.662902, 0.385532, 0.0435136, -0.127785, 0.0253067, -0.00430874, -0.10986, -0.0371587,
-0.109450, 0.695144, 0.220786, 0.2189, 1.39029, 0.441572, -0.152167, -0.306956, -0.0483301, -0.0119793, -0.483225, -0.0487465,
--0.059634, -0.580311, -0.414489, -0.119268, -1.16062, -0.828978, -0.0692125, -0.481065, -0.0494353, -0.00355621, -0.336761, -0.171801,
--0.195686, 0.599741, 0.630645, -0.391372, 1.19948, 1.26129, 0.234722, -0.756447, 0.246817, -0.038293, -0.359689, -0.397713,
-0.151037, 0.275520, 0.128741, 0.302074, 0.55104, 0.257482, -0.0832274, -0.0709414, -0.0388893, -0.0228122, -0.0759113, -0.0165742,
-0.485775, 0.705795, -0.188048, 0.97155, 1.41159, -0.376096, -0.685715, 0.265447, 0.182698, -0.235977, -0.498147, -0.0353621,
--0.107445, -0.242973, 0.096488, -0.21489, -0.485946, 0.192976, -0.0522125, 0.046888, 0.0207343, -0.0115444, -0.0590359, -0.00930993,
-0.002256, 0.985752, -0.075257, 0.004512, 1.9715, -0.150514, -0.00444771, 0.148369, 0.00033956, -5.08954e-06, -0.971707, -0.00566362,
--0.009754, 0.731055, -0.211925, -0.019508, 1.46211, -0.42385, 0.0142614, 0.309858, -0.00413423, -9.51405e-05, -0.534441, -0.0449122,
-0.117978, 0.967401, -0.066418, 0.235956, 1.9348, -0.132836, -0.228264, 0.128506, 0.0156717, -0.0139188, -0.935865, -0.00441135,
--0.140817, 0.987609, 0.142895, -0.281634, 1.97522, 0.28579, 0.278144, -0.282249, 0.0402441, -0.0198294, -0.975372, -0.020419,
--0.275615, 0.847037, 0.439390, -0.55123, 1.69407, 0.87878, 0.466912, -0.744359, 0.242205, -0.0759636, -0.717472, -0.193064,
-0.159816, 0.534635, 0.178252, 0.319632, 1.06927, 0.356504, -0.170886, -0.1906, -0.056975, -0.0255412, -0.285835, -0.0317738,
-0.241865, 0.973769, -0.025038, 0.48373, 1.94754, -0.050076, -0.471041, 0.0487625, 0.0121116, -0.0584987, -0.948226, -0.000626901,
-0.390984, -0.437161, 0.067293, 0.781968, -0.874322, 0.134586, 0.341846, 0.0588358, -0.052621, -0.152868, -0.19111, -0.00452835,
--0.094812, 1.152626, 0.063490, -0.189624, 2.30525, 0.12698, 0.218566, -0.14636, 0.0120392, -0.00898932, -1.32855, -0.00403098,
--0.189819, 0.328223, 0.823244, -0.379638, 0.656446, 1.64649, 0.124606, -0.540415, 0.312535, -0.0360313, -0.10773, -0.677731,
-0.242738, 0.618335, -0.187829, 0.485476, 1.23667, -0.375658, -0.300187, 0.232282, 0.0911865, -0.0589217, -0.382338, -0.0352797,
--0.105747, -0.364308, -0.178488, -0.211494, -0.728616, -0.356976, -0.077049, -0.130049, -0.0377491, -0.0111824, -0.13272, -0.031858,
-0.332118, -0.050869, 0.907884, 0.664236, -0.101738, 1.81577, 0.033789, 0.0923663, -0.603049, -0.110302, -0.00258766, -0.824253,
-0.362725, 0.500717, -0.030776, 0.72545, 1.00143, -0.061552, -0.363245, 0.0308201, 0.0223264, -0.131569, -0.250718, -0.000947162,
-0.371470, 2.389027, -0.758519, 0.74294, 4.77805, -1.51704, -1.7749, 3.62424, 0.563534, -0.13799, -5.70745, -0.575351,
-0.613652, 0.255025, 0.153263, 1.2273, 0.51005, 0.306526, -0.312993, -0.0781718, -0.1881, -0.376569, -0.0650378, -0.0234895,
--0.078645, 1.023368, 0.014171, -0.15729, 2.04674, 0.028342, 0.160966, -0.0290043, 0.00222896, -0.00618504, -1.04728, -0.000200817,
-0.082268, 0.388670, -0.060537, 0.164536, 0.77734, -0.121074, -0.0639502, 0.0470578, 0.00996052, -0.00676802, -0.151064, -0.00366473,
--0.029138, 1.599227, -0.397880, -0.058276, 3.19845, -0.79576, 0.0931966, 1.2726, -0.0231869, -0.000849023, -2.55753, -0.158308,
--0.076498, 0.328396, -0.251380, -0.152996, 0.656792, -0.50276, 0.0502433, 0.165104, -0.0384601, -0.00585194, -0.107844, -0.0631919,
--0.117753, 0.772892, 0.476635, -0.235506, 1.54578, 0.95327, 0.182021, -0.736775, 0.11225, -0.0138658, -0.597362, -0.227181,
--0.011502, 0.592414, 0.409736, -0.023004, 1.18483, 0.819472, 0.0136279, -0.485467, 0.00942557, -0.000132296, -0.350954, -0.167884,
-0.359342, 0.495128, 0.183963, 0.718684, 0.990256, 0.367926, -0.355841, -0.18217, -0.132211, -0.129127, -0.245152, -0.0338424,
-0.177247, 1.581225, -0.008922, 0.354494, 3.16245, -0.017844, -0.560535, 0.0282154, 0.0031628, -0.0314165, -2.50027, -7.96021e-05,
-0.046118, 1.020201, 0.020504, 0.092236, 2.0404, 0.041008, -0.0940993, -0.0418364, -0.00189121, -0.00212687, -1.04081, -0.000420414,
--0.358123, 0.680523, 0.484358, -0.716246, 1.36105, 0.968716, 0.487422, -0.659234, 0.346919, -0.128252, -0.463112, -0.234603,
--0.011173, 0.928046, 0.156119, -0.022346, 1.85609, 0.312238, 0.0207381, -0.289771, 0.00348864, -0.000124836, -0.861269, -0.0243731,
--0.283681, -0.020872, -0.236879, -0.567362, -0.041744, -0.473758, -0.011842, -0.00988828, -0.134396, -0.0804749, -0.00043564, -0.0561117,
--0.288344, 1.344203, 1.297906, -0.576688, 2.68841, 2.59581, 0.775186, -3.4893, 0.748487, -0.0831423, -1.80688, -1.68456,
-0.478199, 0.426105, -0.180429, 0.956398, 0.85221, -0.360858, -0.407526, 0.153763, 0.172562, -0.228674, -0.181565, -0.0325546,
-0.437023, 0.843117, -0.117708, 0.874046, 1.68623, -0.235416, -0.736923, 0.198483, 0.102882, -0.190989, -0.710846, -0.0138552,
--0.102861, -0.531496, 0.116496, -0.205722, -1.06299, 0.232992, -0.10934, 0.123834, 0.0239658, -0.0105804, -0.282488, -0.0135713,
--0.022004, 0.517811, 0.094120, -0.044008, 1.03562, 0.18824, 0.0227878, -0.0974727, 0.00414203, -0.000484176, -0.268128, -0.00885857,
-0.124500, 0.135515, 0.109872, 0.249, 0.27103, 0.219744, -0.0337432, -0.0297786, -0.0273581, -0.0155003, -0.0183643, -0.0120719,
-0.324995, 0.830981, -0.197011, 0.64999, 1.66196, -0.394022, -0.540129, 0.327425, 0.128055, -0.105622, -0.690529, -0.0388133,
-0.110316, -0.205667, 0.206492, 0.220632, -0.411334, 0.412984, 0.0453767, 0.0849372, -0.0455587, -0.0121696, -0.0422989, -0.0426389,
--0.178459, 2.136809, 0.256389, -0.356918, 4.27362, 0.512778, 0.762666, -1.09571, 0.0915098, -0.0318476, -4.56595, -0.0657353,
-0.571335, 0.167367, 0.520906, 1.14267, 0.334734, 1.04181, -0.191245, -0.174365, -0.595224, -0.326424, -0.0280117, -0.271343,
-0.254870, 0.667184, -0.012582, 0.50974, 1.33437, -0.025164, -0.34009, 0.016789, 0.00641355, -0.0649587, -0.445134, -0.000158307,
-0.294991, -1.045667, 0.441186, 0.589982, -2.09133, 0.882372, 0.616925, 0.922667, -0.260292, -0.0870197, -1.09342, -0.194645,
--0.084671, 1.012571, 0.272680, -0.169342, 2.02514, 0.54536, 0.171471, -0.552216, 0.0461762, -0.00716918, -1.0253, -0.0743544,
-0.107486, 1.072982, -0.479951, 0.214972, 2.14596, -0.959902, -0.230661, 1.02996, 0.103176, -0.0115532, -1.15129, -0.230353,
--0.059855, 0.872191, 0.013070, -0.11971, 1.74438, 0.02614, 0.10441, -0.0227991, 0.00156461, -0.00358262, -0.760717, -0.000170825,
--0.334498, -0.377732, -0.090863, -0.668996, -0.755464, -0.181726, -0.252701, -0.0686437, -0.060787, -0.111889, -0.142681, -0.00825608,
--0.148432, 0.445259, 0.560717, -0.296864, 0.890518, 1.12143, 0.132181, -0.499329, 0.166457, -0.0220321, -0.198256, -0.314404,
--0.011102, 0.706627, 0.037709, -0.022204, 1.41325, 0.075418, 0.0156899, -0.0532924, 0.000837291, -0.000123254, -0.499322, -0.00142197,
-1.264755, 1.312855, -0.972929, 2.52951, 2.62571, -1.94586, -3.32088, 2.55463, 2.46103, -1.59961, -1.72359, -0.946591,
-0.427258, 0.028012, 0.270659, 0.854516, 0.056024, 0.541318, -0.0239367, -0.0151634, -0.231282, -0.182549, -0.000784672, -0.0732563,
-0.508489, 1.095174, -0.126054, 1.01698, 2.19035, -0.252108, -1.11377, 0.276102, 0.128194, -0.258561, -1.19941, -0.0158896,
-0.138141, 0.689060, -0.066889, 0.276282, 1.37812, -0.133778, -0.190375, 0.0921811, 0.0184802, -0.0190829, -0.474804, -0.00447414,
-0.227053, 1.125286, -0.234592, 0.454106, 2.25057, -0.469184, -0.510999, 0.527966, 0.10653, -0.0515531, -1.26627, -0.0550334,
--0.073214, -0.138420, -0.109450, -0.146428, -0.27684, -0.2189, -0.0202686, -0.0303001, -0.0160265, -0.00536029, -0.0191601, -0.0119793,
--0.259768, 1.034736, 0.500517, -0.519536, 2.06947, 1.00103, 0.537583, -1.03581, 0.260037, -0.0674794, -1.07068, -0.250517,
-0.224840, 0.384070, 0.434633, 0.44968, 0.76814, 0.869266, -0.172709, -0.333859, -0.195446, -0.050553, -0.14751, -0.188906,
-0.251096, 0.766042, 0.076803, 0.502192, 1.53208, 0.153606, -0.3847, -0.117669, -0.0385699, -0.0630492, -0.58682, -0.0058987,
-0.969989, 0.576600, -0.472454, 1.93998, 1.1532, -0.944908, -1.11859, 0.544834, 0.91655, -0.940879, -0.332468, -0.223213,
-0.567736, 1.250295, -0.561253, 1.13547, 2.50059, -1.12251, -1.41967, 1.40346, 0.637287, -0.322324, -1.56324, -0.315005,
--0.173068, 0.670076, 0.328527, -0.346136, 1.34015, 0.657054, 0.231937, -0.440276, 0.113715, -0.0299525, -0.449002, -0.10793,
-0.218455, 0.793616, 0.266100, 0.43691, 1.58723, 0.5322, -0.346739, -0.422362, -0.116262, -0.0477226, -0.629826, -0.0708092,
-0.136564, -0.461201, -0.110116, 0.273128, -0.922402, -0.220232, 0.125967, -0.101571, 0.0300758, -0.0186497, -0.212706, -0.0121255,
--0.161192, 0.652356, 0.476224, -0.322384, 1.30471, 0.952448, 0.210309, -0.621335, 0.153527, -0.0259829, -0.425568, -0.226789,
-0.164136, 0.302808, 0.290994, 0.328272, 0.605616, 0.581988, -0.0994034, -0.176231, -0.0955252, -0.0269406, -0.0916927, -0.0846775,
-0.355293, 0.698620, -0.238562, 0.710586, 1.39724, -0.477124, -0.49643, 0.333328, 0.169519, -0.126233, -0.48807, -0.0569118,
-0.139048, -0.472423, 0.129851, 0.278096, -0.944846, 0.259702, 0.131379, 0.122689, -0.036111, -0.0193343, -0.223183, -0.0168613,
--0.189859, 1.431454, 0.173670, -0.379718, 2.86291, 0.34734, 0.543549, -0.497201, 0.0659456, -0.0360464, -2.04906, -0.0301613,
-0.218201, 0.458996, -0.307158, 0.436402, 0.917992, -0.614316, -0.200307, 0.281969, 0.134044, -0.0476117, -0.210677, -0.094346,
-0.155604, 0.848000, -0.058913, 0.311208, 1.696, -0.117826, -0.263904, 0.0999164, 0.0183342, -0.0242126, -0.719104, -0.00347074,
--0.665377, 1.397551, 0.745416, -1.33075, 2.7951, 1.49083, 1.8598, -2.08351, 0.991965, -0.442727, -1.95315, -0.555645,
-0.195905, 0.549550, 0.654307, 0.39181, 1.0991, 1.30861, -0.215319, -0.719149, -0.256364, -0.0383788, -0.302005, -0.428118,
-0.046667, 0.861746, -0.097261, 0.093334, 1.72349, -0.194522, -0.0804302, 0.167629, 0.00907776, -0.00217781, -0.742606, -0.0094597,
-0.423542, -0.468622, -0.290162, 0.847084, -0.937244, -0.580324, 0.396962, -0.271953, 0.245792, -0.179388, -0.219607, -0.084194,
--0.298927, 1.125929, 0.217439, -0.597854, 2.25186, 0.434878, 0.673141, -0.489642, 0.129997, -0.0893574, -1.26772, -0.0472797,
--0.149400, 0.696023, 0.131298, -0.2988, 1.39205, 0.262596, 0.207972, -0.182773, 0.0392318, -0.0223204, -0.484448, -0.0172392,
--0.036852, 0.717124, 0.193478, -0.073704, 1.43425, 0.386956, 0.0528549, -0.277495, 0.0142601, -0.00135807, -0.514267, -0.0374337,
--0.370020, -0.668003, 0.089119, -0.74004, -1.33601, 0.178238, -0.494349, 0.119064, 0.0659516, -0.136915, -0.446228, -0.0079422,
-0.097258, 0.995974, 0.727015, 0.194516, 1.99195, 1.45403, -0.193733, -1.44818, -0.141416, -0.00945912, -0.991964, -0.528551,
-0.099711, 0.763332, 0.051975, 0.199422, 1.52666, 0.10395, -0.152225, -0.0793484, -0.010365, -0.00994228, -0.582676, -0.0027014,
-0.397417, 0.940052, -0.307845, 0.794834, 1.8801, -0.61569, -0.747185, 0.578781, 0.244686, -0.15794, -0.883698, -0.0947685,
-0.314526, 0.024086, 0.573651, 0.629052, 0.048172, 1.1473, -0.0151513, -0.0276339, -0.360856, -0.0989266, -0.000580135, -0.329075,
-0.422973, -0.249544, 0.425072, 0.845946, -0.499088, 0.850144, 0.211101, 0.212148, -0.359588, -0.178906, -0.0622722, -0.180686,
-0.537855, 0.533196, -0.168307, 1.07571, 1.06639, -0.336614, -0.573564, 0.179481, 0.18105, -0.289288, -0.284298, -0.0283272,
-0.828189, 0.742845, 0.744092, 1.65638, 1.48569, 1.48818, -1.23043, -1.10549, -1.2325, -0.685897, -0.551819, -0.553673,
-0.110322, -0.209465, -0.004052, 0.220644, -0.41893, -0.008104, 0.0462172, -0.0016975, 0.000894049, -0.0121709, -0.0438756, -1.64187e-05,
--0.164941, 0.780225, 0.337240, -0.329882, 1.56045, 0.67448, 0.257382, -0.526246, 0.111249, -0.0272055, -0.608751, -0.113731,
-0.647682, 0.506853, 0.477262, 1.29536, 1.01371, 0.954524, -0.656559, -0.483803, -0.618228, -0.419492, -0.2569, -0.227779,
-0.481078, 0.614996, 0.027556, 0.962156, 1.22999, 0.055112, -0.591722, -0.0338937, -0.0265132, -0.231436, -0.37822, -0.000759333,
-0.797248, -0.254371, 0.438093, 1.5945, -0.508742, 0.876186, 0.405594, 0.222876, -0.698538, -0.635604, -0.0647046, -0.191925,
-0.057783, 0.892067, 0.048618, 0.115566, 1.78413, 0.097236, -0.103093, -0.086741, -0.00561859, -0.00333888, -0.795784, -0.00236371,
-0.157052, 0.505817, 0.019286, 0.314104, 1.01163, 0.038572, -0.158879, -0.0195104, -0.00605781, -0.0246653, -0.255851, -0.00037195,
--0.006495, 0.763456, 0.341807, -0.01299, 1.52691, 0.683614, 0.00991729, -0.521909, 0.00444007, -4.2185e-05, -0.582865, -0.116832,
--0.505296, -0.145069, -0.462940, -1.01059, -0.290138, -0.92588, -0.146606, -0.134316, -0.467843, -0.255324, -0.021045, -0.214313,
--0.309828, 0.736220, 0.746342, -0.619656, 1.47244, 1.49268, 0.456203, -1.09894, 0.462475, -0.0959934, -0.54202, -0.557026,
-0.036447, 0.151773, 0.000962, 0.072894, 0.303546, 0.001924, -0.0110633, -0.000292011, -7.0124e-05, -0.00132838, -0.023035, -9.25444e-07,
-0.393744, 0.638035, -0.094556, 0.787488, 1.27607, -0.189112, -0.502445, 0.12066, 0.0744617, -0.155034, -0.407089, -0.00894084,
+0,0,0,
+0.062755, -0.551342, 0.421540,
+-0.150363, 0.404424, 0.001225,
+-0.385059, 0.344518, -0.339050,
+0.253004, 0.922525, -0.134325,
+0.797711, 0.207298, -0.132452,
+-0.205284, 0.869993, 0.168836,
+0.381250, 0.282361, 0.213362,
+0.511557, 0.726356, -0.411456,
+0.213205, -0.880939, -0.114481,
+-0.087361, 0.828807, 0.223046,
+0.203493, 0.809983, -0.176178,
+0.661478, 0.762294, -0.250586,
+-0.315981, -0.411233, 0.300318,
+-0.194221, 0.489564, 0.332354,
+0.314585, 0.331551, -0.034170,
+0.714691, 0.503023, -0.211847,
+-0.077114, -0.046936, -0.034251,
+0.111448, 1.194711, 0.036302,
+0.591707, 0.440950, -0.478105,
+0.015255, 1.174960, -0.140954,
+0.135889, 0.968711, -0.179098,
+-0.167709, 0.904867, 0.283567,
+-0.015464, 0.519642, 0.302785,
+0.292544, 0.778571, -0.073074,
+-0.223209, -0.647006, -0.201825,
+-0.060343, 0.879177, 0.109328,
+-0.065641, 0.331451, 0.192766,
+0.109450, 0.695144, 0.220786,
+-0.059634, -0.580311, -0.414489,
+-0.195686, 0.599741, 0.630645,
+0.151037, 0.275520, 0.128741,
+0.485775, 0.705795, -0.188048,
+-0.107445, -0.242973, 0.096488,
+0.002256, 0.985752, -0.075257,
+-0.009754, 0.731055, -0.211925,
+0.117978, 0.967401, -0.066418,
+-0.140817, 0.987609, 0.142895,
+-0.275615, 0.847037, 0.439390,
+0.159816, 0.534635, 0.178252,
+0.241865, 0.973769, -0.025038,
+0.390984, -0.437161, 0.067293,
+-0.094812, 1.152626, 0.063490,
+-0.189819, 0.328223, 0.823244,
+0.242738, 0.618335, -0.187829,
+-0.105747, -0.364308, -0.178488,
+0.332118, -0.050869, 0.907884,
+0.362725, 0.500717, -0.030776,
+0.371470, 2.389027, -0.758519,
+0.613652, 0.255025, 0.153263,
+-0.078645, 1.023368, 0.014171,
+0.082268, 0.388670, -0.060537,
+-0.029138, 1.599227, -0.397880,
+-0.076498, 0.328396, -0.251380,
+-0.117753, 0.772892, 0.476635,
+-0.011502, 0.592414, 0.409736,
+0.359342, 0.495128, 0.183963,
+0.177247, 1.581225, -0.008922,
+0.046118, 1.020201, 0.020504,
+-0.358123, 0.680523, 0.484358,
+-0.011173, 0.928046, 0.156119,
+-0.283681, -0.020872, -0.236879,
+-0.288344, 1.344203, 1.297906,
+0.478199, 0.426105, -0.180429,
+0.437023, 0.843117, -0.117708,
+-0.102861, -0.531496, 0.116496,
+-0.022004, 0.517811, 0.094120,
+0.124500, 0.135515, 0.109872,
+0.324995, 0.830981, -0.197011,
+0.110316, -0.205667, 0.206492,
+-0.178459, 2.136809, 0.256389,
+0.571335, 0.167367, 0.520906,
+0.254870, 0.667184, -0.012582,
+0.294991, -1.045667, 0.441186,
+-0.084671, 1.012571, 0.272680,
+0.107486, 1.072982, -0.479951,
+-0.059855, 0.872191, 0.013070,
+-0.334498, -0.377732, -0.090863,
+-0.148432, 0.445259, 0.560717,
+-0.011102, 0.706627, 0.037709,
+1.264755, 1.312855, -0.972929,
+0.427258, 0.028012, 0.270659,
+0.508489, 1.095174, -0.126054,
+0.138141, 0.689060, -0.066889,
+0.227053, 1.125286, -0.234592,
+-0.073214, -0.138420, -0.109450,
+-0.259768, 1.034736, 0.500517,
+0.224840, 0.384070, 0.434633,
+0.251096, 0.766042, 0.076803,
+0.969989, 0.576600, -0.472454,
+0.567736, 1.250295, -0.561253,
+-0.173068, 0.670076, 0.328527,
+0.218455, 0.793616, 0.266100,
+0.136564, -0.461201, -0.110116,
+-0.161192, 0.652356, 0.476224,
+0.164136, 0.302808, 0.290994,
+0.355293, 0.698620, -0.238562,
+0.139048, -0.472423, 0.129851,
+-0.189859, 1.431454, 0.173670,
+0.218201, 0.458996, -0.307158,
+0.155604, 0.848000, -0.058913,
+-0.665377, 1.397551, 0.745416,
+0.195905, 0.549550, 0.654307,
+0.046667, 0.861746, -0.097261,
+0.423542, -0.468622, -0.290162,
+-0.298927, 1.125929, 0.217439,
+-0.149400, 0.696023, 0.131298,
+-0.036852, 0.717124, 0.193478,
+-0.370020, -0.668003, 0.089119,
+0.097258, 0.995974, 0.727015,
+0.099711, 0.763332, 0.051975,
+0.397417, 0.940052, -0.307845,
+0.314526, 0.024086, 0.573651,
+0.422973, -0.249544, 0.425072,
+0.537855, 0.533196, -0.168307,
+0.828189, 0.742845, 0.744092,
+0.110322, -0.209465, -0.004052,
+-0.164941, 0.780225, 0.337240,
+0.647682, 0.506853, 0.477262,
+0.481078, 0.614996, 0.027556,
+0.797248, -0.254371, 0.438093,
+0.057783, 0.892067, 0.048618,
+0.157052, 0.505817, 0.019286,
+-0.006495, 0.763456, 0.341807,
+-0.505296, -0.145069, -0.462940,
+-0.309828, 0.736220, 0.746342,
+0.036447, 0.151773, 0.000962,
+0.393744, 0.638035, -0.094556,
};
<p><p>1.4 +32 -32 speex/libspeex/gain_table_lbr.c
Index: gain_table_lbr.c
===================================================================
RCS file: /usr/local/cvsroot/speex/libspeex/gain_table_lbr.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gain_table_lbr.c 4 Jul 2002 21:55:06 -0000 1.3
+++ gain_table_lbr.c 25 Jan 2003 05:45:48 -0000 1.4
@@ -30,36 +30,36 @@
*/
float gain_cdbk_lbr[] = {
-0,0,0,0,0,0,0,0,0,0,0,0,
-0.019578, -0.411369, 0.250244, 0.039156, -0.822738, 0.500488, 0.0161076, 0.205885, -0.00979855, -0.000383298, -0.169224, -0.0626221,
--0.141413, 0.127455, -0.177373, -0.282826, 0.25491, -0.354746, 0.0360476, 0.0452142, -0.0501657, -0.0199976, -0.0162448, -0.0314612,
--0.379174, 0.154715, -0.359933, -0.758348, 0.30943, -0.719866, 0.117328, 0.111374, -0.272954, -0.143773, -0.0239367, -0.129552,
-0.295340, 1.014952, -0.144606, 0.59068, 2.0299, -0.289212, -0.599512, 0.293536, 0.0854159, -0.0872257, -1.03013, -0.0209109,
-0.431555, -0.107415, 0.360701, 0.86311, -0.21483, 0.721402, 0.092711, 0.0774894, -0.311325, -0.18624, -0.011538, -0.130105,
--0.141305, 0.735394, 0.312635, -0.28261, 1.47079, 0.62527, 0.20783, -0.45982, 0.0883538, -0.0199671, -0.540804, -0.0977406,
-0.382416, 0.267769, 0.318738, 0.764832, 0.535538, 0.637476, -0.204798, -0.170696, -0.243781, -0.146242, -0.0717002, -0.101594,
-0.511146, 0.524061, -0.190435, 1.02229, 1.04812, -0.38087, -0.535743, 0.199599, 0.19468, -0.26127, -0.27464, -0.0362655,
-0.153482, -0.531485, -0.149959, 0.306964, -1.06297, -0.299918, 0.163147, -0.159402, 0.046032, -0.0235567, -0.282476, -0.0224877,
--0.094091, 0.930054, 0.139366, -0.188182, 1.86011, 0.278732, 0.175019, -0.259236, 0.0262262, -0.00885312, -0.865, -0.0194229,
-0.164167, 0.711936, -0.077780, 0.328334, 1.42387, -0.15556, -0.233753, 0.110749, 0.0255378, -0.0269508, -0.506853, -0.00604973,
-0.503705, 0.823130, -0.273699, 1.00741, 1.64626, -0.547398, -0.829229, 0.45058, 0.275727, -0.253719, -0.677543, -0.0749111,
--0.330264, -0.613346, 0.085310, -0.660528, -1.22669, 0.17062, -0.405132, 0.104649, 0.0563496, -0.109074, -0.376193, -0.0072778,
--0.083597, 0.481953, 0.201470, -0.167194, 0.963906, 0.40294, 0.0805796, -0.194198, 0.0336846, -0.00698846, -0.232279, -0.0405902,
-0.195682, 0.429066, 0.059682, 0.391364, 0.858132, 0.119364, -0.167921, -0.051215, -0.0233574, -0.0382914, -0.184098, -0.00356194,
-0.598746, 1.523378, -0.189717, 1.19749, 3.04676, -0.379434, -1.82423, 0.578021, 0.227185, -0.358497, -2.32068, -0.0359925,
--0.010502, -0.257728, -0.018047, -0.021004, -0.515456, -0.036094, -0.00541332, -0.00930243, -0.000379059, -0.000110292, -0.0664237, -0.000325694,
--0.132438, 1.383543, 0.280042, -0.264876, 2.76709, 0.560084, 0.366467, -0.7749, 0.0741764, -0.0175398, -1.91419, -0.0784235,
-0.234771, 0.555249, -0.210053, 0.469542, 1.1105, -0.420106, -0.260713, 0.233263, 0.0986287, -0.0551174, -0.308301, -0.0441223,
-0.010973, 1.090455, -0.009557, 0.021946, 2.18091, -0.019114, -0.0239311, 0.020843, 0.000209738, -0.000120407, -1.18909, -9.13362e-05,
-0.141315, 0.930896, -0.128939, 0.28263, 1.86179, -0.257878, -0.263099, 0.240058, 0.036442, -0.0199699, -0.866567, -0.0166253,
--0.168645, 0.950529, 0.314244, -0.33729, 1.90106, 0.628488, 0.320604, -0.597396, 0.105991, -0.0284411, -0.903505, -0.0987493,
--0.028768, 0.695554, 0.133637, -0.057536, 1.39111, 0.267274, 0.0400194, -0.185903, 0.00768894, -0.000827598, -0.483795, -0.0178588,
-0.246305, 0.740436, 0.073124, 0.49261, 1.48087, 0.146248, -0.364746, -0.108287, -0.0360216, -0.0606662, -0.548245, -0.00534712,
-0.280190, -0.787092, 0.268726, 0.56038, -1.57418, 0.537452, 0.441071, 0.423024, -0.150589, -0.0785064, -0.619514, -0.0722137,
-0.010162, 0.894487, 0.006648, 0.020324, 1.78897, 0.013296, -0.0181796, -0.0118931, -0.000135114, -0.000103266, -0.800107, -4.41959e-05,
-0.177218, 0.572144, 0.427882, 0.354436, 1.14429, 0.855764, -0.202788, -0.48962, -0.151657, -0.0314062, -0.327349, -0.183083,
--0.237882, -0.484537, -0.303846, -0.475764, -0.969074, -0.607692, -0.230525, -0.294449, -0.144559, -0.0565878, -0.234776, -0.0923224,
--0.211570, 0.684685, 0.539195, -0.42314, 1.36937, 1.07839, 0.289718, -0.738357, 0.228155, -0.0447619, -0.468794, -0.290731,
-0.064373, 0.236576, 0.042304, 0.128746, 0.473152, 0.084608, -0.0304582, -0.0200162, -0.00544647, -0.00414388, -0.0559682, -0.00178963,
-0.347794, 0.726175, -0.126887, 0.695588, 1.45235, -0.253774, -0.505119, 0.184284, 0.0882611, -0.120961, -0.52733, -0.0161003,
+0,0,0,
+0.019578, -0.411369, 0.250244,
+-0.141413, 0.127455, -0.177373,
+-0.379174, 0.154715, -0.359933,
+0.295340, 1.014952, -0.144606,
+0.431555, -0.107415, 0.360701,
+-0.141305, 0.735394, 0.312635,
+0.382416, 0.267769, 0.318738,
+0.511146, 0.524061, -0.190435,
+0.153482, -0.531485, -0.149959,
+-0.094091, 0.930054, 0.139366,
+0.164167, 0.711936, -0.077780,
+0.503705, 0.823130, -0.273699,
+-0.330264, -0.613346, 0.085310,
+-0.083597, 0.481953, 0.201470,
+0.195682, 0.429066, 0.059682,
+0.598746, 1.523378, -0.189717,
+-0.010502, -0.257728, -0.018047,
+-0.132438, 1.383543, 0.280042,
+0.234771, 0.555249, -0.210053,
+0.010973, 1.090455, -0.009557,
+0.141315, 0.930896, -0.128939,
+-0.168645, 0.950529, 0.314244,
+-0.028768, 0.695554, 0.133637,
+0.246305, 0.740436, 0.073124,
+0.280190, -0.787092, 0.268726,
+0.010162, 0.894487, 0.006648,
+0.177218, 0.572144, 0.427882,
+-0.237882, -0.484537, -0.303846,
+-0.211570, 0.684685, 0.539195,
+0.064373, 0.236576, 0.042304,
+0.347794, 0.726175, -0.126887,
};
<p><p>1.72 +19 -15 speex/libspeex/ltp.c
Index: ltp.c
===================================================================
RCS file: /usr/local/cvsroot/speex/libspeex/ltp.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- ltp.c 23 Jan 2003 07:29:39 -0000 1.71
+++ ltp.c 25 Jan 2003 05:45:48 -0000 1.72
@@ -215,7 +215,6 @@
A[i][j]=A[j][i]=inner_prod(x[i],x[j],nsf);
{
- int j;
float C[9];
float *ptr=gain_cdbk;
int best_cdbk=0;
@@ -233,9 +232,18 @@
for (i=0;i<gain_cdbk_size;i++)
{
float sum=0;
- ptr = gain_cdbk+12*i;
- for (j=0;j<9;j++)
- sum+=C[j]*ptr[j+3];
+ ptr = gain_cdbk+3*i;
+ sum += C[0]*ptr[0];
+ sum += C[1]*ptr[1];
+ sum += C[2]*ptr[2];
+ sum -= C[3]*ptr[0]*ptr[1];
+ sum -= C[4]*ptr[2]*ptr[1];
+ sum -= C[5]*ptr[2]*ptr[0];
+ sum -= .5*C[6]*ptr[0]*ptr[0];
+ sum -= .5*C[7]*ptr[1]*ptr[1];
+ sum -= .5*C[8]*ptr[2]*ptr[2];
+
+ /* If 1, force "safe" pitch values to handle packet loss better */
if (0) {
float tot = fabs(ptr[1]);
if (ptr[0]>0)
@@ -245,20 +253,16 @@
if (tot>1)
continue;
}
- if (0) {
- float tot=ptr[0]+ptr[1]+ptr[2];
- if (tot < 1.1)
- sum *= 1+.15*tot;
- }
+
if (sum>best_sum || i==0)
{
best_sum=sum;
best_cdbk=i;
}
}
- gain[0] = gain_cdbk[best_cdbk*12];
- gain[1] = gain_cdbk[best_cdbk*12+1];
- gain[2] = gain_cdbk[best_cdbk*12+2];
+ gain[0] = gain_cdbk[best_cdbk*3];
+ gain[1] = gain_cdbk[best_cdbk*3+1];
+ gain[2] = gain_cdbk[best_cdbk*3+2];
*cdbk_index=best_cdbk;
}
@@ -433,9 +437,9 @@
pitch += start;
gain_index = speex_bits_unpack_unsigned(bits, params->gain_bits);
/*printf ("decode pitch: %d %d\n", pitch, gain_index);*/
- gain[0] = gain_cdbk[gain_index*12];
- gain[1] = gain_cdbk[gain_index*12+1];
- gain[2] = gain_cdbk[gain_index*12+2];
+ gain[0] = gain_cdbk[gain_index*3];
+ gain[1] = gain_cdbk[gain_index*3+1];
+ gain[2] = gain_cdbk[gain_index*3+2];
if (count_lost && pitch > subframe_offset)
{
<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