diff options
| author | Jean-Marc Valin <jean-marc.valin@octasic.com> | 2011-05-04 00:20:11 +0400 |
|---|---|---|
| committer | Jean-Marc Valin <jean-marc.valin@octasic.com> | 2011-05-04 00:20:11 +0400 |
| commit | 0734cad597afabc4d0080fbf435010c03d1a6f33 (patch) | |
| tree | 797ddf7b9f8502875ce0640c686f475a06157204 | |
| parent | ecb2ff7d86e898879802cddbb4ec73c0d736693a (diff) | |
Fixes bandwidth decision when reducing the bit-rate
| -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 bbbbcf47..a4375df3 100644 --- a/src/opus_encoder.c +++ b/src/opus_encoder.c @@ -166,9 +166,9 @@ int opus_encode(OpusEncoder *st, const short *pcm, int frame_size, { if (mono_rate>35000 || (mono_rate>28000 && st->bandwidth==BANDWIDTH_FULLBAND)) st->bandwidth = BANDWIDTH_FULLBAND; - else if (mono_rate>28000 || (mono_rate>24000 && st->bandwidth==BANDWIDTH_SUPERWIDEBAND)) + else if (mono_rate>28000 || (mono_rate>24000 && st->bandwidth>=BANDWIDTH_SUPERWIDEBAND)) st->bandwidth = BANDWIDTH_SUPERWIDEBAND; - else if (mono_rate>24000 || (mono_rate>18000 && st->bandwidth==BANDWIDTH_WIDEBAND)) + else if (mono_rate>24000 || (mono_rate>18000 && st->bandwidth>=BANDWIDTH_WIDEBAND)) st->bandwidth = BANDWIDTH_WIDEBAND; else st->bandwidth = BANDWIDTH_NARROWBAND; @@ -176,11 +176,11 @@ int opus_encode(OpusEncoder *st, const short *pcm, int frame_size, { if (mono_rate>30000 || (mono_rate>26000 && st->bandwidth==BANDWIDTH_FULLBAND)) st->bandwidth = BANDWIDTH_FULLBAND; - else if (mono_rate>22000 || (mono_rate>18000 && st->bandwidth==BANDWIDTH_SUPERWIDEBAND)) + else if (mono_rate>22000 || (mono_rate>18000 && st->bandwidth>=BANDWIDTH_SUPERWIDEBAND)) st->bandwidth = BANDWIDTH_SUPERWIDEBAND; - else if (mono_rate>16000 || (mono_rate>13000 && st->bandwidth==BANDWIDTH_WIDEBAND)) + else if (mono_rate>16000 || (mono_rate>13000 && st->bandwidth>=BANDWIDTH_WIDEBAND)) st->bandwidth = BANDWIDTH_WIDEBAND; - else if (mono_rate>13000 || (mono_rate>10000 && st->bandwidth==BANDWIDTH_MEDIUMBAND)) + else if (mono_rate>13000 || (mono_rate>10000 && st->bandwidth>=BANDWIDTH_MEDIUMBAND)) st->bandwidth = BANDWIDTH_MEDIUMBAND; else st->bandwidth = BANDWIDTH_NARROWBAND; |