Delete full-band mode from the iSAC codec

webrtc/modules/audio_coding/codecs/isac/audio_encoder_isac_t_impl.h

Index: webrtc/modules/audio_coding/codecs/isac/audio_encoder_isac_t_impl.h
diff --git a/webrtc/modules/audio_coding/codecs/isac/audio_encoder_isac_t_impl.h b/webrtc/modules/audio_coding/codecs/isac/audio_encoder_isac_t_impl.h
index fbc1ba91399d61c696eb80cf098049cd7f281dfb..b9be74ef970ab621ab67c2ea2f14869e26333f67 100644
--- a/webrtc/modules/audio_coding/codecs/isac/audio_encoder_isac_t_impl.h
+++ b/webrtc/modules/audio_coding/codecs/isac/audio_encoder_isac_t_impl.h
@@ -50,7 +50,6 @@ bool AudioEncoderIsacT<T>::Config::IsOk() const {
       return (frame_size_ms == 30 || frame_size_ms == 60) &&
              (bit_rate == 0 || (bit_rate >= 10000 && bit_rate <= 32000));
     case 32000:
-    case 48000:
       if (max_bit_rate > 160000)
         return false;
       if (max_payload_size_bytes > 600)
@@ -177,15 +176,12 @@ void AudioEncoderIsacT<T>::RecreateEncoderInstance(const Config& config) {
   if (config.max_bit_rate != -1)
     RTC_CHECK_EQ(0, T::SetMaxRate(isac_state_, config.max_bit_rate));
 
-  // When config.sample_rate_hz is set to 48000 Hz (iSAC-fb), the decoder is
-  // still set to 32000 Hz, since there is no full-band mode in the decoder.
-  const int decoder_sample_rate_hz = std::min(config.sample_rate_hz, 32000);
-
   // Set the decoder sample rate even though we just use the encoder. This
   // doesn't appear to be necessary to produce a valid encoding, but without it
   // we get an encoding that isn't bit-for-bit identical with what a combined
   // encoder+decoder object produces.
-  RTC_CHECK_EQ(0, T::SetDecSampRate(isac_state_, decoder_sample_rate_hz));
+  RTC_DCHECK_LE(config.sample_rate_hz, 32000);

[kwiberg-webrtc, 2015/10/14 11:07:35]

Line 158 already verifies that this is 16000 or 32000.

[hlundin-webrtc, 2015/10/14 11:33:30]

Done.

+  RTC_CHECK_EQ(0, T::SetDecSampRate(isac_state_, config.sample_rate_hz));
 
   config_ = config;
 }