diff options
| author | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2015-11-28 03:10:24 +0300 |
|---|---|---|
| committer | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2016-01-11 20:15:34 +0300 |
| commit | b2a805bd8d9065af404aeb45d8b48a892fc79176 (patch) | |
| tree | b3295ff93953d0ffd494d71571518289aabb7d8b | |
| parent | 051f33971cb49f1a4c3881e598d107df917272a5 (diff) | |
Quality: Encoding music in full-band stereo from 32 kb/s
Gradual downmix now happens in the 24 kb/s to 32 kb/s range
| -rw-r--r-- | src/opus_encoder.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/opus_encoder.c b/src/opus_encoder.c index a7e19127..15250957 100644 --- a/src/opus_encoder.c +++ b/src/opus_encoder.c @@ -133,12 +133,12 @@ static const opus_int32 stereo_voice_bandwidth_thresholds[8] = { static const opus_int32 stereo_music_bandwidth_thresholds[8] = { 12000, 1000, /* NB<->MB */ 18000, 2000, /* MB<->WB */ - 21000, 2000, /* WB<->SWB */ - 30000, 2000, /* SWB<->FB */ + 20000, 2000, /* WB<->SWB */ + 24000, 2000, /* SWB<->FB */ }; /* Threshold bit-rates for switching between mono and stereo */ -static const opus_int32 stereo_voice_threshold = 30000; -static const opus_int32 stereo_music_threshold = 30000; +static const opus_int32 stereo_voice_threshold = 24000; +static const opus_int32 stereo_music_threshold = 24000; /* Threshold bit-rate for switching between SILK/hybrid and CELT-only */ static const opus_int32 mode_thresholds[2][2] = { @@ -1777,7 +1777,7 @@ opus_int32 opus_encode_native(OpusEncoder *st, const opus_val16 *pcm, int frame_ } st->prev_HB_gain = HB_gain; if (st->mode != MODE_HYBRID || st->stream_channels==1) - st->silk_mode.stereoWidth_Q14 = IMIN((1<<14),2*IMAX(0,equiv_rate-30000)); + st->silk_mode.stereoWidth_Q14 = IMIN((1<<14),2*IMAX(0,equiv_rate-24000)); if( !st->energy_masking && st->channels == 2 ) { /* Apply stereo width reduction (at low bitrates) */ if( st->hybrid_stereo_width_Q14 < (1 << 14) || st->silk_mode.stereoWidth_Q14 < (1 << 14) ) { |