summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Marc Valin <jmvalin@jmvalin.ca>2016-06-02 15:50:22 -0400
committerJean-Marc Valin <jmvalin@jmvalin.ca>2016-06-03 19:15:52 -0400
commit8ea37b0b03a365c60b2dc49ab2788e654f0c239f (patch)
treee2ba2ca9e93729db06d0f1e172846db8df743b1f
parent208e4bf1bd45f22fe278cbf97f69fd17691c6265 (diff)
downloadopus-8ea37b0b03a365c60b2dc49ab2788e654f0c239f.tar.gz
Making the encoder more aggressive at using wider bandwidths
-rw-r--r--src/opus_encoder.c34
1 files changed, 17 insertions, 17 deletions
diff --git a/src/opus_encoder.c b/src/opus_encoder.c
index e54eccc6..17ab93a2 100644
--- a/src/opus_encoder.c
+++ b/src/opus_encoder.c
@@ -122,28 +122,28 @@ struct OpusEncoder {
middle (memoriless) threshold. The second column is the hysteresis
(difference with the middle) */
static const opus_int32 mono_voice_bandwidth_thresholds[8] = {
- 11000, 1000, /* NB<->MB */
- 12500, 1000, /* MB<->WB */
- 14000, 1000, /* WB<->SWB */
- 15000, 2000, /* SWB<->FB */
+ 10000, 1000, /* NB<->MB */
+ 11000, 1000, /* MB<->WB */
+ 13500, 1000, /* WB<->SWB */
+ 14000, 2000, /* SWB<->FB */
};
static const opus_int32 mono_music_bandwidth_thresholds[8] = {
- 11000, 1000, /* NB<->MB */
- 12500, 1000, /* MB<->WB */
- 14000, 1000, /* WB<->SWB */
- 15000, 2000, /* SWB<->FB */
+ 10000, 1000, /* NB<->MB */
+ 11000, 1000, /* MB<->WB */
+ 13500, 1000, /* WB<->SWB */
+ 14000, 2000, /* SWB<->FB */
};
static const opus_int32 stereo_voice_bandwidth_thresholds[8] = {
- 11000, 1000, /* NB<->MB */
- 12500, 1000, /* MB<->WB */
- 14000, 1000, /* WB<->SWB */
- 15000, 2000, /* SWB<->FB */
+ 10000, 1000, /* NB<->MB */
+ 11000, 1000, /* MB<->WB */
+ 13500, 1000, /* WB<->SWB */
+ 14000, 2000, /* SWB<->FB */
};
static const opus_int32 stereo_music_bandwidth_thresholds[8] = {
- 11000, 1000, /* NB<->MB */
- 12500, 1000, /* MB<->WB */
- 14000, 1000, /* WB<->SWB */
- 15000, 2000, /* SWB<->FB */
+ 10000, 1000, /* NB<->MB */
+ 11000, 1000, /* MB<->WB */
+ 13500, 1000, /* WB<->SWB */
+ 14000, 2000, /* SWB<->FB */
};
/* Threshold bit-rates for switching between mono and stereo */
static const opus_int32 stereo_voice_threshold = 24000;
@@ -954,7 +954,7 @@ static int compute_silk_rate_for_hybrid(int rate, int bandwidth, int frame20ms,
SWB-10 FB-10 SWB-20 FB-20 */
{ 0, 0, 0, 0, 0},
{12000, 10000, 10000, 10000, 10000},
- {16000, 14000, 14000, 14000, 14000},
+ {16000, 14000, 14000, 14000, 13500},
{20000, 16000, 16000, 16000, 16000},
{24000, 18000, 18000, 18000, 18000},
{32000, 22000, 22000, 22000, 22000},