zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Turn off comfort noise generation by default in AECM

Browse Source 
All clients who do not own their own APM turn it off by default
(in WebrtcVoiceEngine). AECM with comfort noise is a little-exercised
code path. Configurability of this setting is going away, so we're
better off disabling it by default.

Bug: webrtc:9535
Change-Id: Iba839aa18e79ae29ff20bdf6e30de77870ba4143
Reviewed-on: https://webrtc-review.googlesource.com/89583
Reviewed-by: Fredrik Solenberg <solenberg@webrtc.org>
Reviewed-by: Alex Loiko <aleloi@webrtc.org>
Commit-Queue: Sam Zackrisson <saza@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24078}
This commit is contained in:
Sam Zackrisson
2018-07-20 15:22:50 +02:00
committed by Commit Bot
parent e9b1854b69
commit e507b0ce8e
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media/engine/apm_helpers_unittest.cc
View File

@ -185,7 +185,7 @@ TEST(ApmHelpersTest, AecmMode_DefaultMode) {
TestHelper helper; TestHelper helper;
EchoControlMobile* ecm = helper.apm()->echo_control_mobile(); EchoControlMobile* ecm = helper.apm()->echo_control_mobile();
EXPECT_EQ(EchoControlMobile::kSpeakerphone, ecm->routing_mode()); EXPECT_EQ(EchoControlMobile::kSpeakerphone, ecm->routing_mode());
EXPECT_TRUE(ecm->is_comfort_noise_enabled()); EXPECT_FALSE(ecm->is_comfort_noise_enabled());
} }
TEST(ApmHelpersTest, AecmMode_EnableDisableCng) { TEST(ApmHelpersTest, AecmMode_EnableDisableCng) {

4
modules/audio_processing/audio_processing_unittest.cc
View File

@ -2182,9 +2182,9 @@ TEST_F(ApmTest, Process) {
// or generate a separate android reference. // or generate a separate android reference.
#if defined(WEBRTC_ANDROID) #if defined(WEBRTC_ANDROID)
const int kHasVoiceCountOffset = 3; const int kHasVoiceCountOffset = 3;
const int kHasVoiceCountNear = 4; const int kHasVoiceCountNear = 8;
const int kMaxOutputAverageOffset = 9; const int kMaxOutputAverageOffset = 9;
const int kMaxOutputAverageNear = 9; const int kMaxOutputAverageNear = 26;
#else #else
const int kHasVoiceCountOffset = 0; const int kHasVoiceCountOffset = 0;
const int kHasVoiceCountNear = kIntNear; const int kHasVoiceCountNear = kIntNear;

2
modules/audio_processing/echo_control_mobile_impl.cc
View File

@ -113,7 +113,7 @@ EchoControlMobileImpl::EchoControlMobileImpl(rtc::CriticalSection* crit_render,
: crit_render_(crit_render), : crit_render_(crit_render),
crit_capture_(crit_capture), crit_capture_(crit_capture),
routing_mode_(kSpeakerphone), routing_mode_(kSpeakerphone),
comfort_noise_enabled_(true), comfort_noise_enabled_(false),
external_echo_path_(NULL) { external_echo_path_(NULL) {
RTC_DCHECK(crit_render); RTC_DCHECK(crit_render);
RTC_DCHECK(crit_capture); RTC_DCHECK(crit_capture);

2
resources/audio_processing/output_data_fixed.pb.sha1
View File

@ -1 +1 @@
7d9a02619aa4a3095ee8d48697bffef8437e6fe0 75a835fd9e641531989b7ee1de20e84b553d3bc9