Don't take into account silence for the coarse energy means
authorJean-Marc Valin <jean-marc.valin@usherbrooke.ca>
Wed, 13 Oct 2010 02:18:09 +0000 (22:18 -0400)
committerJean-Marc Valin <jean-marc.valin@usherbrooke.ca>
Wed, 13 Oct 2010 02:18:09 +0000 (22:18 -0400)
libcelt/quant_bands.c

index 0753678..b3a836c 100644 (file)
 #ifdef FIXED_POINT
 /* Mean energy in each band quantized in Q6 */
 const signed char eMeans[25] = {
-      92, 85, 76, 69, 65,
-      61, 56, 55, 63, 61,
-      59, 57, 65, 61, 57,
-      61, 59, 64, 66, 63,
-      54, 54, 54, 54, 54
+      103,100, 92, 85, 81,
+       77, 72, 70, 78, 75,
+       73, 71, 78, 74, 69,
+       72, 70, 74, 76, 71,
+       60, 60, 60, 60, 60
 };
 #else
 /* Mean energy in each band quantized in Q6 and converted back to float */
 const celt_word16 eMeans[25] = {
-      5.750000f, 5.312500f, 4.750000f, 4.312500f, 4.062500f,
-      3.812500f, 3.500000f, 3.437500f, 3.937500f, 3.812500f,
-      3.687500f, 3.562500f, 4.062500f, 3.812500f, 3.562500f,
-      3.812500f, 3.687500f, 4.000000f, 4.125000f, 3.937500f,
-      3.375000f, 3.375000f, 3.375000f, 3.375000f, 3.375000f
-      };
+      6.437500f, 6.250000f, 5.750000f, 5.312500f, 5.062500f,
+      4.812500f, 4.500000f, 4.375000f, 4.875000f, 4.687500f,
+      4.562500f, 4.437500f, 4.875000f, 4.625000f, 4.312500f,
+      4.500000f, 4.375000f, 4.625000f, 4.750000f, 4.437500f,
+      3.750000f, 3.750000f, 3.750000f, 3.750000f, 3.750000f
+};
 #endif
 /* prediction coefficients: 0.9, 0.8, 0.65, 0.5 */
 #ifdef FIXED_POINT