Wideband almost done but buggy...
authorjmvalin <jmvalin@0101bb08-14d6-0310-b084-bc0e0c8e3800>
Mon, 18 Mar 2002 05:25:25 +0000 (05:25 +0000)
committerjmvalin <jmvalin@0101bb08-14d6-0310-b084-bc0e0c8e3800>
Mon, 18 Mar 2002 05:25:25 +0000 (05:25 +0000)
git-svn-id: http://svn.xiph.org/trunk/speex@3162 0101bb08-14d6-0310-b084-bc0e0c8e3800

libspeex/Makefile.am
libspeex/cb_search.c
libspeex/exc_gains_wb_table.c [new file with mode: 0644]
libspeex/exc_wb_table.c
libspeex/modes.c
libspeex/speex.c

index 9ec1b49..3fba14c 100644 (file)
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in. -*-Makefile-*-
 
-# $Id: Makefile.am,v 1.13 2002/03/15 07:30:24 jmvalin Exp $
+# $Id: Makefile.am,v 1.14 2002/03/18 05:25:25 jmvalin Exp $
 
 # Disable automatic dependency tracking if using other tools than gcc and gmake
 #AUTOMAKE_OPTIONS = no-dependencies
@@ -24,8 +24,10 @@ libspeex_la_SOURCES = speex.c \
        exc_table.c \
        exc_wb_table.c \
        exc_gains_table.c \
+       exc_gains_wb_table.c \
        vq.c
 
+
 include_HEADERS = speex.h \
        bits.h \
        modes.h
index 2b4db2c..d1cad93 100644 (file)
@@ -223,7 +223,7 @@ float *stack
       int best_vq_index=0, max_index;
       float max_gain=0, log_max, min_dist=0, *sign;
 
-      if (gain_cb) /*If no gain codebok, do not quantize (for testing/debugging) */
+      if (gain_cb) /*If no gain codebook, do not quantize (for testing/debugging) */
       {
          sign = PUSH(stack, nb_subvect);
          for (i=0;i<nb_subvect;i++)
@@ -251,18 +251,33 @@ float *stack
          frame_bits_pack(bits,max_index,3);
 
          /*Vector quantize gains[i]*/
+#if 1
          best_vq_index = vq_index(gains, gain_cb, nb_subvect, gain_cb_size);
          frame_bits_pack(bits,best_vq_index,params->gain_bits);
-
          printf ("best_gains_vq_index %d %f %d\n", best_vq_index, min_dist, max_index);
-
          for (i=0;i<nb_subvect;i++)
             gains[i]= sign[i]*gain_cb[best_vq_index*nb_subvect+i]/max_gain/(Ee[ind[i]]+.001);
+#else
+         best_vq_index = vq_index(gains, gain_cb, nb_subvect/2, gain_cb_size);
+         frame_bits_pack(bits,best_vq_index,params->gain_bits);
+         printf ("best_gains_vq_index %d %f %d\n", best_vq_index, min_dist, max_index);
+         for (i=0;i<nb_subvect/2;i++)
+            gains[i]= sign[i]*gain_cb[best_vq_index*nb_subvect+i]/max_gain/(Ee[ind[i]]+.001);
+
+         best_vq_index = vq_index(gains+5, gain_cb, nb_subvect/2, gain_cb_size);
+         frame_bits_pack(bits,best_vq_index,params->gain_bits);
+         printf ("best_gains_vq_index %d %f %d\n", best_vq_index, min_dist, max_index);
+         for (i=0;i<nb_subvect/2;i++)
+            gains[i+5]= sign[i+5]*gain_cb[best_vq_index*nb_subvect+i]/max_gain/(Ee[ind[i+5]]+.001);
+#endif
     
 
          POP(stack);
       } else {
-
+         printf ("exc: ");
+         for (i=0;i<nb_subvect;i++)
+            printf ("%f ", gains[i]);
+         printf ("\n");
          for (i=0;i<nb_subvect;i++)
             gains[i]= gains[i]/(Ee[ind[i]]+.001);
       }
