ref: 6e277c629183ac2c8cf79fc1422e566f68b5df3e
parent: 278389defeeb9ea26100ca8f4783f44c9b446fa5
author: Jean-Marc Valin <[email protected]>
date: Fri May 17 10:15:31 EDT 2013
Conservative use of bandwidth detection in CELT Takes into account the bitrate.
--- a/celt/celt_encoder.c
+++ b/celt/celt_encoder.c
@@ -1736,7 +1736,20 @@
signalBandwidth = st->end-1;
#ifndef FIXED_POINT
if (st->analysis.valid)
- signalBandwidth = st->analysis.bandwidth;
+ {
+ int min_bandwidth;
+ if (st->bitrate < (opus_int32)32000*C)
+ min_bandwidth = 13;
+ else if (st->bitrate < (opus_int32)48000*C)
+ min_bandwidth = 16;
+ else if (st->bitrate < (opus_int32)60000*C)
+ min_bandwidth = 18;
+ else if (st->bitrate < (opus_int32)80000*C)
+ min_bandwidth = 19;
+ else
+ min_bandwidth = 20;
+ signalBandwidth = IMAX(st->analysis.bandwidth, min_bandwidth);
+ }
#endif
codedBands = compute_allocation(mode, st->start, st->end, offsets, cap,
alloc_trim, &st->intensity, &dual_stereo, bits, &balance, pulses,