mirror of
https://github.com/xiph/opus.git
synced 2025-05-30 07:07:42 +00:00
Makes tonality boost less aggressive
Some tests like Kamedo's HA test suggested that our tonal boost was a bit too extreme.
This commit is contained in:
parent
41fd7a12b5
commit
b33db8f318
1 changed files with 4 additions and 4 deletions
|
@ -1568,14 +1568,14 @@ int celt_encode_with_ec(CELTEncoder * OPUS_RESTRICT st, const opus_val16 * pcm,
|
||||||
float tonal;
|
float tonal;
|
||||||
|
|
||||||
/* Compensates for the average tonality boost */
|
/* Compensates for the average tonality boost */
|
||||||
target -= MULT16_16_Q15(QCONST16(0.13f,15),coded_bins<<BITRES);
|
target -= MULT16_16_Q15(QCONST16(0.11f,15),coded_bins<<BITRES);
|
||||||
|
|
||||||
tonal = MAX16(0,st->analysis.tonality-.2);
|
tonal = MAX16(0,st->analysis.tonality-.15);
|
||||||
tonal_target = target + (coded_bins<<BITRES)*2.0f*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;
|
||||||
/*printf("%f %f ", st->analysis.tonality, tonal);*/
|
/*printf("%f %f ", st->analysis.tonality, tonal);*/
|
||||||
target = IMAX(tonal_target,target);
|
target = tonal_target;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue