commit be65d4886a071acc7418f577815bedb431154dca
author Sam Zackrisson <saza@webrtc.org> Fri Sep 28 08:48:53 2018
committer Commit Bot <commit-bot@chromium.org> Tue Oct 16 09:42:16 2018
tree a4e7f21f912df9a422ca540e6d79429477ae2dac
parent e2405c1a823f3baf90a9c72f2e058f91eb659c20

Remove AECM comfort noise setting from API

The internal functionality has already been disabled.
The default - no comfort noise - is now the only option.

Bug: webrtc:9535
Change-Id: Idcf233625857c0120c7b355048e24ef3124196c1
Reviewed-on: https://webrtc-review.googlesource.com/c/102560
Reviewed-by: Fredrik Solenberg <solenberg@webrtc.org>
Commit-Queue: Sam Zackrisson <saza@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25199}

api/audio_options.cc

diff --git a/api/audio_options.cc b/api/audio_options.cc
index a4a37d2..d464118 100644
--- a/api/audio_options.cc
+++ b/api/audio_options.cc
@@ -50,7 +50,6 @@
   SetFrom(&audio_jitter_buffer_fast_accelerate,
           change.audio_jitter_buffer_fast_accelerate);
   SetFrom(&typing_detection, change.typing_detection);
-  SetFrom(&aecm_generate_comfort_noise, change.aecm_generate_comfort_noise);
   SetFrom(&experimental_agc, change.experimental_agc);
   SetFrom(&extended_filter_aec, change.extended_filter_aec);
   SetFrom(&delay_agnostic_aec, change.delay_agnostic_aec);
@@ -78,7 +77,6 @@
          audio_jitter_buffer_fast_accelerate ==
              o.audio_jitter_buffer_fast_accelerate &&
          typing_detection == o.typing_detection &&
-         aecm_generate_comfort_noise == o.aecm_generate_comfort_noise &&
          experimental_agc == o.experimental_agc &&
          extended_filter_aec == o.extended_filter_aec &&
          delay_agnostic_aec == o.delay_agnostic_aec &&
@@ -110,7 +108,6 @@
   ToStringIfSet(&result, "audio_jitter_buffer_fast_accelerate",
                 audio_jitter_buffer_fast_accelerate);
   ToStringIfSet(&result, "typing", typing_detection);
-  ToStringIfSet(&result, "comfort_noise", aecm_generate_comfort_noise);
   ToStringIfSet(&result, "experimental_agc", experimental_agc);
   ToStringIfSet(&result, "extended_filter_aec", extended_filter_aec);
   ToStringIfSet(&result, "delay_agnostic_aec", delay_agnostic_aec);

api/audio_options.h

diff --git a/api/audio_options.h b/api/audio_options.h
index aecff41..414fc70 100644
--- a/api/audio_options.h
+++ b/api/audio_options.h
@@ -55,7 +55,6 @@
   absl::optional<bool> audio_jitter_buffer_fast_accelerate;
   // Audio processing to detect typing.
   absl::optional<bool> typing_detection;
-  absl::optional<bool> aecm_generate_comfort_noise;
   absl::optional<bool> experimental_agc;
   absl::optional<bool> extended_filter_aec;
   absl::optional<bool> delay_agnostic_aec;

media/engine/webrtcvoiceengine.cc

diff --git a/media/engine/webrtcvoiceengine.cc b/media/engine/webrtcvoiceengine.cc
index a98676c..bfd0d7e 100644
--- a/media/engine/webrtcvoiceengine.cc
+++ b/media/engine/webrtcvoiceengine.cc
@@ -319,11 +319,6 @@
   // Set and adjust echo canceller options.
   // kEcConference is AEC with high suppression.
   webrtc::EcModes ec_mode = webrtc::kEcConference;
-  if (options.aecm_generate_comfort_noise &&
-      *options.aecm_generate_comfort_noise) {
-    RTC_LOG(LS_WARNING)
-        << "Ignoring deprecated mobile AEC setting: comfort noise";
-  }
 
 #if defined(WEBRTC_IOS)
   if (options.ios_force_software_aec_HACK &&