Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(434)

Unified Diff: webrtc/modules/audio_coding/codecs/isac/fix/source/audio_encoder_isacfix.cc

Issue 1322973004: Fold AudioEncoderMutable into AudioEncoder (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: review fixes Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/modules/audio_coding/codecs/isac/fix/source/audio_encoder_isacfix.cc
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/audio_encoder_isacfix.cc b/webrtc/modules/audio_coding/codecs/isac/fix/source/audio_encoder_isacfix.cc
index 2f8d4b6e5d411f661f9b7be4fefedc42ee2cd961..9b2f3174b890e3bd23f3f6308958fbf19cff0f83 100644
--- a/webrtc/modules/audio_coding/codecs/isac/fix/source/audio_encoder_isacfix.cc
+++ b/webrtc/modules/audio_coding/codecs/isac/fix/source/audio_encoder_isacfix.cc
@@ -10,7 +10,6 @@
#include "webrtc/modules/audio_coding/codecs/isac/fix/interface/audio_encoder_isacfix.h"
-#include "webrtc/common_types.h"
#include "webrtc/modules/audio_coding/codecs/isac/audio_encoder_isac_t_impl.h"
namespace webrtc {
@@ -21,38 +20,4 @@ const uint16_t IsacFix::kFixSampleRate;
template class AudioEncoderIsacT<IsacFix>;
template class AudioDecoderIsacT<IsacFix>;
-namespace {
-AudioEncoderIsacFix::Config CreateConfig(const CodecInst& codec_inst,
- LockedIsacBandwidthInfo* bwinfo) {
- AudioEncoderIsacFix::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
-
-AudioEncoderMutableIsacFix::AudioEncoderMutableIsacFix(
- const CodecInst& codec_inst,
- LockedIsacBandwidthInfo* bwinfo)
- : AudioEncoderMutableImpl<AudioEncoderIsacFix>(
- CreateConfig(codec_inst, bwinfo)) {}
-
-void AudioEncoderMutableIsacFix::SetMaxPayloadSize(int max_payload_size_bytes) {
- auto conf = config();
- conf.max_payload_size_bytes = max_payload_size_bytes;
- Reconstruct(conf);
-}
-
-void AudioEncoderMutableIsacFix::SetMaxRate(int max_rate_bps) {
- auto conf = config();
- conf.max_bit_rate = max_rate_bps;
- Reconstruct(conf);
-}
-
} // namespace webrtc

Powered by Google App Engine
This is Rietveld 408576698