admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed the deactivation of the level controller when there is a built-in AGC available

Browse Source 
BUG=

Review-Url: https://codereview.webrtc.org/2240763002
Cr-Commit-Position: refs/heads/master@{#13853}
This commit is contained in:
peah 2016-08-22 12:08:55 -07:00 committed by Commit bot
parent 8c16520949
commit 72a5645fdf
1 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
webrtc/media/engine/webrtcvoiceengine.cc
View File

@ -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<bool> built_in_agc_avaliable;
if (options.level_control) {
if (!built_in_agc_avaliable) {
built_in_agc_avaliable =
rtc::Optional<bool>(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<bool>(false);
}
}
if (options.auto_gain_control) {
if (!built_in_agc_avaliable) {
built_in_agc_avaliable =
rtc::Optional<bool>(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,