Remove unnecessary overloads of AudioProcessing::CreateAndAttachAecDump()
Bug: webrtc:13579
Change-Id: I2e121b5fd30de4ac1813483f00a51184ff861760
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/269623
Commit-Queue: Ali Tofigh <alito@webrtc.org>
Reviewed-by: Ivo Creusen <ivoc@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#37723}
diff --git a/modules/audio_processing/BUILD.gn b/modules/audio_processing/BUILD.gn
index 37a5b40..ca55fec 100644
--- a/modules/audio_processing/BUILD.gn
+++ b/modules/audio_processing/BUILD.gn
@@ -327,6 +327,7 @@
":audio_processing_statistics",
"../../test:test_support",
]
+ absl_deps = [ "//third_party/abseil-cpp/absl/strings" ]
}
if (!build_with_chromium) {
diff --git a/modules/audio_processing/audio_processing_impl.cc b/modules/audio_processing/audio_processing_impl.cc
index 29a4e5b..762980b 100644
--- a/modules/audio_processing/audio_processing_impl.cc
+++ b/modules/audio_processing/audio_processing_impl.cc
@@ -1651,13 +1651,6 @@
return capture_.cached_stream_analog_level_;
}
-bool AudioProcessingImpl::CreateAndAttachAecDump(const std::string& file_name,
- int64_t max_log_size_bytes,
- rtc::TaskQueue* worker_queue) {
- return CreateAndAttachAecDump(absl::string_view(file_name),
- max_log_size_bytes, worker_queue);
-}
-
bool AudioProcessingImpl::CreateAndAttachAecDump(absl::string_view file_name,
int64_t max_log_size_bytes,
rtc::TaskQueue* worker_queue) {
diff --git a/modules/audio_processing/audio_processing_impl.h b/modules/audio_processing/audio_processing_impl.h
index 5f33871..20135de 100644
--- a/modules/audio_processing/audio_processing_impl.h
+++ b/modules/audio_processing/audio_processing_impl.h
@@ -71,9 +71,6 @@
int Initialize() override;
int Initialize(const ProcessingConfig& processing_config) override;
void ApplyConfig(const AudioProcessing::Config& config) override;
- bool CreateAndAttachAecDump(const std::string& file_name,
- int64_t max_log_size_bytes,
- rtc::TaskQueue* worker_queue) override;
bool CreateAndAttachAecDump(absl::string_view file_name,
int64_t max_log_size_bytes,
rtc::TaskQueue* worker_queue) override;
diff --git a/modules/audio_processing/include/audio_processing.h b/modules/audio_processing/include/audio_processing.h
index 72791bd..9463130 100644
--- a/modules/audio_processing/include/audio_processing.h
+++ b/modules/audio_processing/include/audio_processing.h
@@ -628,13 +628,13 @@
// implemented the absl::string_view version.
virtual bool CreateAndAttachAecDump(const std::string& file_name,
int64_t max_log_size_bytes,
- rtc::TaskQueue* worker_queue) = 0;
+ rtc::TaskQueue* worker_queue) {
+ return CreateAndAttachAecDump(absl::string_view(file_name),
+ max_log_size_bytes, worker_queue);
+ }
virtual bool CreateAndAttachAecDump(absl::string_view file_name,
int64_t max_log_size_bytes,
- rtc::TaskQueue* worker_queue) {
- return CreateAndAttachAecDump(std::string(file_name), max_log_size_bytes,
- worker_queue);
- }
+ rtc::TaskQueue* worker_queue) = 0;
virtual bool CreateAndAttachAecDump(FILE* handle,
int64_t max_log_size_bytes,
rtc::TaskQueue* worker_queue) = 0;
diff --git a/modules/audio_processing/include/mock_audio_processing.h b/modules/audio_processing/include/mock_audio_processing.h
index f88094f..a1d1b94 100644
--- a/modules/audio_processing/include/mock_audio_processing.h
+++ b/modules/audio_processing/include/mock_audio_processing.h
@@ -13,6 +13,7 @@
#include <memory>
+#include "absl/strings/string_view.h"
#include "modules/audio_processing/include/aec_dump.h"
#include "modules/audio_processing/include/audio_processing.h"
#include "modules/audio_processing/include/audio_processing_statistics.h"
@@ -158,6 +159,12 @@
(override));
MOCK_METHOD(bool,
CreateAndAttachAecDump,
+ (absl::string_view file_name,
+ int64_t max_log_size_bytes,
+ rtc::TaskQueue* worker_queue),
+ (override));
+ MOCK_METHOD(bool,
+ CreateAndAttachAecDump,
(FILE * handle,
int64_t max_log_size_bytes,
rtc::TaskQueue* worker_queue),