shithub: opus

Info  •  Files  •  Log  •  Branches

Fixes two bandwidth decision issues

1) In cases where the SILK desired bandwidth went down, then quickly up, we
count get stuck in a mode with the LP variation going the wrong way.
2) Bandwidth detection can no longer force SILK to go below wideband to
avoid switches that require redundancy.

--- a/silk/control_audio_bandwidth.c

+++ b/silk/control_audio_bandwidth.c

@@ -115,6 +115,9 @@

                        psEncC->sLP.mode = 1;

                    }

                 }

+            } else {

+               if (psEncC->sLP.mode<0)

+                  psEncC->sLP.mode = 1;

             }

         }

     }

--- a/src/opus_encoder.c

+++ b/src/opus_encoder.c

@@ -858,9 +858,15 @@

     if (st->Fs <= 8000 && st->bandwidth > OPUS_BANDWIDTH_NARROWBAND)

         st->bandwidth = OPUS_BANDWIDTH_NARROWBAND;

 #ifndef FIXED_POINT

+    /* Use detected bandwidth to reduce the encoded bandwidth. */

     if (st->detected_bandwidth && st->user_bandwidth == OPUS_AUTO)

     {

-       st->bandwidth = IMIN(st->bandwidth, st->detected_bandwidth);

+       /* When operating in SILK/hybrid mode, we don't go below wideband to avoid

+          more complicated switches that require redundancy */

+       if (st->mode == MODE_CELT_ONLY)

+          st->bandwidth = IMIN(st->bandwidth, st->detected_bandwidth);

+       else

+          st->bandwidth = IMIN(st->bandwidth, IMAX(OPUS_BANDWIDTH_WIDEBAND, st->detected_bandwidth));

     }

 #endif

     celt_encoder_ctl(celt_enc, OPUS_SET_LSB_DEPTH(lsb_depth));