eden-emu/opus
19
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Retrained coarse energy mean and beta coefficients

Browse source
This commit is contained in:
Jean-Marc Valin 2010-10-09 21:07:51 -04:00
parent 8ccda8877d
commit 8226ac083e
1 changed files with 23 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

40
libcelt/quant_bands.c
View file

@ -45,25 +45,29 @@
#ifdef FIXED_POINT #ifdef FIXED_POINT
/* Mean energy in each band quantized in Q6 */ /* Mean energy in each band quantized in Q6 */
const signed char eMeans[25] = { const signed char eMeans[25] = {
124,122,115,106,100, 92, 85, 76, 69, 65,
95, 91, 90, 99, 96, 61, 56, 55, 63, 61,
94, 93, 98, 91, 86, 59, 57, 65, 61, 57,
90, 88, 88, 90, 85, 61, 59, 64, 66, 63,
64, 64, 64, 64, 64}; 54, 54, 54, 54, 54
};
#else #else
/* Mean energy in each band quantized in Q6 and converted back to float */ /* Mean energy in each band quantized in Q6 and converted back to float */
const celt_word16 eMeans[25] = { const celt_word16 eMeans[25] = {
7.750000f, 7.625000f, 7.187500f, 6.625000f, 6.250000f, 5.750000f, 5.312500f, 4.750000f, 4.312500f, 4.062500f,
5.937500f, 5.687500f, 5.625000f, 6.187500f, 6.000000f, 3.812500f, 3.500000f, 3.437500f, 3.937500f, 3.812500f,
5.875000f, 5.812500f, 6.125000f, 5.687500f, 5.375000f, 3.687500f, 3.562500f, 4.062500f, 3.812500f, 3.562500f,
5.625000f, 5.500000f, 5.500000f, 5.625000f, 5.312500f, 3.812500f, 3.687500f, 4.000000f, 4.125000f, 3.937500f,
4.000000f, 4.000000f, 4.000000f, 4.000000f, 4.000000f}; 3.375000f, 3.375000f, 3.375000f, 3.375000f, 3.375000f
};
#endif #endif
/* prediction coefficients: 0.9, 0.8, 0.65, 0.5 */ /* prediction coefficients: 0.9, 0.8, 0.65, 0.5 */
#ifdef FIXED_POINT #ifdef FIXED_POINT
static const celt_word16 pred_coef[4] = {29440, 26112, 21248, 16384}; static const celt_word16 pred_coef[4] = {29440, 26112, 21248, 16384};
static const celt_word16 beta_coef[4] = {30147, 22282, 12124, 6554};
#else #else
static const celt_word16 pred_coef[4] = {29440/32768., 26112/32768., 21248/32768., 16384/32768.}; static const celt_word16 pred_coef[4] = {29440/32768., 26112/32768., 21248/32768., 16384/32768.};
static const celt_word16 beta_coef[4] = {30147/32768., 22282/32768., 12124/32768., 6554/32768.};
#endif #endif
static int intra_decision(const celt_word16 *eBands, celt_word16 *oldEBands, int start, int end, int len, int C) static int intra_decision(const celt_word16 *eBands, celt_word16 *oldEBands, int start, int end, int len, int C)
@ -120,16 +124,17 @@ static void quant_coarse_energy_impl(const CELTMode *m, int start, int end,
celt_word16 coef; celt_word16 coef;
celt_word16 beta; celt_word16 beta;
coef = pred_coef[LM];
ec_enc_bit_prob(enc, intra, 8192); ec_enc_bit_prob(enc, intra, 8192);
if (intra) if (intra)
{ {
coef = 0; coef = 0;
prob += 2*m->nbEBands; prob += 2*m->nbEBands;
beta = QCONST16(.15f,15);
} else {
beta = beta_coef[LM];
coef = pred_coef[LM];
} }
/* No theoretical justification for this, it just works */
beta = MULT16_16_P15(coef,coef);
/* Encode at a fixed coarse resolution */ /* Encode at a fixed coarse resolution */
for (i=start;i<end;i++) for (i=start;i<end;i++)
{ {
@ -336,15 +341,16 @@ void unquant_coarse_energy(const CELTMode *m, int start, int end, celt_ener *eBa
celt_word16 beta; celt_word16 beta;
const int C = CHANNELS(_C); const int C = CHANNELS(_C);
coef = pred_coef[LM];
if (intra) if (intra)
{ {
coef = 0; coef = 0;
beta = QCONST16(.15f,15);
prob += 2*m->nbEBands; prob += 2*m->nbEBands;
} else {
beta = beta_coef[LM];
coef = pred_coef[LM];
} }
/* No theoretical justification for this, it just works */
beta = MULT16_16_P15(coef,coef);
/* Decode at a fixed coarse resolution */ /* Decode at a fixed coarse resolution */
for (i=start;i<end;i++) for (i=start;i<end;i++)