diff --git a/libspeex/exc_gains_wb_table.c b/libspeex/exc_gains_wb_table.c
new file mode 100644 (file)
index 0000000..eb2ea1e
--- /dev/null
@@ -0,0 +1,256 @@
+float exc_gains_wb_table[256][5]={{0,0,0,0,0},
+{0.182741,0.173211,0.18772,0.339072,0.19244},
+{0.0785705,0.0694257,0.0659853,0.0656197,0.0780267},
+{0.334227,0.362773,0.816178,1.42947,0.446182},
+{0.807808,0.718436,0.265968,0.258087,0.245452},
+{1.0705,0.359971,0.343867,0.607815,0.323286},
+{0.412248,0.259434,0.297784,0.656538,0.282031},
+{0.228488,0.233462,0.226318,0.213071,0.615172},
+{1.02755,1.02637,0.393747,0.303968,0.321669},
+{0.686858,0.486882,0.771728,1.08226,0.396834},
+{1.45332,0.683205,0.477046,0.461403,0.869789},
+{0.709118,0.1928,0.164951,0.159949,0.15203},
+{0.427995,0.525121,1.2778,0.745214,1.37293},
+{0.476313,0.806508,0.931422,1.34594,0.671121},
+{0.400884,1.3341,0.358803,0.332999,0.306268},
+{0.497816,0.74164,0.33876,0.629356,0.596944},
+{1.38143,0.521405,0.910426,0.434664,0.379752},
+{0.590784,0.321094,0.31763,0.348776,1.04293},
+{0.460382,1.16719,0.976714,0.861867,0.450711},
+{0.375061,0.690823,0.422769,1.00722,0.965644},
+{0.40974,0.691819,0.802724,0.958305,0.462125},
+{0.440287,0.892113,1.38045,1.19686,0.450153},
+{0.727229,0.269052,0.492156,0.256913,0.26407},
+{0.737566,0.926689,0.408083,0.394474,0.804539},
+{1.35145,0.551643,0.957903,1.04461,0.588706},
+{0.879871,0.912191,0.657896,1.01061,0.42593},
+{0.909919,0.373884,0.294972,0.31421,0.440197},
+{0.458094,0.371505,0.416061,1.27409,0.376035},
+{0.740847,0.824297,0.965983,0.659209,0.768914},
+{0.784484,1.33445,1.26608,1.30907,1.33417},
+{1.05377,0.739542,0.509217,0.56711,0.319022},
+{0.626667,1.29105,0.515243,0.528457,1.35042},
+{0.388153,0.232257,0.211576,0.220449,0.395738},
+{1.41876,1.37805,0.909401,0.627147,0.719338},
+{0.236909,0.246824,0.416106,0.270491,0.421736},
+{0.422891,1.03595,0.45593,0.947287,0.470335},
+{0.179905,0.168895,0.184137,0.238075,1.31702},
+{0.415525,0.854999,1.02981,0.844295,0.790831},
+{0.405095,0.793807,0.824319,0.48516,1.04089},
+{1.26772,0.942509,0.944603,0.855901,0.767926},
+{0.59855,0.405415,0.400043,0.748844,1.10966},
+{0.786577,0.474889,0.447414,1.17847,1.41667},
+{0.372814,0.413176,0.848519,1.27706,1.37715},
+{0.169996,0.161734,0.163633,0.173124,0.352952},
+{0.499155,0.879573,1.02021,1.06457,1.27026},
+{0.20588,0.349266,0.18345,0.178359,0.182752},
+{0.716525,0.45211,0.219726,0.20591,0.198346},
+{1.34188,1.31697,0.637851,0.611953,1.30596},
+{1.27239,0.778876,0.941553,0.638865,1.29889},
+{0.760614,0.45864,0.860001,0.617762,1.01556},
+{1.45373,0.492015,0.463143,0.441624,0.365387},
+{1.3736,1.40266,0.740942,1.20995,1.19442},
+{0.513898,0.548236,1.35968,0.351138,0.361087},
+{0.999901,0.406639,0.401258,0.407274,1.02998},
+{0.676813,0.541636,1.41182,0.818229,0.495914},
+{0.892004,0.396008,0.407904,0.676941,0.713857},
+{0.307986,0.964784,0.291466,0.250664,0.234822},
+{1.08065,0.737501,0.916255,0.712104,0.484706},
+{0.630028,0.749679,0.631166,0.438249,0.542493},
+{0.313645,0.31985,0.351993,1.37309,1.25075},
+{1.43804,0.855705,0.39209,0.339967,0.369304},
+{0.756712,0.622674,0.661289,0.67068,0.603914},
+{0.319041,0.716297,0.290809,0.282117,0.504837},
+{0.847979,1.40188,0.897418,0.446986,0.432255},
+{0.17768,0.172076,0.198827,0.426461,0.674869},
+{0.361053,0.640125,0.960164,0.437622,0.589129},
+{0.351219,0.181905,0.164962,0.153152,0.159031},
+{0.164024,0.170893,0.216443,0.671042,0.234278},
+{0.783878,0.394098,0.9138,0.317388,0.302081},
+{1.0575,0.90681,0.433274,0.506756,1.11706},
+{0.622059,0.681612,0.470669,0.748232,0.313737},
+{1.10399,0.38058,0.572969,0.305717,0.296082},
+{1.33731,0.573887,0.503576,0.633276,1.38439},
+{0.490364,0.354912,0.619323,0.730883,0.297319},
+{0.793757,0.560409,1.17363,1.39004,1.30285},
+{0.280637,0.471093,0.271004,0.282288,0.714626},
+{0.338726,0.339676,0.682624,0.381023,0.980325},
+{0.533155,1.17935,0.551896,1.09616,1.00792},
+{0.529876,0.343457,0.291183,0.67849,0.747774},
+{1.3343,1.33245,1.34567,1.35557,1.22426},
+{0.243223,0.382512,0.318652,0.450845,0.245796},
+{1.31927,1.30243,0.522576,1.10383,0.561894},
+{0.334474,0.888847,1.03328,0.334103,0.304403},
+{0.598997,0.348898,0.68613,0.787619,0.660694},
+{0.623294,0.328647,0.339425,0.836055,0.357822},
+{0.61034,1.40108,0.523386,0.805861,0.461764},
+{0.400394,0.356157,0.293283,0.449554,0.52863},
+{0.583111,0.575055,0.437143,0.921855,0.634195},
+{0.462074,0.338112,0.442465,0.42318,0.30806},
+{1.37257,0.522833,0.460875,0.961157,0.456164},
+{0.320431,0.360842,1.19325,1.0652,0.414012},
+{1.08063,0.762279,0.449196,0.705824,0.631308},
+{0.858462,0.553374,0.847335,0.94157,1.3282},
+{0.200057,0.225566,0.504139,0.729749,0.279356},
+{0.963199,0.596167,0.747657,0.910141,0.814512},
+{0.924686,1.04739,0.732421,0.58669,0.578778},
+{0.652763,0.898838,1.3944,1.31477,0.977645},
+{0.798751,0.592682,0.339954,0.53572,0.438658},
+{0.387905,0.636698,0.644805,0.688541,0.708767},
+{0.211575,0.198864,0.229932,0.723007,0.540023},
+{0.323091,0.852725,0.645928,0.286081,0.304319},
+{0.887236,0.921811,0.464416,1.02755,0.79299},
+{0.209666,0.193429,0.200353,0.242327,0.953092},
+{0.987418,1.36485,0.935415,0.921035,0.538395},
+{0.40543,0.417563,1.28576,1.42985,0.80199},
+{1.43702,0.913156,0.628154,0.718005,0.448171},
+{0.652675,0.280467,0.326895,0.53444,0.496972},
+{0.530347,1.36297,1.06127,1.26366,0.817743},
+{0.490941,0.694342,0.241977,0.210482,0.21615},
+{0.968647,0.94184,0.577248,0.958228,1.35886},
+{0.272885,0.281883,0.711816,1.00245,0.368118},
+{0.407543,0.426989,0.231442,0.223901,0.213256},
+{1.32304,1.25885,1.2895,0.739396,1.31542},
+{0.299498,0.485925,0.318213,0.70914,0.314709},
+{0.735863,1.35957,0.461769,0.412189,0.7171},
+{0.606943,0.970725,0.631787,0.744273,0.732373},
+{0.632884,1.25728,1.37068,0.842431,0.764322},
+{0.972232,0.515659,0.56492,1.37437,0.527993},
+{1.00375,0.700983,0.386865,0.338794,0.626771},
+{0.395431,0.237265,0.416153,0.220288,0.228126},
+{1.32629,0.871137,0.712638,1.36738,0.623578},
+{0.300598,0.359838,1.04338,0.291691,0.28758},
+{0.248092,0.258546,0.463243,0.324184,0.736487},
+{0.816408,0.977069,1.37761,0.524056,0.492604},
+{0.959486,0.856621,1.40299,0.731723,0.951003},
+{0.639678,0.48891,1.01625,0.947547,0.745774},
+{0.376809,1.31296,0.742348,0.413322,0.396407},
+{0.330601,0.313589,0.367934,0.899971,1.41226},
+{0.216184,0.22126,0.281585,1.01903,0.32408},
+{0.657797,0.952862,0.654034,1.39031,1.3453},
+{1.37705,0.326895,0.25861,0.235077,0.242192},
+{0.192831,0.233031,0.68903,0.21439,0.200497},
+{1.22485,0.485575,0.469215,0.93554,0.976907},
+{1.25296,0.971772,0.958275,1.28017,1.40463},
+{1.29801,1.03692,0.940294,0.424527,0.399051},
+{0.577911,0.49177,0.281209,0.279929,0.443526},
+{0.713668,0.278504,0.273643,0.445726,0.236289},
+{0.531333,1.37858,0.894186,0.627085,0.873345},
+{0.28669,0.55869,0.610643,0.568317,0.330016},
+{1.39085,0.928685,1.37918,0.737749,0.561254},
+{0.269898,0.667898,0.46554,0.242176,0.224656},
+{0.501519,0.777566,0.426977,0.407889,1.30446},
+{0.678408,1.01896,0.657147,0.333607,0.300515},
+{0.912685,0.880813,1.37366,1.01026,1.37506},
+{1.03145,0.759036,0.739733,0.505288,0.862037},
+{0.693726,1.27261,0.71272,1.359,0.500376},
+{0.358395,0.414044,0.748539,0.825797,1.07589},
+{1.28514,0.814442,1.33057,1.32764,0.878569},
+{0.806036,1.3995,0.89106,0.885917,1.35305},
+{0.256429,0.241856,0.273196,0.970294,0.915787},
+{0.735898,0.982358,0.394181,0.605071,0.405942},
+{0.815618,0.462788,0.452566,0.533497,1.41644},
+{0.673605,0.811876,0.861341,0.709201,0.386176},
+{0.453248,0.757198,0.544963,0.827649,1.42542},
+{0.700424,0.381822,0.448474,1.1238,0.893269},
+{1.25905,0.365693,0.314552,0.362931,0.640386},
+{0.882725,0.572279,1.16767,1.34256,0.498455},
+{0.322207,0.644102,0.301482,0.447162,0.303926},
+{0.948253,1.24638,1.35776,1.33453,0.626869},
+{1.19187,1.38496,1.38637,0.546604,0.495114},
+{0.158262,0.153562,0.142954,0.136,0.137281},
+{0.48717,0.72264,1.39626,0.514273,0.877285},
+{0.215204,0.208815,0.227226,0.430976,0.403806},
+{0.673814,0.238416,0.228071,0.240022,0.419178},
+{0.318255,0.354338,0.768696,1.15267,0.81092},
+{0.232174,0.254473,0.881681,0.596983,0.291914},
+{0.679934,0.59797,0.64195,0.397282,0.909373},
+{0.87528,1.0101,0.965605,0.959879,0.96941},
+{1.14083,0.547354,1.35288,0.507897,0.412646},
+{0.81057,0.596226,0.526345,0.293601,0.252723},
+{0.468693,0.24683,0.22695,0.278629,0.715343},
+{0.979597,1.1719,1.08422,0.480143,0.962035},
+{0.507106,0.514869,0.50711,0.589173,0.50021},
+{0.459479,1.34311,1.31957,0.464193,0.453815},
+{0.366921,0.372019,1.11434,0.489597,0.880665},
+{0.315061,0.657258,0.600663,0.359864,0.688068},
+{0.398,0.235403,0.232009,0.383525,0.227874},
+{0.619032,0.715749,0.716619,0.945573,0.923992},
+{0.244168,0.408747,0.422267,0.222288,0.218462},
+{0.556153,0.424271,0.813268,0.387763,0.639077},
+{0.230555,0.241534,0.602055,0.443054,0.2518},
+{0.75265,0.389004,0.578029,0.553712,0.322254},
+{0.516637,1.24469,1.30834,0.660226,1.25455},
+{0.231638,0.665077,0.207604,0.188567,0.189985},
+{1.37854,1.40244,0.523345,0.415661,0.403397},
+{0.500169,0.76542,0.513107,1.34629,0.538221},
+{0.405645,0.480214,1.34866,0.964558,0.94777},
+{0.781497,0.320383,0.319707,0.317766,0.720235},
+{1.11838,0.610118,0.29402,0.277378,0.264294},
+{0.250688,0.295341,0.727174,0.308405,0.515534},
+{0.611077,0.428438,0.989632,0.660351,0.406562},
+{0.283338,0.351197,0.83199,0.696767,0.630069},
+{0.562113,1.00323,0.863977,0.384062,0.682895},
+{1.42351,1.2656,1.12563,1.22113,0.644907},
+{0.876297,0.893569,1.16139,0.984862,0.535445},
+{0.247747,0.246357,0.273184,0.603304,1.16944},
+{0.903472,0.479551,0.415956,0.982997,0.433624},
+{0.700131,0.476753,0.556693,0.33559,0.501667},
+{0.374498,0.892051,0.686745,0.595779,0.43103},
+{0.295774,0.342462,1.33701,0.582105,0.417695},
+{0.775731,0.93208,0.774526,0.596892,1.21543},
+{0.558199,0.622059,0.7796,0.371297,0.299905},
+{0.350309,0.837212,1.3439,0.626067,0.440423},
+{0.535357,0.712571,0.471967,0.390523,0.285972},
+{0.579129,0.512794,0.272848,0.528243,0.28285},
+{0.975247,1.35522,0.621394,0.742671,0.916309},
+{0.37646,0.680583,0.371886,0.518141,0.934408},
+{1.34244,0.595149,1.09155,0.495624,0.871223},
+{0.57473,0.581647,0.347747,0.348865,0.710669},
+{0.397073,0.403396,0.741788,0.513491,1.38088},
+{0.474167,0.337413,0.707807,0.473658,0.39481},
+{0.750042,0.700993,0.436349,0.67502,0.941756},
+{1.12931,1.36339,1.29985,0.92508,0.923555},
+{0.505912,0.295321,0.486319,0.286129,0.569624},
+{0.980672,0.279547,0.239184,0.218386,0.202523},
+{1.06268,1.2302,0.459522,0.696396,0.426017},
+{0.240942,0.526818,0.744135,0.279415,0.250472},
+{0.812498,0.560384,1.09031,0.445021,0.688436},
+{1.28517,1.13848,0.524505,0.421746,0.756671},
+{0.531131,0.370801,0.54113,0.495729,0.745086},
+{0.277218,0.276378,0.501635,0.582627,0.528409},
+{0.599798,0.528389,0.656403,1.43926,0.967507},
+{0.633027,1.01739,0.313941,0.270623,0.243476},
+{0.847386,1.40613,0.436607,0.34917,0.328286},
+{1.38799,0.976847,0.659124,0.934279,1.00719},
+{0.261274,0.441631,0.247761,0.260116,0.408158},
+{1.39959,0.704028,1.27337,1.01829,1.25994},
+{0.329022,0.322178,0.43859,0.900161,0.597841},
+{0.359459,0.527453,0.528219,0.310772,0.447986},
+{1.28021,0.591136,0.641603,1.36321,1.16619},
+{0.303054,0.590361,0.935776,0.655923,0.306808},
+{0.909066,0.806358,0.876643,1.32686,0.866917},
+{0.313996,0.61914,0.439506,0.984077,0.3795},
+{0.31606,0.446711,0.338337,0.317312,1.04431},
+{0.980237,0.4244,0.782711,0.74743,0.407302},
+{0.963387,0.39892,0.674681,0.405775,0.62459},
+{0.390604,1.00373,0.417655,0.373138,0.597421},
+{0.632318,0.800142,0.33124,0.29327,0.4748},
+{0.277001,0.511726,0.327298,0.598255,0.629799},
+{0.972354,1.30576,0.804884,1.34897,0.968324},
+{0.466766,0.339504,0.688563,0.24833,0.241491},
+{0.276954,0.309284,0.506502,0.671665,0.871014},
+{0.757628,0.897736,1.06152,0.379848,0.336404},
+{0.387573,0.363857,0.325432,0.388422,1.45383},
+{0.341164,0.878875,0.359061,0.608593,0.299899},
+{1.01932,0.502556,1.24836,0.919968,0.874397},
+{0.408629,1.15193,0.463231,0.591718,0.906437},
+{0.124563,0.113565,0.11774,0.160868,0.703326},
+{0.256755,0.268552,0.322054,1.35017,0.667696},
+{0.984166,0.744223,0.759104,0.357689,0.411526},
+{1.34939,0.443003,0.658442,0.602355,0.713139},
+{0.564345,0.259968,0.243453,0.198779,0.198531},
+{0.241578,0.221736,0.233219,0.560329,0.851796},
+{0.782741,0.65909,1.12404,0.521294,1.35791},
+{0.188768,0.192146,0.340929,0.198247,0.184002},
+{0.590317,0.484028,0.437683,0.245425,0.231335}};
index f181d06..2014ef5 100644 (file)
 float exc_wb_table[128][8]={{0,0,0,0,0,0,0,0},
-{-1.03633,-0.598067,0.434577,1.08032,1.51859,0.789043,-0.178551,-0.54917},
-{0.304001,0.923823,-0.692259,-1.55388,0.526058,0.611538,0.481522,1.08309},
-{-0.0395937,-0.941631,0.548087,0.900493,-0.613452,-0.846422,0.984429,1.44138},
-{1.00466,-1.11178,-0.164767,1.61077,-0.153895,-0.896901,0.564655,0.40669},
-{-0.197253,0.570781,0.130693,-0.912574,1.74496,-0.911399,0.656065,0.250751},
-{-0.552421,1.13952,1.0122,0.213186,0.487877,-1.02474,-0.870557,1.06442},
-{1.02968,1.73221,-0.214526,-0.8054,0.335269,-0.425264,-0.57369,0.766483},
-{-0.783575,0.720319,-0.345052,-0.743789,1.67356,1.03267,-0.0434878,0.112781},
-{-0.591047,1.83683,0.504509,-1.20575,0.375511,0.338137,-0.36274,0.432143},
-{-0.0535243,1.73867,1.39265,-0.318134,-0.907516,-0.110963,0.193565,-0.279976},
-{0.889124,0.0155015,-0.765889,1.41013,-0.436154,-0.265441,1.24686,-0.873299},
-{-0.644664,0.0936137,1.6392,0.372162,-1.35114,-0.241367,0.936308,0.488901},
-{1.54768,-0.451705,0.299703,-1.14522,-0.317506,1.00613,-0.0602516,0.873914},
-{0.426336,-0.626112,-0.329146,1.19378,0.656525,-1.18469,-0.319269,1.47621},
-{-1.36223,-0.791803,0.0625929,0.491553,1.00923,1.08838,0.91873,0.44169},
-{1.42367,0.152665,-1.1033,0.471422,1.02241,-0.752209,-0.674225,0.883491},
-{0.375788,-0.948336,0.345699,1.1966,-0.0607664,1.19629,0.586635,-1.12236},
-{0.550637,1.40832,-1.64741,0.658325,0.54599,-0.0246801,-0.0852093,0.0730009},
-{0.505058,-0.305684,-1.12605,-0.558787,1.17137,1.5405,0.581629,-0.0860507},
-{1.0247,-0.66466,0.333468,-0.289871,1.05117,-1.25069,0.392119,1.04094},
-{0.34235,-0.77537,0.197171,1.93113,0.942771,-0.177548,-0.552188,-0.324675},
-{-0.132227,0.0842547,1.14422,-1.65995,0.55817,1.10678,-0.0949896,0.311947},
-{1.36473,1.19028,0.780531,0.910884,0.854454,0.554635,0.23845,-0.0516568},
-{-0.357525,0.139316,0.324104,-0.0609313,0.279953,-0.962127,0.124862,2.17393},
-{-0.544888,1.24128,-0.57203,0.680379,-0.375316,0.896237,-0.676307,1.03254},
-{-0.195987,-0.237371,1.60586,-0.945201,0.660371,-0.750605,0.651732,0.662051},
-{1.31943,-0.0456948,-0.979656,0.766511,-0.106572,-1.06806,0.838036,1.02573},
-{1.04875,1.56567,0.485407,-0.328864,0.0307096,0.595221,-0.387986,-1.19226},
-{-0.615406,1.16911,0.836092,-0.991569,-0.55754,-0.17565,0.843537,1.25318},
-{1.15097,0.820474,-0.244995,-1.10569,-0.920918,-0.0718691,0.963504,1.14681},
-{-1.34022,-0.360778,1.2518,0.916983,0.166487,-0.427368,0.181518,1.15882},
-{1.07359,-0.998889,0.91467,0.205166,-0.753279,1.16532,-0.892312,0.556756},
-{-0.187475,1.24065,0.301209,-1.26458,-0.101276,1.48232,0.546266,-0.686011},
-{1.9719,0.875912,-0.316355,0.48677,0.20829,-0.482079,-0.428518,-0.527602},
-{0.667535,0.638927,-1.48704,0.098544,0.984151,-0.682752,1.14227,0.180132},
-{-0.266673,-0.440114,-0.137814,-0.302929,0.0302609,1.78561,1.44693,-0.469607},
-{-0.535545,1.50408,-0.44837,1.12612,-0.857486,0.156953,0.771872,-0.272476},
-{-0.475877,0.2286,-0.189876,0.633206,0.492666,-1.51294,1.29672,0.938709},
-{1.50469,-1.67631,0.504659,0.194321,0.319824,0.0569853,-0.0101858,0.533611},
-{0.0293009,-1.34627,0.368322,0.323108,0.634108,1.60474,-0.391468,0.527697},
-{-1.54165,0.392745,1.08604,-0.513175,0.808133,0.595405,-0.144862,0.790425},
-{-0.817728,0.734455,1.26271,-0.704938,-0.921229,0.910552,1.06223,-0.193172},
-{0.543015,-1.28247,-0.730261,0.686474,-0.0443365,0.38415,1.5215,0.585236},
-{-0.572683,-0.866989,1.07872,1.68109,-0.327426,-0.218851,0.779091,-0.129686},
-{1.06434,0.567725,0.135952,0.458792,-0.376199,-1.42542,-0.150611,1.47526},
-{0.443761,0.0876726,0.232774,1.17326,-1.06799,-1.10216,1.3778,0.361752},
-{1.03474,0.525746,-0.538619,-1.15767,-0.0206156,1.52656,0.718243,-0.673775},
-{1.70035,-0.619964,-1.2712,0.897354,0.489729,-0.158784,0.406952,-0.0478478},
-{-0.365051,0.226432,1.82109,-0.627386,-0.756473,0.483177,-0.410344,0.98143},
-{1.16776,0.356135,-1.17274,0.261811,0.635242,0.851413,0.575169,-1.23932},
-{-0.0839711,1.02839,-0.576034,0.460636,-0.192236,-0.745266,1.87024,-0.474172},
-{-0.173316,0.461404,0.944518,1.26763,1.31267,1.02898,0.548032,0.0737827},
-{-0.430553,-0.164814,0.0640487,0.468624,1.83374,-0.309847,-0.943881,0.95846},
-{0.621088,1.5807,0.0449819,-1.16888,-0.781455,0.516797,1.06907,-0.140764},
-{-1.1442,1.44111,-0.402632,-0.0575239,1.06291,-0.674973,0.32242,0.74638},
-{0.807472,0.147589,1.08147,-0.1285,-1.4431,1.03913,0.597444,-0.664379},
-{-0.70017,0.713683,1.946,0.856833,-0.37006,-0.403706,-0.466334,-0.112292},
-{-1.01529,1.35764,0.310164,-0.825529,0.411963,0.0294461,1.37026,-0.265291},
-{-0.0603154,-0.974908,-0.805054,0.747251,1.43413,1.17733,0.498444,-0.34983},
-{-0.316024,1.60226,0.176445,0.756254,0.852603,-0.798242,0.339327,-0.86298},
-{0.450913,-1.00346,1.13199,0.961589,-0.626081,-0.27571,-0.574891,1.30058},
-{0.141401,0.101393,0.357711,1.01541,-1.60171,1.00424,-0.252998,0.760351},
-{1.22157,0.0719505,-0.584999,0.339341,-0.653905,1.44827,-0.907596,0.628404},
-{0.334184,-0.108394,-0.546346,-0.379586,-0.458024,-0.0928911,1.47283,1.76012},
-{-0.162063,0.694466,1.40184,0.584844,-0.970119,-1.21435,0.0882554,1.02449},
-{1.53975,-0.352929,0.381668,0.291988,-1.30129,-0.284057,0.627504,0.98398},
-{-0.12692,0.57948,0.381193,-1.09662,1.11488,-0.210008,-0.819789,1.52889},
-{0.230278,0.919943,-0.822515,0.132687,1.09833,-1.19091,-0.242295,1.36411},
-{-0.550353,-1.31563,-0.0418793,1.43688,0.903282,-0.0705952,0.42134,0.842356},
-{1.20049,-0.450979,-0.167785,-0.71386,1.17516,0.672425,-1.11838,0.78385},
-{-0.111437,0.365976,0.611356,0.0367128,-1.09808,-0.802827,1.24046,1.55254},
-{1.13537,-0.165433,-1.22634,-0.831482,0.0102606,0.942127,1.15616,0.689254},
-{-1.25323,-0.14009,1.45747,0.613556,-0.134901,0.920981,0.68534,-0.587489},
-{0.539659,0.865729,-0.775736,0.709136,-0.938594,1.41837,0.190293,-0.696013},
-{1.72967,0.424288,-0.946193,-0.480369,0.0584857,-0.310042,0.134891,1.29625},
-{0.265227,0.0827433,0.274625,-1.09196,-1.04672,1.17188,1.38651,0.579558},
-{0.455276,-0.065565,0.0437782,0.252775,0.178328,0.179633,-1.4148,1.86591},
-{0.886572,0.664862,0.806079,0.972233,0.931183,0.884471,0.804077,1.05459},
-{0.272214,-0.604275,-1.1212,0.0469548,0.971637,0.158346,0.464247,1.68325},
-{0.103203,1.71343,-0.980884,-0.61129,0.744114,0.324151,0.707933,-0.666761},
-{0.071369,1.33608,0.483294,-0.0719594,1.28015,0.0864999,-1.41304,-0.177506},
-{0.782507,1.12221,-0.528724,-1.10764,0.858326,1.20321,-0.655616,-0.383123},
-{1.63524,0.150715,-1.38169,-0.306651,1.07264,0.556524,-0.330863,-0.0336586},
-{-0.153903,-0.689427,1.67468,0.584019,0.544801,0.471967,-1.15271,0.236626},
-{0.831557,0.282444,-1.07431,1.71817,-0.734158,0.229366,-0.160866,0.308841},
-{1.67229,1.31603,0.293472,-0.197319,-1.06919,-0.419804,0.227668,0.0428162},
-{0.303228,1.71624,-0.358161,-0.268371,-0.195817,-1.06029,0.960674,0.740735},
-{-0.0243176,-0.437698,0.560074,0.623133,-1.19685,0.338863,1.83237,-0.38581},
-{0.321907,0.26206,-0.53241,0.333653,1.83928,0.835866,-0.824146,-0.802029},
-{0.211784,0.800291,0.709358,-0.378766,-1.52014,-0.020897,1.56839,0.393931},
-{0.366185,-0.265221,0.590389,-0.115999,0.792554,-0.708673,1.67893,-0.775966},
-{1.28195,-1.02721,0.183826,1.16092,-1.18768,0.459846,0.535175,-0.249723},
-{-1.14016,-0.482647,0.505459,0.0983983,-0.343117,0.401372,1.57516,1.12304},
-{1.147,1.11561,0.394163,-0.122078,0.260613,0.901099,1.25083,0.81966},
-{0.768027,0.243178,1.22026,1.43751,-0.718673,-0.382365,0.146484,-0.794759},
-{-0.414121,-0.793798,-0.690751,-0.548501,0.521198,1.19776,1.27359,1.05139},
-{-1.4403,0.984987,1.04579,0.395742,-0.227709,-0.671357,1.00093,0.231662},
-{1.90324,-0.572199,-0.295628,0.0434357,-0.374636,1.17138,0.160386,-0.55977},
-{-0.902381,0.328673,-0.659916,0.942192,0.950924,0.300417,1.31454,-0.692702},
-{-0.135489,0.215825,-0.0349114,-0.166635,0.971744,1.77956,0.163175,-1.3044},
-{0.354055,-0.18386,0.498562,-0.689249,-0.526319,0.350329,0.0709671,2.12052},
-{0.310379,-1.24166,1.5971,-0.0620976,-0.789719,0.648818,0.574153,0.353708},
-{0.278324,0.420068,-0.924391,1.58532,0.698845,-1.2323,0.466832,0.0930395},
-{0.0922649,0.141644,0.616552,-0.725447,0.390275,1.3972,-1.48369,0.775951},
-{1.49578,0.488467,1.15625,-0.246306,-0.394096,-0.0366536,-1.12881,0.546197},
-{-0.22949,-0.0377284,0.791,1.6313,-0.0334894,-1.42421,-0.16135,0.833672},
-{1.50483,0.180136,-0.671553,0.0258795,-0.937478,0.239621,1.51201,-0.145836},
-{-0.917939,0.211918,1.16754,1.52107,0.920108,-0.37239,-0.584982,-0.320368},
-{0.443091,0.952967,1.33541,0.913925,0.368584,-0.125061,-0.976007,-1.10975},
-{-0.836282,1.16436,1.23655,-0.16389,0.382563,1.00944,-0.267548,-0.956219},
-{0.450199,1.26403,1.51365,0.863748,0.2038,0.071838,0.550359,0.734373},
-{1.69725,1.13771,-0.917116,-0.989909,-0.017037,0.45129,0.311994,0.0179304},
-{0.522356,-0.994855,1.26051,-0.7553,0.567629,0.169681,-0.711474,1.29976},
-{0.8313,1.4569,1.08096,0.570183,-0.3738,-1.06704,-0.701423,-0.101114},
-{0.182684,0.678864,0.292765,0.0516973,-0.477198,0.854649,1.3867,-1.52939},
-{0.782839,0.396491,0.346153,1.26843,0.85293,-0.919632,-1.30058,0.202098},
-{0.491729,0.965974,-1.0623,-0.503872,1.58353,0.041349,-0.840533,0.624768},
-{0.578714,-0.571294,-1.07824,1.0102,1.69957,-0.0820554,-0.455154,0.25529},
-{-0.109213,0.339693,0.545612,1.29121,1.02418,0.604465,-0.466522,-1.47354},
-{1.21173,-0.552475,0.925762,-1.06558,1.06424,0.0606676,0.43038,-0.305992},
-{0.325296,-0.181066,0.984011,-0.493916,-0.436878,1.95134,-0.356173,-0.536515},
-{0.706166,1.28099,0.855746,-0.551548,-1.17237,-0.700125,0.213986,1.10533},
-{1.6009,-0.903145,-0.44534,0.886835,0.0116842,0.0972698,-0.754092,1.02939},
-{-0.0328855,0.184091,0.234735,0.510939,0.826887,1.14413,1.4588,1.17285},
-{0.771452,1.20782,0.676191,-1.44507,-0.691949,0.881803,-0.13458,0.378777},
-{1.36292,-0.356531,-0.0772159,0.66455,0.851554,0.911799,-1.09627,-0.727242},
-{-0.0125277,0.49517,-0.688167,-0.770124,-0.261333,0.683965,2.01034,0.323668}};
+{0.775771,0.440749,-0.495126,0.0484444,-0.558805,1.94737,-0.772592,0.0683286},
+{0.770298,0.767063,-1.48262,1.45348,-0.153233,-0.564021,0.330471,0.195552},
+{-0.757402,-0.34029,1.66061,0.552675,-1.08727,0.194918,0.979085,0.169412},
+{-0.185719,-0.514093,1.37466,-0.759508,0.313433,0.257598,-0.766254,1.58689},
+{0.39876,0.484886,-0.909725,0.0310173,1.64044,-0.840648,-0.572353,1.08004},
+{-0.0572745,1.83617,-0.462888,-0.771793,0.152308,0.751314,0.750204,-0.757503},
+{0.666645,0.426114,0.411757,0.440951,0.685107,1.04417,1.18874,1.26219},
+{-0.312804,-0.0183786,1.58263,0.765403,-0.411226,0.976233,0.10062,-1.09916},
+{1.37911,-0.632356,0.661254,0.315078,-1.02059,1.24908,0.0466878,-0.726069},
+{0.132778,-0.0542109,-0.107961,-1.19117,0.119262,1.86047,0.924067,-0.20808},
+{0.0757026,0.372034,0.193145,0.351066,-1.28067,-0.483544,1.87521,0.495347},
+{0.360565,-0.135176,-0.378865,0.0555138,0.447026,0.104883,-0.96553,2.12743},
+{0.781177,-0.261961,0.204314,1.22309,0.536275,0.917566,-1.33994,-0.623591},
+{-1.28928,0.699913,1.03915,-0.143057,-0.495769,-0.47707,0.942017,1.17349},
+{0.144841,-0.115187,-0.240342,1.55885,-1.24175,0.855755,-0.561126,0.856463},
+{-0.297538,-0.709477,1.19287,1.88206,0.0534102,-0.247618,-0.125041,-0.146487},
+{0.0429008,-0.0519561,-0.248789,0.314744,0.225377,-1.323,0.92677,1.76619},
+{1.51397,-0.588726,0.183482,-0.682625,0.633467,1.28349,-0.848284,-0.163051},
+{-0.303961,-0.122323,1.083,0.979169,-0.798078,-1.25728,0.702003,1.04917},
+{0.918395,-0.466791,1.48064,-0.994999,0.120815,0.573571,0.673281,-0.797386},
+{1.43322,-0.776617,0.698546,-0.482307,0.0946818,-0.914728,0.441308,1.19569},
+{0.546749,-1.1585,0.329245,0.993999,0.348764,-0.748592,-0.461701,1.53486},
+{0.84956,1.21544,0.611375,0.825878,-0.574422,-1.40927,0.0218958,0.253053},
+{1.12829,-0.380426,-0.455433,1.37505,1.10982,-0.73439,-0.767009,0.187596},
+{-0.16941,0.177178,1.12278,-1.0607,0.556393,1.46179,-0.965152,0.0782219},
+{0.846189,-0.751599,0.717835,1.23919,-1.49093,0.0408583,0.645834,0.179195},
+{1.20009,0.201024,0.146934,0.287647,-1.14693,-0.747884,0.415407,1.50782},
+{1.32405,0.41783,-1.18055,0.0203925,1.10455,0.430449,-1.1049,0.311481},
+{-0.948474,1.20769,-0.952185,1.30785,-0.461345,0.812843,-0.190386,0.231567},
+{0.32806,-0.845516,-0.808372,0.892217,1.65227,0.726494,-0.421723,-0.0394001},
+{-0.735431,1.26056,-0.112061,-0.361656,1.1905,-1.12137,0.0166439,1.08075},
+{0.233589,0.044441,-0.339363,1.78981,-0.891615,-0.12416,1.1161,-0.654994},
+{0.667562,1.40902,1.26168,0.297422,-0.419786,0.163962,-0.564644,-0.953517},
+{-0.108021,1.296,0.539957,-1.18658,-0.806598,0.468139,1.3425,0.105849},
+{1.94549,-0.661905,-0.848373,0.0939239,0.887829,-0.338309,-0.0938294,0.496034},
+{0.512513,1.26602,-0.484184,-1.46634,0.600489,1.07784,-0.449645,0.272972},
+{0.373461,-0.0133473,-0.225367,0.888525,0.152544,-1.42283,1.69522,-0.0772472},
+{-0.499101,-1.2905,0.297369,1.17037,-0.0757249,-0.0375968,1.22149,0.884705},
+{-0.807021,1.42566,-0.257394,-0.0345958,-0.425846,1.15661,-0.767917,0.941804},
+{-1.29859,0.570665,0.537508,0.957761,0.0342095,-0.508587,1.43004,-0.314701},
+{0.196714,0.928304,-1.17023,0.876087,-0.399692,0.575468,-0.853138,1.25611},
+{0.562785,-0.696234,-1.35948,1.10816,0.850598,-0.344437,0.586342,0.888893},
+{0.0754354,1.01784,1.59635,-0.0469297,-1.04188,-0.721341,0.0453567,0.841556},
+{0.519945,-0.616138,0.496482,-0.429389,1.58022,-0.848711,-0.559528,1.15961},
+{-0.304117,1.59114,-0.130884,-0.309588,0.17195,-1.1074,1.3491,0.204715},
+{1.89383,0.560069,-0.705705,-0.787143,-0.0353329,0.269826,-0.0505539,0.915421},
+{1.4389,1.05995,-1.13903,0.185456,0.186799,0.656613,0.208571,-0.935401},
+{1.36601,-0.837739,0.697474,-0.489343,0.228542,0.409494,-1.05712,1.22495},
+{1.00409,0.391417,-0.235596,0.259372,-1.02847,0.790305,1.34444,-1.05455},
+{1.66946,-1.67023,0.317712,0.695016,0.0515751,-0.230551,0.0776751,0.186626},
+{1.12082,-0.212203,-0.709065,-0.26147,-0.988522,0.654864,1.08864,1.14235},
+{0.434711,1.39689,0.0749227,-0.786222,-0.784015,-0.449397,0.718669,1.38294},
+{0.0790131,0.235079,0.920765,-1.16727,0.830221,-1.17265,0.782715,0.948728},
+{-0.963013,0.857078,0.0182286,1.36314,-0.208667,-0.84204,0.0961981,1.19678},
+{1.28868,-0.583239,-1.25485,-0.0380027,0.632627,1.29698,0.386559,-0.31326},
+{-0.678492,1.72207,-1.39915,0.723837,0.1924,-0.263941,0.147904,0.487105},
+{-1.14448,1.13022,0.660272,-0.439701,0.285009,1.28374,0.41188,-0.821226},
+{0.281919,0.333533,0.285269,-0.386696,0.647669,-0.459306,1.80357,-1.14347},
+{-0.518794,0.0139493,0.00689697,-0.7624,-0.282019,0.553949,1.53549,1.44821},
+{0.200769,0.201108,-0.0199344,0.277907,0.742188,1.493,0.314615,-1.59739},
+{-0.819861,-0.36448,0.0482586,1.35906,1.37588,0.455571,0.423741,-0.779836},
+{-0.442476,1.63289,-0.371685,0.734756,-1.26128,0.0846302,0.783122,0.191572},
+{1.21222,-0.492701,-0.63772,1.11652,0.558305,-0.0722016,0.838788,-1.15318},
+{0.40832,0.284751,0.112715,-0.892692,1.15749,0.552406,-1.40847,1.13029},
+{-0.844766,0.156722,1.75698,-0.784186,-0.539899,0.993032,0.10886,0.408235},
+{-0.519506,1.50281,-0.811893,-0.0770795,1.18193,0.166596,-0.976262,0.633815},
+{1.25859,1.20472,1.02703,0.804729,0.501985,0.507974,0.457387,0.383234},
+{0.738665,0.861996,-1.60455,0.304943,1.31111,-0.225601,0.357081,-0.273263},
+{0.633034,0.426478,1.0395,0.994155,0.19338,-0.735345,-1.37469,0.598933},
+{1.12268,0.123073,-0.177913,-1.08642,1.74849,-0.0327693,0.134861,-0.318752},
+{-0.279982,1.92996,0.7596,-1.09139,0.261731,0.20264,-0.374665,0.151212},
+{0.132535,-0.250428,0.367428,0.263679,-0.297366,1.29999,-1.48745,1.29124},
+{-0.142985,-1.41655,0.975325,0.354926,1.01912,0.957654,-0.587599,0.326691},
+{0.2836,0.808856,-1.17204,-1.00533,0.765408,0.111144,0.761906,1.19344},
+{1.58185,-0.653009,-0.714944,1.09403,-0.357522,-0.68855,0.897552,0.328754},
+{0.486712,-1.12232,1.59151,0.546806,-0.819486,0.249542,-0.463608,0.803322},
+{1.37326,0.755819,-1.09151,-0.0329317,-0.200192,-0.46814,1.39995,0.0413843},
+{1.51079,-0.506755,-0.731195,1.02153,-0.287343,0.236801,-0.823164,1.04181},
+{-1.11132,-0.403705,-0.281905,0.379014,1.30821,0.374105,0.574183,1.28883},
+{1.28058,-1.64994,1.31054,-0.490028,0.108686,0.278282,0.0731333,0.0181541},
+{0.602272,0.468423,0.868551,-1.68355,-0.130504,0.584439,-0.0678738,1.12622},
+{2.17907,-0.782772,-0.086662,-0.426339,-0.192304,0.274945,0.592368,-0.124194},
+{-1.01046,-0.0734508,1.65899,0.730969,0.30478,-0.599344,-0.445248,0.934146},
+{0.386106,0.976593,0.7573,-1.07547,-0.642251,1.49572,0.223906,-0.69964},
+{-0.455997,0.176658,0.80257,0.632457,1.65851,0.260536,-1.12995,-0.42957},
+{-0.195011,-0.374047,0.494444,0.225348,-0.718297,0.149778,0.379982,2.14138},
+{-1.5879,1.86023,-0.0858599,0.0204928,0.0752767,0.110229,0.165349,0.357988},
+{1.38225,1.42699,0.501144,-0.659316,-1.06377,0.0409188,0.296565,0.0371474},
+{-1.13605,0.947113,0.604197,-0.823668,0.747305,0.250522,-0.576645,1.32811},
+{0.557821,-0.293609,1.12262,-0.665576,-1.34,0.393799,1.10571,0.771741},
+{0.624621,-0.843319,1.44603,-1.40395,0.958346,-0.0241084,-0.127839,0.383662},
+{-0.369219,0.182266,-0.829448,-0.419725,1.52255,1.50227,0.209066,-0.131143},
+{-1.7929,0.244035,0.990126,0.792652,0.409135,0.701928,-0.11999,0.218675},
+{0.518422,-1.14652,-0.570944,-0.533627,0.708444,0.878883,0.812965,1.21649},
+{0.409713,1.05845,-1.21391,1.15455,-0.864845,0.929817,0.0981028,-0.410504},
+{-0.0928879,-0.234633,-0.91548,-0.0164181,0.384947,0.852774,1.94388,0.14298},
+{0.0878643,0.567983,0.917475,1.16115,1.22911,1.00499,0.627254,0.431649},
+{-0.223266,1.14023,-0.907588,0.785187,0.00256339,-0.0755225,1.42399,-1.01635},
+{-0.129021,-1.00913,1.71098,-0.0900219,0.535683,-0.803703,0.793885,0.314247},
+{0.200844,0.909236,0.621273,1.37256,0.795603,-0.481157,-0.386021,-1.15294},
+{1.51266,-0.449305,-0.694055,1.32429,-0.842498,0.735748,0.0609972,-0.36188},
+{0.411097,-1.39379,-0.0206668,1.16644,0.0768579,1.16727,0.736271,-0.494066},
+{0.972158,0.806019,-0.464964,-1.25743,-0.633956,0.842753,1.23447,0.339788},
+{-0.97043,0.462674,1.28753,-1.11035,0.853929,-0.042166,0.92368,-0.145242},
+{-0.00528003,0.228362,0.2789,0.744154,-1.63914,1.51711,0.239836,-0.123921},
+{1.26087,-1.12705,0.718827,-0.54681,0.981461,-0.735483,0.877053,-0.318805},
+{1.04325,1.87304,-0.514198,-0.553957,0.528734,-0.405415,-0.377246,0.210236},
+{-0.535349,-0.208057,0.0246204,1.41322,1.29827,-0.837795,-0.513341,0.863412},
+{-0.241988,-0.0623511,0.686661,-0.156711,-0.876904,0.959126,1.77558,-0.693038},
+{2.11193,0.600993,0.20936,0.339503,-0.121784,-0.207107,-0.645788,-0.420807},
+{1.22815,0.607444,-0.874424,0.414901,0.404982,-1.19601,-0.0760612,1.27897},
+{1.0166,-1.18127,0.788539,0.510686,-0.611037,-0.293299,1.39195,-0.476282},
+{0.803049,0.635893,0.806845,0.00435291,-1.33064,0.660423,-0.855725,1.02725},
+{-0.793614,1.49047,-0.633648,-0.322054,1.40127,-0.308023,0.619653,-0.337143},
+{0.470212,1.00331,-0.157688,-0.245235,1.24111,1.08229,-0.905259,-0.959883},
+{0.0315501,0.652923,0.411305,-0.186055,0.314619,-0.972984,-0.579537,1.98314},
+{0.486815,-0.656819,-0.11027,1.80442,-0.102151,-1.2307,0.358531,0.713214},
+{0.502115,-0.777812,1.27461,-0.539509,-0.802824,1.5335,-0.389286,0.408219},
+{-0.113833,0.830114,-0.901973,0.931689,1.05204,-1.40523,0.695503,0.18954},
+{-0.851642,1.33024,1.50519,0.631487,0.224523,-0.45348,-0.497673,-0.14997},
+{1.39859,-1.18634,0.267111,0.402463,-0.68516,1.10298,-0.646773,0.6923},
+{-0.096615,0.118834,0.145958,-0.336444,1.59344,-1.37502,1.12467,-0.0263447},
+{-0.67702,1.21341,1.39213,-0.186954,-1.1566,0.178893,0.848396,-0.163224},
+{-0.416763,0.568104,0.417053,-1.40651,1.73401,-0.0791357,-0.150471,0.514234},
+{-1.12241,-0.766883,0.270181,0.275066,0.606253,1.51395,0.937476,0.266323},
+{1.12086,0.645151,1.31346,-0.222125,0.835919,-0.989588,0.0322641,-0.465444},
+{1.29269,0.762152,-0.76088,-1.08806,0.409218,1.15806,0.425753,-0.672306}};
index d6e833b..f4c527f 100644 (file)
@@ -29,7 +29,7 @@ extern float gain_cdbk_nb[];
 extern float exc_gains_table[];
 extern float exc_table[];
 extern float exc_wb_table[];
