diff options
| author | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2011-10-22 07:21:34 +0400 |
|---|---|---|
| committer | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2011-10-22 07:21:34 +0400 |
| commit | 3b2aee062d08fc72f12a4379ce2d6e2b444d5021 (patch) | |
| tree | 5e470d24cb1f00a2e764823fd404220f55b0ff80 /silk/control_codec.c | |
| parent | e53ebd696a34e2a74b1ccb5132a946b7c965f448 (diff) | |
Implements glitchless switching between SILK bandwidths
Only encoder changes were necessary because this uses the same
"redundant frames" mechanism as SILK<->CELT switching.
This also fixes a regression introduced in 78291b27 that was
causing the encoder to go back and forth between bandwidths when
SILK wasn't ready to change.
Diffstat (limited to 'silk/control_codec.c')
| -rw-r--r-- | silk/control_codec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/silk/control_codec.c b/silk/control_codec.c index a942336c..418be4d9 100644 --- a/silk/control_codec.c +++ b/silk/control_codec.c @@ -104,7 +104,7 @@ opus_int silk_control_encoder( /********************************************/ /* Determine internal sampling rate */ /********************************************/ - fs_kHz = silk_control_audio_bandwidth( &psEnc->sCmn ); + fs_kHz = silk_control_audio_bandwidth( &psEnc->sCmn, encControl ); if (force_fs_kHz) fs_kHz = force_fs_kHz; /********************************************/ |