commit 64253a93dcb34829c7dc909007beb1387cffa205
author Henrik Lundin <henrik.lundin@webrtc.org> Fri Feb 04 09:02:48 2022 +0000
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Feb 04 14:27:51 2022 +0000
tree 6839f97a1e13a50dfc9704c8473f969a0a0d4ac1
parent bb57e2d7aa9b36843233d1394422f03d12d9c31f

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}

modules/audio_processing/audio_processing_impl.cc

diff --git a/modules/audio_processing/audio_processing_impl.cc b/modules/audio_processing/audio_processing_impl.cc
index 03c193d..b617f59 100644
--- a/modules/audio_processing/audio_processing_impl.cc
+++ b/modules/audio_processing/audio_processing_impl.cc
@@ -50,20 +50,6 @@
 
 namespace {
 
-static bool LayoutHasKeyboard(AudioProcessing::ChannelLayout layout) {
-  switch (layout) {
-    case AudioProcessing::kMono:
-    case AudioProcessing::kStereo:
-      return false;
-    case AudioProcessing::kMonoAndKeyboard:
-    case AudioProcessing::kStereoAndKeyboard:
-      return true;
-  }
-
-  RTC_DCHECK_NOTREACHED();
-  return false;
-}
-
 bool SampleRateSupportsMultiBand(int sample_rate_hz) {
   return sample_rate_hz == AudioProcessing::kSampleRate32kHz ||
          sample_rate_hz == AudioProcessing::kSampleRate48kHz;
@@ -311,26 +297,6 @@
   return kNoError;
 }
 
-int AudioProcessingImpl::Initialize(int capture_input_sample_rate_hz,
-                                    int capture_output_sample_rate_hz,
-                                    int render_input_sample_rate_hz,
-                                    ChannelLayout capture_input_layout,
-                                    ChannelLayout capture_output_layout,
-                                    ChannelLayout render_input_layout) {
-  const ProcessingConfig processing_config = {
-      {{capture_input_sample_rate_hz, ChannelsFromLayout(capture_input_layout),
-        LayoutHasKeyboard(capture_input_layout)},
-       {capture_output_sample_rate_hz,
-        ChannelsFromLayout(capture_output_layout),
-        LayoutHasKeyboard(capture_output_layout)},
-       {render_input_sample_rate_hz, ChannelsFromLayout(render_input_layout),
-        LayoutHasKeyboard(render_input_layout)},
-       {render_input_sample_rate_hz, ChannelsFromLayout(render_input_layout),
-        LayoutHasKeyboard(render_input_layout)}}};
-
-  return Initialize(processing_config);
-}
-
 int AudioProcessingImpl::Initialize(const ProcessingConfig& processing_config) {
   // Run in a single-threaded manner during initialization.
   MutexLock lock_render(&mutex_render_);
@@ -778,7 +744,6 @@
     RecordUnprocessedCaptureStream(src);
   }
 
-  capture_.keyboard_info.Extract(src, formats_.api_format.input_stream());
   capture_.capture_audio->CopyFrom(src, formats_.api_format.input_stream());
   if (capture_.capture_fullband_audio) {
     capture_.capture_fullband_audio->CopyFrom(
@@ -1311,8 +1276,7 @@
           capture_buffer->num_channels(),
           capture_buffer->split_bands_const(0)[kBand0To8kHz],
           capture_buffer->num_frames_per_band(),
-          capture_.keyboard_info.keyboard_data,
-          capture_.keyboard_info.num_keyboard_frames, voice_probability,
+          /*reference_data=*/nullptr, /*reference_length=*/0, voice_probability,
           capture_.key_pressed);
     }
 
@@ -2161,17 +2125,6 @@
 
 AudioProcessingImpl::ApmCaptureState::~ApmCaptureState() = default;
 
-void AudioProcessingImpl::ApmCaptureState::KeyboardInfo::Extract(
-    const float* const* data,
-    const StreamConfig& stream_config) {
-  if (stream_config.has_keyboard()) {
-    keyboard_data = data[stream_config.num_channels()];
-  } else {
-    keyboard_data = NULL;
-  }
-  num_keyboard_frames = stream_config.num_frames();
-}
-
 AudioProcessingImpl::ApmRenderState::ApmRenderState() = default;
 
 AudioProcessingImpl::ApmRenderState::~ApmRenderState() = default;