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

Remove AECM comfort noise setting from API

Browse Source 
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}
This commit is contained in:
Sam Zackrisson
2018-09-28 10:48:53 +02:00
committed by Commit Bot
parent e2405c1a82
commit be65d4886a
3 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
api/audio_options.cc
View File

@ -50,7 +50,6 @@ void AudioOptions::SetAll(const AudioOptions& change) {
SetFrom(&audio_jitter_buffer_fast_accelerate, SetFrom(&audio_jitter_buffer_fast_accelerate,
change.audio_jitter_buffer_fast_accelerate); change.audio_jitter_buffer_fast_accelerate);
SetFrom(&typing_detection, change.typing_detection); SetFrom(&typing_detection, change.typing_detection);
SetFrom(&aecm_generate_comfort_noise, change.aecm_generate_comfort_noise);
SetFrom(&experimental_agc, change.experimental_agc); SetFrom(&experimental_agc, change.experimental_agc);
SetFrom(&extended_filter_aec, change.extended_filter_aec); SetFrom(&extended_filter_aec, change.extended_filter_aec);
SetFrom(&delay_agnostic_aec, change.delay_agnostic_aec); SetFrom(&delay_agnostic_aec, change.delay_agnostic_aec);
@ -78,7 +77,6 @@ bool AudioOptions::operator==(const AudioOptions& o) const {
audio_jitter_buffer_fast_accelerate == audio_jitter_buffer_fast_accelerate ==
o.audio_jitter_buffer_fast_accelerate && o.audio_jitter_buffer_fast_accelerate &&
typing_detection == o.typing_detection && typing_detection == o.typing_detection &&
aecm_generate_comfort_noise == o.aecm_generate_comfort_noise &&
experimental_agc == o.experimental_agc && experimental_agc == o.experimental_agc &&
extended_filter_aec == o.extended_filter_aec && extended_filter_aec == o.extended_filter_aec &&
delay_agnostic_aec == o.delay_agnostic_aec && delay_agnostic_aec == o.delay_agnostic_aec &&
@ -110,7 +108,6 @@ std::string AudioOptions::ToString() const {
ToStringIfSet(&result, "audio_jitter_buffer_fast_accelerate", ToStringIfSet(&result, "audio_jitter_buffer_fast_accelerate",
audio_jitter_buffer_fast_accelerate); audio_jitter_buffer_fast_accelerate);
ToStringIfSet(&result, "typing", typing_detection); ToStringIfSet(&result, "typing", typing_detection);
ToStringIfSet(&result, "comfort_noise", aecm_generate_comfort_noise);
ToStringIfSet(&result, "experimental_agc", experimental_agc); ToStringIfSet(&result, "experimental_agc", experimental_agc);
ToStringIfSet(&result, "extended_filter_aec", extended_filter_aec); ToStringIfSet(&result, "extended_filter_aec", extended_filter_aec);
ToStringIfSet(&result, "delay_agnostic_aec", delay_agnostic_aec); ToStringIfSet(&result, "delay_agnostic_aec", delay_agnostic_aec);

1
api/audio_options.h
View File

@ -55,7 +55,6 @@ struct AudioOptions {
absl::optional<bool> audio_jitter_buffer_fast_accelerate; absl::optional<bool> audio_jitter_buffer_fast_accelerate;
// Audio processing to detect typing. // Audio processing to detect typing.
absl::optional<bool> typing_detection; absl::optional<bool> typing_detection;
absl::optional<bool> aecm_generate_comfort_noise;
absl::optional<bool> experimental_agc; absl::optional<bool> experimental_agc;
absl::optional<bool> extended_filter_aec; absl::optional<bool> extended_filter_aec;
absl::optional<bool> delay_agnostic_aec; absl::optional<bool> delay_agnostic_aec;

5
media/engine/webrtcvoiceengine.cc
View File

@ -319,11 +319,6 @@ bool WebRtcVoiceEngine::ApplyOptions(const AudioOptions& options_in) {
// Set and adjust echo canceller options. // Set and adjust echo canceller options.
// kEcConference is AEC with high suppression. // kEcConference is AEC with high suppression.
webrtc::EcModes ec_mode = webrtc::kEcConference; 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 defined(WEBRTC_IOS)
if (options.ios_force_software_aec_HACK && if (options.ios_force_software_aec_HACK &&