From fad9a6dae74fa0d8d3661423ce8491b97047f48c Mon Sep 17 00:00:00 2001 From: Henrik Lundin Date: Thu, 2 Feb 2023 14:12:54 +0000 Subject: [PATCH] Delete deprecated Create method and config from AudioCodingModule MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The method and config are no longer used. This concludes the work to break apart AcmReceiver and AudioCodingModule. Bug: webrtc:14867 Change-Id: I87219749a1ea72a01b95e960d1f32292f7352c9b Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/291801 Reviewed-by: Jakob Ivarsson‎ Reviewed-by: Tomas Lundqvist Commit-Queue: Henrik Lundin Cr-Commit-Position: refs/heads/main@{#39250} --- .../audio_coding/acm2/audio_coding_module.cc | 4 ---- .../include/audio_coding_module.h | 19 ------------------- 2 files changed, 23 deletions(-) diff --git a/modules/audio_coding/acm2/audio_coding_module.cc b/modules/audio_coding/acm2/audio_coding_module.cc index 9618ad21d6..97a204ac4f 100644 --- a/modules/audio_coding/acm2/audio_coding_module.cc +++ b/modules/audio_coding/acm2/audio_coding_module.cc @@ -529,8 +529,4 @@ std::unique_ptr AudioCodingModule::Create() { return std::make_unique(); } -AudioCodingModule* AudioCodingModule::Create(const Config& config) { - return new AudioCodingModuleImpl(); -} - } // namespace webrtc diff --git a/modules/audio_coding/include/audio_coding_module.h b/modules/audio_coding/include/audio_coding_module.h index d7bee84778..5c5bd167c0 100644 --- a/modules/audio_coding/include/audio_coding_module.h +++ b/modules/audio_coding/include/audio_coding_module.h @@ -17,13 +17,9 @@ #include #include "absl/types/optional.h" -#include "api/audio_codecs/audio_decoder_factory.h" #include "api/audio_codecs/audio_encoder.h" #include "api/function_view.h" -#include "api/neteq/neteq.h" -#include "api/neteq/neteq_factory.h" #include "modules/audio_coding/include/audio_coding_module_typedefs.h" -#include "system_wrappers/include/clock.h" namespace webrtc { @@ -64,22 +60,7 @@ class AudioCodingModule { AudioCodingModule() {} public: - // Deprecated. Will be deleted when downlink clients have migrated off it. - struct Config { - Config() = default; - Config(const Config&) = default; - ~Config() = default; - - NetEq::Config neteq_config; - Clock* clock; - rtc::scoped_refptr decoder_factory; - NetEqFactory* neteq_factory = nullptr; - }; - static std::unique_ptr Create(); - // Deprecated. Will be deleted when downlink clients have migrated to the - // above method. - static AudioCodingModule* Create(const Config& config); virtual ~AudioCodingModule() = default; // `modifier` is called exactly once with one argument: a pointer to the