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

Reorganizing the VBR code

Browse source
This commit is contained in:
Jean-Marc Valin 2010-08-07 21:42:03 -04:00
parent d38d6b9aa1
commit be04f5af6c
1 changed files with 22 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

46
libcelt/celt.c
View file

@ -630,7 +630,6 @@ int celt_encode_with_ec_float(CELTEncoder * restrict st, const celt_sig * pcm, c
int mdct_weight_pos=0; int mdct_weight_pos=0;
int LM, M; int LM, M;
int tf_select; int tf_select;
celt_int32 vbr_rate=0;
celt_word16 max_decay; celt_word16 max_decay;
int nbFilledBytes, nbAvailableBytes; int nbFilledBytes, nbAvailableBytes;
int effEnd; int effEnd;
@ -825,29 +824,11 @@ int celt_encode_with_ec_float(CELTEncoder * restrict st, const celt_sig * pcm, c
} }
} }
ALLOC(fine_quant, st->mode->nbEBands, int);
ALLOC(pulses, st->mode->nbEBands, int);
vbr_rate = M*st->vbr_rate_norm;
/* Computes the max bit-rate allowed in VBR more to avoid busting the budget */
if (st->vbr_rate_norm>0)
{
celt_int32 vbr_bound, max_allowed;
vbr_bound = vbr_rate;
max_allowed = (vbr_rate + vbr_bound - st->vbr_reservoir)>>(BITRES+3);
if (max_allowed < 4)
max_allowed = 4;
if (max_allowed < nbAvailableBytes)
nbAvailableBytes = max_allowed;
}
ALLOC(tf_res, st->mode->nbEBands, int); ALLOC(tf_res, st->mode->nbEBands, int);
tf_select = tf_analysis(bandLogE, st->oldBandE, effEnd, C, isTransient, tf_res, nbAvailableBytes); tf_select = tf_analysis(bandLogE, st->oldBandE, effEnd, C, isTransient, tf_res, nbAvailableBytes);
for (i=effEnd;i<st->end;i++) for (i=effEnd;i<st->end;i++)
tf_res[i] = tf_res[effEnd-1]; tf_res[i] = tf_res[effEnd-1];
/* Bit allocation */
ALLOC(error, C*st->mode->nbEBands, celt_word16); ALLOC(error, C*st->mode->nbEBands, celt_word16);
#ifdef FIXED_POINT #ifdef FIXED_POINT
@ -856,14 +837,30 @@ int celt_encode_with_ec_float(CELTEncoder * restrict st, const celt_sig * pcm, c
max_decay = MIN32(16.f, .125f*nbAvailableBytes); max_decay = MIN32(16.f, .125f*nbAvailableBytes);
#endif #endif
quant_coarse_energy(st->mode, st->start, st->end, bandLogE, st->oldBandE, nbCompressedBytes*8, intra_ener, st->mode->prob, error, enc, C, LM, max_decay); quant_coarse_energy(st->mode, st->start, st->end, bandLogE, st->oldBandE, nbCompressedBytes*8, intra_ener, st->mode->prob, error, enc, C, LM, max_decay);
tf_encode(st->start, st->end, isTransient, tf_res, nbAvailableBytes, LM, tf_select, enc);
/* Variable bitrate */ /* Variable bitrate */
if (vbr_rate>0) if (st->vbr_rate_norm>0)
{ {
celt_word16 alpha; celt_word16 alpha;
celt_int32 delta; celt_int32 delta;
/* The target rate in 16th bits per frame */ /* The target rate in 16th bits per frame */
celt_int32 target=vbr_rate; celt_int32 vbr_rate;
celt_int32 target;
celt_int32 vbr_bound, max_allowed;
vbr_rate = M*st->vbr_rate_norm;
/* Computes the max bit-rate allowed in VBR more to avoid busting the budget */
vbr_bound = vbr_rate;
max_allowed = (vbr_rate + vbr_bound - st->vbr_reservoir)>>(BITRES+3);
if (max_allowed < 4)
max_allowed = 4;
if (max_allowed < nbAvailableBytes)
nbAvailableBytes = max_allowed;
target=vbr_rate;
/* Shortblocks get a large boost in bitrate, but since they /* Shortblocks get a large boost in bitrate, but since they
are uncommon long blocks are not greatly effected */ are uncommon long blocks are not greatly effected */
if (shortBlocks) if (shortBlocks)
@ -914,8 +911,9 @@ int celt_encode_with_ec_float(CELTEncoder * restrict st, const celt_sig * pcm, c
ec_byte_shrink(&buf, nbCompressedBytes); ec_byte_shrink(&buf, nbCompressedBytes);
} }
tf_encode(st->start, st->end, isTransient, tf_res, nbAvailableBytes, LM, tf_select, enc); /* Bit allocation */
ALLOC(fine_quant, st->mode->nbEBands, int);
ALLOC(pulses, st->mode->nbEBands, int);
ALLOC(offsets, st->mode->nbEBands, int); ALLOC(offsets, st->mode->nbEBands, int);
ALLOC(fine_priority, st->mode->nbEBands, int); ALLOC(fine_priority, st->mode->nbEBands, int);