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

New implementation of folding_decision()

Browse source
This commit is contained in:
Jean-Marc Valin 2010-08-31 14:51:58 -04:00
parent 6f6c88bef1
commit 1d17b9ae67
3 changed files with 52 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

11
libcelt/celt.c
View file

@ -84,7 +84,7 @@ struct CELTEncoder {
celt_word32 frame_max;
int fold_decision;
int delayedIntra;
celt_word16 tonal_average;
int tonal_average;
/* VBR-related parameters */
celt_int32 vbr_reservoir;
@ -754,8 +754,13 @@ int celt_encode_with_ec_float(CELTEncoder * restrict st, const celt_sig * pcm, c
tf_encode(st->start, st->end, isTransient, tf_res, nbAvailableBytes, LM, tf_select, enc);
if (!shortBlocks && !folding_decision(st->mode, X, &st->tonal_average, &st->fold_decision, effEnd, C, M))
has_fold = 0;
if (shortBlocks)
{
has_fold = 1;
st->fold_decision = 1;
} else {
has_fold = folding_decision(st->mode, X, &st->tonal_average, &st->fold_decision, effEnd, C, M);
}
ec_enc_bit_prob(enc, has_fold>>1, 8192);
ec_enc_bit_prob(enc, has_fold&1, (has_fold>>1) ? 32768 : 49152);