Delete deprecated VoipEngineConfig::audio_processing
Users should have migrated to audio_processing_builder instead.
Bug: webrtc:369904700
Change-Id: I815485ae7b7d41a5fefad90a27158838639719a4
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/383700
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#44264}
diff --git a/api/voip/voip_engine_factory.cc b/api/voip/voip_engine_factory.cc
index 9087fb6..04abe98 100644
--- a/api/voip/voip_engine_factory.cc
+++ b/api/voip/voip_engine_factory.cc
@@ -35,13 +35,7 @@
? *config.env
: CreateEnvironment(std::move(config.task_queue_factory));
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- RTC_CHECK(config.audio_processing == nullptr ||
- config.audio_processing_builder == nullptr);
- scoped_refptr<AudioProcessing> audio_processing =
- std::move(config.audio_processing);
-#pragma clang diagnostic pop
+ scoped_refptr<AudioProcessing> audio_processing;
if (config.audio_processing_builder != nullptr) {
audio_processing = std::move(config.audio_processing_builder)->Build(env);
}
diff --git a/api/voip/voip_engine_factory.h b/api/voip/voip_engine_factory.h
index 2afb637..f00075e 100644
--- a/api/voip/voip_engine_factory.h
+++ b/api/voip/voip_engine_factory.h
@@ -30,16 +30,6 @@
// marked with comments as either mandatory or optional and default
// implementations that applications can use.
struct VoipEngineConfig {
- // TODO: bugs.webrtc.org/369904700 - Remove explicit default constructors
- // when deprecated `audio_processing` is removed and thus implicit
- // constructors won't be considered deprecated.
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- VoipEngineConfig() = default;
- VoipEngineConfig(VoipEngineConfig&&) = default;
- VoipEngineConfig& operator=(VoipEngineConfig&&) = default;
-#pragma clang diagnostic pop
-
// Mandatory (e.g. api/audio_codec/builtin_audio_encoder_factory).
// AudioEncoderFactory provides a set of audio codecs for VoipEngine to encode
// the audio input sample. Application can choose to limit the set to reduce
@@ -78,10 +68,6 @@
// such functionalities to perform on audio input samples received from
// AudioDeviceModule.
std::unique_ptr<AudioProcessingBuilderInterface> audio_processing_builder;
-
- // TODO: bugs.webrtc.org/369904700 - Remove when users are migrated to set
- // `audio_processing_builder` instead.
- [[deprecated]] scoped_refptr<AudioProcessing> audio_processing;
};
// Creates a VoipEngine instance with provided VoipEngineConfig.