diff options
| author | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2016-04-22 16:13:46 -0400 |
|---|---|---|
| committer | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2016-06-02 15:13:35 -0400 |
| commit | fc393af8e188d061e281250a9119dccf4d3ce6dd (patch) | |
| tree | 0c120eb336745e3e92350762de307e3d9f1a3cbc | |
| parent | 8f1f24bf82a57ac94aea2521905aa515dabbdccd (diff) | |
| download | opus-fc393af8e188d061e281250a9119dccf4d3ce6dd.tar.gz | |
Re-enabling high-band attenuation for hybrid mode
The new attenuation is much smaller than previously.
| -rw-r--r-- | src/opus_encoder.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/opus_encoder.c b/src/opus_encoder.c index 5c68759b..80d6269b 100644 --- a/src/opus_encoder.c +++ b/src/opus_encoder.c @@ -1536,7 +1536,6 @@ opus_int32 opus_encode_native(OpusEncoder *st, const opus_val16 *pcm, int frame_ /* Distribute bits between SILK and CELT */ total_bitRate = 8 * bytes_target * frame_rate; if( st->mode == MODE_HYBRID ) { - int HB_gain_ref; /* Base rate for SILK */ st->silk_mode.bitRate = compute_silk_rate_for_hybrid(total_bitRate, curr_bandwidth, st->Fs == 50 * frame_size, st->use_vbr); @@ -1544,10 +1543,7 @@ opus_int32 opus_encode_native(OpusEncoder *st, const opus_val16 *pcm, int frame_ { /* Increasingly attenuate high band when it gets allocated fewer bits */ celt_rate = total_bitRate - st->silk_mode.bitRate; - HB_gain_ref = (curr_bandwidth == OPUS_BANDWIDTH_SUPERWIDEBAND) ? 3000 : 3600; - HB_gain = SHL32((opus_val32)celt_rate, 9) / SHR32((opus_val32)celt_rate + st->stream_channels * HB_gain_ref, 6); - HB_gain = HB_gain < (opus_val32)Q15ONE*6/7 ? HB_gain + Q15ONE/7 : Q15ONE; - HB_gain = Q15ONE; + HB_gain = Q15ONE - SHR32(celt_exp2(-celt_rate * QCONST16(1.f/1024, 10)), 1); } } else { /* SILK gets all bits */ |