Remove more traces of keyboard mic support from APM
The 6-parameter Initialize method is removed. The has_keyboard parameter
in the StreamConfig constructor is removed together with the underlying
member and helper functions.
Bug: chromium:1271981, b/217349489
Change-Id: I7259a114a395f74f735a9c06510c0fc0f0f008e3
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/250221
Reviewed-by: Sam Zackrisson <saza@google.com>
Reviewed-by: Sam Zackrisson <saza@webrtc.org>
Auto-Submit: Henrik Lundin <henrik.lundin@webrtc.org>
Commit-Queue: Henrik Lundin <henrik.lundin@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#35908}
diff --git a/modules/audio_processing/audio_processing_impl_unittest.cc b/modules/audio_processing/audio_processing_impl_unittest.cc
index 1ffbe1a..1e58e5b 100644
--- a/modules/audio_processing/audio_processing_impl_unittest.cc
+++ b/modules/audio_processing/audio_processing_impl_unittest.cc
@@ -142,7 +142,7 @@
constexpr size_t kMaxNumChannels = 2;
std::array<int16_t, kMaxNumChannels * kMaxSampleRateHz / 100> frame;
frame.fill(0);
- StreamConfig config(16000, 1, /*has_keyboard=*/false);
+ StreamConfig config(16000, 1);
// Call with the default parameters; there should be an init.
EXPECT_CALL(mock, InitializeLocked).Times(0);
EXPECT_NOERR(mock.ProcessStream(frame.data(), config, config, frame.data()));
@@ -150,13 +150,13 @@
mock.ProcessReverseStream(frame.data(), config, config, frame.data()));
// New sample rate. (Only impacts ProcessStream).
- config = StreamConfig(32000, 1, /*has_keyboard=*/false);
+ config = StreamConfig(32000, 1);
EXPECT_CALL(mock, InitializeLocked).Times(1);
EXPECT_NOERR(mock.ProcessStream(frame.data(), config, config, frame.data()));
// New number of channels.
// TODO(peah): Investigate why this causes 2 inits.
- config = StreamConfig(32000, 2, /*has_keyboard=*/false);
+ config = StreamConfig(32000, 2);
EXPECT_CALL(mock, InitializeLocked).Times(2);
EXPECT_NOERR(mock.ProcessStream(frame.data(), config, config, frame.data()));
// ProcessStream sets num_channels_ == num_output_channels.
@@ -164,7 +164,7 @@
mock.ProcessReverseStream(frame.data(), config, config, frame.data()));
// A new sample rate passed to ProcessReverseStream should cause an init.
- config = StreamConfig(16000, 2, /*has_keyboard=*/false);
+ config = StreamConfig(16000, 2);
EXPECT_CALL(mock, InitializeLocked).Times(1);
EXPECT_NOERR(
mock.ProcessReverseStream(frame.data(), config, config, frame.data()));
@@ -183,7 +183,7 @@
constexpr size_t kNumChannels = 2;
std::array<int16_t, kNumChannels * kSampleRateHz / 100> frame;
- StreamConfig config(kSampleRateHz, kNumChannels, /*has_keyboard=*/false);
+ StreamConfig config(kSampleRateHz, kNumChannels);
frame.fill(kAudioLevel);
apm->ProcessStream(frame.data(), config, config, frame.data());
EXPECT_EQ(frame[100], kAudioLevel)
@@ -216,7 +216,7 @@
constexpr size_t kNumChannels = 2;
std::array<int16_t, kNumChannels * kSampleRateHz / 100> frame;
- StreamConfig config(kSampleRateHz, kNumChannels, /*has_keyboard=*/false);
+ StreamConfig config(kSampleRateHz, kNumChannels);
frame.fill(kAudioLevel);
apm->ProcessStream(frame.data(), config, config, frame.data());
EXPECT_EQ(frame[100], kAudioLevel)
@@ -249,7 +249,7 @@
constexpr size_t kNumChannels = 2;
std::array<int16_t, kNumChannels * kSampleRateHz / 100> frame;
- StreamConfig config(kSampleRateHz, kNumChannels, /*has_keyboard=*/false);
+ StreamConfig config(kSampleRateHz, kNumChannels);
frame.fill(kAudioLevel);
apm->ProcessStream(frame.data(), config, config, frame.data());
EXPECT_EQ(frame[100], kAudioLevel)
@@ -284,7 +284,7 @@
constexpr int kSampleRateHz = 48000;
constexpr int kNumChannels = 2;
std::array<int16_t, kNumChannels * kSampleRateHz / 100> frame;
- StreamConfig config(kSampleRateHz, kNumChannels, /*has_keyboard=*/false);
+ StreamConfig config(kSampleRateHz, kNumChannels);
frame.fill(kAudioLevel);
MockEchoControl* echo_control_mock = echo_control_factory_ptr->GetNext();
@@ -373,7 +373,7 @@
constexpr size_t kSampleRateHz = 48000;
constexpr size_t kNumChannels = 2;
std::array<int16_t, kNumChannels * kSampleRateHz / 100> frame;
- StreamConfig config(kSampleRateHz, kNumChannels, /*has_keyboard=*/false);
+ StreamConfig config(kSampleRateHz, kNumChannels);
frame.fill(kAudioLevel);
MockEchoControl* echo_control_mock = echo_control_factory_ptr->GetNext();
@@ -416,7 +416,7 @@
constexpr size_t kSampleRateHz = 48000;
constexpr size_t kNumChannels = 2;
std::array<int16_t, kNumChannels * kSampleRateHz / 100> frame;
- StreamConfig config(kSampleRateHz, kNumChannels, /*has_keyboard=*/false);
+ StreamConfig config(kSampleRateHz, kNumChannels);
frame.fill(kAudioLevel);
MockEchoControl* echo_control_mock = echo_control_factory_ptr->GetNext();
@@ -460,8 +460,7 @@
constexpr size_t kSampleRateHz = 48000;
constexpr size_t kNumChannels = 2;
std::array<int16_t, kNumChannels * kSampleRateHz / 100> frame;
- StreamConfig stream_config(kSampleRateHz, kNumChannels,
- /*has_keyboard=*/false);
+ StreamConfig stream_config(kSampleRateHz, kNumChannels);
frame.fill(kAudioLevel);
MockEchoControl* echo_control_mock = echo_control_factory_ptr->GetNext();
@@ -503,8 +502,7 @@
constexpr size_t kSampleRateHz = 48000;
constexpr size_t kNumChannels = 2;
std::array<int16_t, kNumChannels * kSampleRateHz / 100> frame;
- StreamConfig stream_config(kSampleRateHz, kNumChannels,
- /*has_keyboard=*/false);
+ StreamConfig stream_config(kSampleRateHz, kNumChannels);
frame.fill(kAudioLevel);
MockEchoControl* echo_control_mock = echo_control_factory_ptr->GetNext();
@@ -561,16 +559,15 @@
constexpr size_t kNumChannels = 1;
// Explicitly initialize APM to ensure no render frames are discarded.
const ProcessingConfig processing_config = {{
- {kSampleRateHz, kNumChannels, /*has_keyboard=*/false},
- {kSampleRateHz, kNumChannels, /*has_keyboard=*/false},
- {kSampleRateHz, kNumChannels, /*has_keyboard=*/false},
- {kSampleRateHz, kNumChannels, /*has_keyboard=*/false},
+ {kSampleRateHz, kNumChannels},
+ {kSampleRateHz, kNumChannels},
+ {kSampleRateHz, kNumChannels},
+ {kSampleRateHz, kNumChannels},
}};
apm->Initialize(processing_config);
std::array<int16_t, kNumChannels * kSampleRateHz / 100> frame;
- StreamConfig stream_config(kSampleRateHz, kNumChannels,
- /*has_keyboard=*/false);
+ StreamConfig stream_config(kSampleRateHz, kNumChannels);
constexpr float kAudioLevelFloat = static_cast<float>(kAudioLevel);
constexpr float kExpectedPreprocessedAudioLevel =
@@ -626,8 +623,7 @@
float* channel_pointers[] = {buffer.data()};
float* channel_pointers_reference[] = {buffer_reference.data()};
StreamConfig stream_config(/*sample_rate_hz=*/kSampleRateHz,
- /*num_channels=*/kNumChannels,
- /*has_keyboard=*/false);
+ /*num_channels=*/kNumChannels);
Random random_generator(2341U);
constexpr int kFramesToProcessPerConfiguration = 10;
@@ -667,8 +663,7 @@
constexpr int kFramesToProcessPerConfiguration = 3;
StreamConfig initial_stream_config(/*sample_rate_hz=*/16000,
- /*num_channels=*/1,
- /*has_keyboard=*/false);
+ /*num_channels=*/1);
for (int i = 0; i < kFramesToProcessPerConfiguration; ++i) {
RandomizeSampleVector(&random_generator, buffer);
EXPECT_EQ(apm->ProcessStream(channel_pointers, initial_stream_config,
@@ -677,8 +672,7 @@
}
StreamConfig stereo_stream_config(/*sample_rate_hz=*/16000,
- /*num_channels=*/2,
- /*has_keyboard=*/false);
+ /*num_channels=*/2);
for (int i = 0; i < kFramesToProcessPerConfiguration; ++i) {
RandomizeSampleVector(&random_generator, buffer);
EXPECT_EQ(apm->ProcessStream(channel_pointers, stereo_stream_config,
@@ -687,8 +681,7 @@
}
StreamConfig high_sample_rate_stream_config(/*sample_rate_hz=*/48000,
- /*num_channels=*/1,
- /*has_keyboard=*/false);
+ /*num_channels=*/2);
for (int i = 0; i < kFramesToProcessPerConfiguration; ++i) {
RandomizeSampleVector(&random_generator, buffer);
EXPECT_EQ(
@@ -696,16 +689,6 @@
high_sample_rate_stream_config, channel_pointers),
kNoErr);
}
-
- StreamConfig keyboard_stream_config(/*sample_rate_hz=*/16000,
- /*num_channels=*/1,
- /*has_keyboard=*/true);
- for (int i = 0; i < kFramesToProcessPerConfiguration; ++i) {
- RandomizeSampleVector(&random_generator, buffer);
- EXPECT_EQ(apm->ProcessStream(channel_pointers, keyboard_stream_config,
- keyboard_stream_config, channel_pointers),
- kNoErr);
- }
}
// Disable transient suppressor creation and run APM in ways that should trigger
@@ -724,8 +707,7 @@
Random random_generator(2341U);
constexpr int kFramesToProcessPerConfiguration = 3;
StreamConfig stream_config(/*sample_rate_hz=*/16000,
- /*num_channels=*/1,
- /*has_keyboard=*/false);
+ /*num_channels=*/1);
AudioProcessing::Config config = apm->GetConfig();
config.transient_suppression.enabled = true;