| Index: webrtc/modules/audio_coding/codecs/isac/main/source/audio_encoder_isac.cc
|
| diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/audio_encoder_isac.cc b/webrtc/modules/audio_coding/codecs/isac/main/source/audio_encoder_isac.cc
|
| index 195265dba60dbd8c2fb5ce1733986b706361580d..eac7cc79e7debf98d0ac61f7b44126b713e15076 100644
|
| --- a/webrtc/modules/audio_coding/codecs/isac/main/source/audio_encoder_isac.cc
|
| +++ b/webrtc/modules/audio_coding/codecs/isac/main/source/audio_encoder_isac.cc
|
| @@ -10,7 +10,6 @@
|
|
|
| #include "webrtc/modules/audio_coding/codecs/isac/main/interface/audio_encoder_isac.h"
|
|
|
| -#include "webrtc/common_types.h"
|
| #include "webrtc/modules/audio_coding/codecs/isac/audio_encoder_isac_t_impl.h"
|
|
|
| namespace webrtc {
|
| @@ -19,40 +18,4 @@ namespace webrtc {
|
| template class AudioEncoderIsacT<IsacFloat>;
|
| template class AudioDecoderIsacT<IsacFloat>;
|
|
|
| -namespace {
|
| -AudioEncoderIsac::Config CreateConfig(const CodecInst& codec_inst,
|
| - LockedIsacBandwidthInfo* bwinfo) {
|
| - AudioEncoderIsac::Config config;
|
| - config.bwinfo = bwinfo;
|
| - config.payload_type = codec_inst.pltype;
|
| - config.sample_rate_hz = codec_inst.plfreq;
|
| - config.frame_size_ms =
|
| - rtc::CheckedDivExact(1000 * codec_inst.pacsize, config.sample_rate_hz);
|
| - if (codec_inst.rate != -1)
|
| - config.bit_rate = codec_inst.rate;
|
| - config.adaptive_mode = (codec_inst.rate == -1);
|
| - return config;
|
| -}
|
| -} // namespace
|
| -
|
| -AudioEncoderMutableIsacFloat::AudioEncoderMutableIsacFloat(
|
| - const CodecInst& codec_inst,
|
| - LockedIsacBandwidthInfo* bwinfo)
|
| - : AudioEncoderMutableImpl<AudioEncoderIsac>(
|
| - CreateConfig(codec_inst, bwinfo)) {
|
| -}
|
| -
|
| -void AudioEncoderMutableIsacFloat::SetMaxPayloadSize(
|
| - int max_payload_size_bytes) {
|
| - auto conf = config();
|
| - conf.max_payload_size_bytes = max_payload_size_bytes;
|
| - Reconstruct(conf);
|
| -}
|
| -
|
| -void AudioEncoderMutableIsacFloat::SetMaxRate(int max_rate_bps) {
|
| - auto conf = config();
|
| - conf.max_bit_rate = max_rate_bps;
|
| - Reconstruct(conf);
|
| -}
|
| -
|
| } // namespace webrtc
|
|
|