From 72a5645fdf94507a1fd7b662200657ddc4de3a8c Mon Sep 17 00:00:00 2001 From: peah Date: Mon, 22 Aug 2016 12:08:55 -0700 Subject: [PATCH] Removed the deactivation of the level controller when there is a built-in AGC available BUG= Review-Url: https://codereview.webrtc.org/2240763002 Cr-Commit-Position: refs/heads/master@{#13853} --- webrtc/media/engine/webrtcvoiceengine.cc | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/webrtc/media/engine/webrtcvoiceengine.cc b/webrtc/media/engine/webrtcvoiceengine.cc index c7fd768913..a61b8c4284 100644 --- a/webrtc/media/engine/webrtcvoiceengine.cc +++ b/webrtc/media/engine/webrtcvoiceengine.cc @@ -694,29 +694,9 @@ bool WebRtcVoiceEngine::ApplyOptions(const AudioOptions& options_in) { } } - // Use optional to avoid uneccessary calls to BuiltInAGCIsAvailable while - // complying with the unittest requirements of only 1 call per test. - rtc::Optional built_in_agc_avaliable; - if (options.level_control) { - if (!built_in_agc_avaliable) { - built_in_agc_avaliable = - rtc::Optional(adm()->BuiltInAGCIsAvailable()); - } - RTC_DCHECK(built_in_agc_avaliable); - if (*built_in_agc_avaliable) { - // Disable internal software level control if built-in AGC is enabled, - // i.e., replace the software AGC with the built-in AGC. - options.level_control = rtc::Optional(false); - } - } - if (options.auto_gain_control) { - if (!built_in_agc_avaliable) { - built_in_agc_avaliable = - rtc::Optional(adm()->BuiltInAGCIsAvailable()); - } - RTC_DCHECK(built_in_agc_avaliable); - if (*built_in_agc_avaliable) { + bool built_in_agc_avaliable = adm()->BuiltInAGCIsAvailable(); + if (built_in_agc_avaliable) { if (adm()->EnableBuiltInAGC(*options.auto_gain_control) == 0 && *options.auto_gain_control) { // Disable internal software AGC if built-in AGC is enabled,