From e507b0ce8e87dc5f0a1292ee1654ea9d2b1053c7 Mon Sep 17 00:00:00 2001 From: Sam Zackrisson Date: Fri, 20 Jul 2018 15:22:50 +0200 Subject: [PATCH] Turn off comfort noise generation by default in AECM 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 Reviewed-by: Alex Loiko Commit-Queue: Sam Zackrisson Cr-Commit-Position: refs/heads/master@{#24078} --- media/engine/apm_helpers_unittest.cc | 2 +- modules/audio_processing/audio_processing_unittest.cc | 4 ++-- modules/audio_processing/echo_control_mobile_impl.cc | 2 +- resources/audio_processing/output_data_fixed.pb.sha1 | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/media/engine/apm_helpers_unittest.cc b/media/engine/apm_helpers_unittest.cc index 47475cc540..1f22963152 100644 --- a/media/engine/apm_helpers_unittest.cc +++ b/media/engine/apm_helpers_unittest.cc @@ -185,7 +185,7 @@ TEST(ApmHelpersTest, AecmMode_DefaultMode) { TestHelper helper; EchoControlMobile* ecm = helper.apm()->echo_control_mobile(); 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) { diff --git a/modules/audio_processing/audio_processing_unittest.cc b/modules/audio_processing/audio_processing_unittest.cc index 4b244fc8ab..c21de99980 100644 --- a/modules/audio_processing/audio_processing_unittest.cc +++ b/modules/audio_processing/audio_processing_unittest.cc @@ -2182,9 +2182,9 @@ TEST_F(ApmTest, Process) { // or generate a separate android reference. #if defined(WEBRTC_ANDROID) const int kHasVoiceCountOffset = 3; - const int kHasVoiceCountNear = 4; + const int kHasVoiceCountNear = 8; const int kMaxOutputAverageOffset = 9; - const int kMaxOutputAverageNear = 9; + const int kMaxOutputAverageNear = 26; #else const int kHasVoiceCountOffset = 0; const int kHasVoiceCountNear = kIntNear; diff --git a/modules/audio_processing/echo_control_mobile_impl.cc b/modules/audio_processing/echo_control_mobile_impl.cc index 841364f941..272da7a71e 100644 --- a/modules/audio_processing/echo_control_mobile_impl.cc +++ b/modules/audio_processing/echo_control_mobile_impl.cc @@ -113,7 +113,7 @@ EchoControlMobileImpl::EchoControlMobileImpl(rtc::CriticalSection* crit_render, : crit_render_(crit_render), crit_capture_(crit_capture), routing_mode_(kSpeakerphone), - comfort_noise_enabled_(true), + comfort_noise_enabled_(false), external_echo_path_(NULL) { RTC_DCHECK(crit_render); RTC_DCHECK(crit_capture); diff --git a/resources/audio_processing/output_data_fixed.pb.sha1 b/resources/audio_processing/output_data_fixed.pb.sha1 index c9274a57cc..1e2d75af91 100644 --- a/resources/audio_processing/output_data_fixed.pb.sha1 +++ b/resources/audio_processing/output_data_fixed.pb.sha1 @@ -1 +1 @@ -7d9a02619aa4a3095ee8d48697bffef8437e6fe0 \ No newline at end of file +75a835fd9e641531989b7ee1de20e84b553d3bc9 \ No newline at end of file