From eeffb6aaf7c1dca1d639cd8eeaac2ee10da46b29 Mon Sep 17 00:00:00 2001 From: Sam Zackrisson Date: Tue, 26 Apr 2022 11:36:12 +0200 Subject: [PATCH] Remove deprecated audio option residual_echo_detector The feature is now enabled in other ways. See PSA or linked Monorail issue for details. https://groups.google.com/g/discuss-webrtc/c/mJV5cDysBDI/m/7PTPBjVHCgAJ Bug: webrtc:11539 Change-Id: I0f5816baf2bfa1508a1c85ddbd7b775417434c62 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/260107 Auto-Submit: Sam Zackrisson Reviewed-by: Per Kjellander Reviewed-by: Alessio Bazzica Commit-Queue: Per Kjellander Cr-Commit-Position: refs/heads/main@{#36742} --- api/audio_options.cc | 3 --- api/audio_options.h | 4 ---- 2 files changed, 7 deletions(-) diff --git a/api/audio_options.cc b/api/audio_options.cc index 3a70bc6cc4..c301395f94 100644 --- a/api/audio_options.cc +++ b/api/audio_options.cc @@ -54,7 +54,6 @@ void AudioOptions::SetAll(const AudioOptions& change) { change.audio_jitter_buffer_min_delay_ms); SetFrom(&audio_jitter_buffer_enable_rtx_handling, change.audio_jitter_buffer_enable_rtx_handling); - SetFrom(&residual_echo_detector, change.residual_echo_detector); SetFrom(&combined_audio_video_bwe, change.combined_audio_video_bwe); SetFrom(&audio_network_adaptor, change.audio_network_adaptor); SetFrom(&audio_network_adaptor_config, change.audio_network_adaptor_config); @@ -77,7 +76,6 @@ bool AudioOptions::operator==(const AudioOptions& o) const { o.audio_jitter_buffer_min_delay_ms && audio_jitter_buffer_enable_rtx_handling == o.audio_jitter_buffer_enable_rtx_handling && - residual_echo_detector == o.residual_echo_detector && combined_audio_video_bwe == o.combined_audio_video_bwe && audio_network_adaptor == o.audio_network_adaptor && audio_network_adaptor_config == o.audio_network_adaptor_config && @@ -105,7 +103,6 @@ std::string AudioOptions::ToString() const { audio_jitter_buffer_min_delay_ms); ToStringIfSet(&result, "audio_jitter_buffer_enable_rtx_handling", audio_jitter_buffer_enable_rtx_handling); - ToStringIfSet(&result, "residual_echo_detector", residual_echo_detector); ToStringIfSet(&result, "combined_audio_video_bwe", combined_audio_video_bwe); ToStringIfSet(&result, "audio_network_adaptor", audio_network_adaptor); ToStringIfSet(&result, "init_recording_on_send", init_recording_on_send); diff --git a/api/audio_options.h b/api/audio_options.h index b9f99df8da..1e4c820597 100644 --- a/api/audio_options.h +++ b/api/audio_options.h @@ -60,10 +60,6 @@ struct RTC_EXPORT AudioOptions { absl::optional audio_jitter_buffer_min_delay_ms; // Audio receiver jitter buffer (NetEq) should handle retransmitted packets. absl::optional audio_jitter_buffer_enable_rtx_handling; - // TODO(bugs.webrtc.org/11539): Deprecated, replaced by - // webrtc::CreateEchoDetector() and injection when creating the audio - // processing module. - absl::optional residual_echo_detector; // Enable combined audio+bandwidth BWE. // TODO(pthatcher): This flag is set from the // "googCombinedAudioVideoBwe", but not used anywhere. So delete it,