-
+extern float exc_gains_wb_table[];
 ltp_params ltp_params_nb = {
    gain_cdbk_nb,
    7,
@@ -53,10 +53,10 @@ split_cb_params split_cb_nb = {
 
 split_cb_params split_cb_wb = {
    8,               /*subvect_size*/
-   8,               /*nb_subvect*/
+   10,              /*nb_subvect*/
    exc_wb_table,    /*shape_cb*/
    7,               /*shape_bits*/
-   NULL, /*gain_cb*/
+   NULL/*exc_gains_wb_table*/, /*gain_cb*/
    8                /*gain_bits*/
 };
 
@@ -71,7 +71,7 @@ SpeexMode nb_mode = {
    144,    /*pitchEnd*/
    0.9,    /*gamma1*/
    0.6,    /*gamma2*/
-   .01,
+   .005,
    1.0001,
    /*LSP quantization*/
    lsp_quant_nb,
@@ -90,16 +90,16 @@ SpeexMode nb_mode = {
 
 SpeexMode wb_mode = {
    320,    /*frameSize*/
-   64,     /*subframeSize*/
+   80,     /*subframeSize*/
    640,    /*windowSize*/
    16,     /*lpcSize*/
    1280,   /*bufSize*/
    35,     /*pitchStart*/
    290,    /*pitchEnd*/
    0.9,    /*gamma1*/
-   0.4,    /*gamma2*/
-   .001,
-   1.00001,
+   0.6,    /*gamma2*/
+   .002,
+   1.00002,
    /*LSP quantization*/
    lsp_quant_wb,
    lsp_unquant_wb,
index f56535e..2a4875f 100644 (file)
@@ -190,7 +190,7 @@ void encode(EncState *st, float *in, FrameBits *bits)
    st->lpc[0]=1;
 
    /* LPC to LSPs (x-domain) transform */
-   roots=lpc_to_lsp (st->lpc, st->lpcSize, st->lsp, 6, 0.01, st->stack);
+   roots=lpc_to_lsp (st->lpc, st->lpcSize, st->lsp, 6, 0.002, st->stack);
    if (roots!=st->lpcSize)
    {
       fprintf (stderr, "roots!=st->lpcSize (found only %d roots)\n", roots);
@@ -317,11 +317,11 @@ void encode(EncState *st, float *in, FrameBits *bits)
       snr = 10*log10((esig+1)/(enoise+1));
       printf ("pitch SNR = %f\n", snr);
 
-#if 0 /*If set to 1, compute "real innovation" i.e. cheat to get perfect reconstruction*/
+#if 1 /*If set to 1, compute "real innovation" i.e. cheat to get perfect reconstruction*/
       syn_filt_zero(target, st->bw_lpc1, res, st->subframeSize, st->lpcSize);
       residue_zero(res, st->interp_qlpc, st->buf2, st->subframeSize, st->lpcSize);
       residue_zero(st->buf2, st->bw_lpc2, st->buf2, st->subframeSize, st->lpcSize);
-      if (snr>5 && (rand()%10==0))
+      if (snr>9 && (rand()%10==0))
       {
          printf ("exc ");
          for (i=0;i<st->subframeSize;i++)
@@ -332,9 +332,9 @@ void encode(EncState *st, float *in, FrameBits *bits)
          }
          printf ("\n");
       }
-      for (i=0;i<st->subframeSize;i++)
+      /*for (i=0;i<st->subframeSize;i++)
          exc[i]+=st->buf2[i];
-#else
+#else*/
       /* Perform a split-codebook search */
       st->innovation_quant(target, st->interp_qlpc, st->bw_lpc1, st->bw_lpc2,
                            st->innovation_params, st->lpcSize,