commit 2c0d9ee440a9970d8ad4b6ecb49f2890fa1901cf
author Jean-Marc Valin <jmvalin@jmvalin.ca> Thu Feb 15 15:12:27 2018 -0500
committer Jean-Marc Valin <jmvalin@jmvalin.ca> Thu Feb 15 15:12:27 2018 -0500
tree 00dcf5c4d284b8c2014aa0ec6381ac6c0f79aa5a
parent cdcb2f7d2bde62759cc14cc40efd8f304218008e

Allcate more bits to CELT for stereo hybrid and don't force bits in the second CELT band

celt/rate.c

diff --git a/celt/rate.c b/celt/rate.c
index ca4cc87..599d018 100644
--- a/celt/rate.c
+++ b/celt/rate.c
@@ -358,7 +358,7 @@
 #ifdef FUZZING
             if ((rand()&0x1) == 0)
 #else
-            if (codedBands<=start+2 || (band_bits > (depth_threshold*band_width<<LM<<BITRES)>>4 && j<=signalBandwidth))
+            if (codedBands<=start+1 || (band_bits > (depth_threshold*band_width<<LM<<BITRES)>>4 && j<=signalBandwidth))
 #endif
             {
                ec_enc_bit_logp(ec, 1, 1);

src/opus_encoder.c

diff --git a/src/opus_encoder.c b/src/opus_encoder.c
index b89b874..694ff7e 100644
--- a/src/opus_encoder.c
+++ b/src/opus_encoder.c
@@ -816,7 +816,7 @@
    silk_rate *= channels;
    /* The CELT layer saves a bit more than SILK for stereo, so we boost SILK. */
    if (channels == 2 && rate >= 12000)
-      silk_rate += 1000;
+      silk_rate -= 1000;
    return silk_rate;
 }