eden-emu/opus
15
0
Fork 0
mirror of https://github.com/xiph/opus.git synced 2025-06-02 16:47:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

VBR code simplification

Browse source
This commit is contained in:
Jean-Marc Valin 2012-12-14 13:21:09 -05:00
parent dae16fb94b
commit 28ef277db4
1 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
celt/celt_encoder.c
View file

@ -1555,8 +1555,7 @@ int celt_encode_with_ec(CELTEncoder * OPUS_RESTRICT st, const opus_val16 * pcm,
max_frac = DIV32_16(MULT16_16(QCONST16(0.8f, 15), coded_stereo_dof), coded_bins); max_frac = DIV32_16(MULT16_16(QCONST16(0.8f, 15), coded_stereo_dof), coded_bins);
/*printf("%d %d %d ", coded_stereo_dof, coded_bins, tot_boost);*/ /*printf("%d %d %d ", coded_stereo_dof, coded_bins, tot_boost);*/
target -= MIN32(MULT16_32_Q15(max_frac,target), target -= MIN32(MULT16_32_Q15(max_frac,target),
SHR16(MULT16_16(st->stereo_saving,(coded_stereo_dof<<BITRES)),8)); SHR16(MULT16_16(st->stereo_saving-QCONST16(0.1f,8),(coded_stereo_dof<<BITRES)),8));
target += MULT16_16_Q15(QCONST16(0.1f,15),coded_stereo_dof<<BITRES);
} }
/* Boost the rate according to dynalloc (minus the dynalloc average for calibration). */ /* Boost the rate according to dynalloc (minus the dynalloc average for calibration). */
target += tot_boost-(16<<LM); target += tot_boost-(16<<LM);
@ -1569,10 +1568,8 @@ int celt_encode_with_ec(CELTEncoder * OPUS_RESTRICT st, const opus_val16 * pcm,
int tonal_target; int tonal_target;
float tonal; float tonal;
/* Compensates for the average tonality boost */ /* Tonality boost (compensating for the average). */
target -= MULT16_16_Q15(QCONST16(0.11f,15),coded_bins<<BITRES); tonal = MAX16(0,st->analysis.tonality-.15)-0.09;
tonal = MAX16(0,st->analysis.tonality-.15);
tonal_target = target + (coded_bins<<BITRES)*1.2f*tonal; tonal_target = target + (coded_bins<<BITRES)*1.2f*tonal;
if (pitch_change) if (pitch_change)
tonal_target += (coded_bins<<BITRES)*.8; tonal_target += (coded_bins<<BITRES)*.8;