commit 8c51f2e9cde4ca72ae2f84bbbe3638540b84e565
author Gustaf Ullberg <gustaf@webrtc.org> Tue Oct 22 13:21:31 2019
committer Commit Bot <commit-bot@chromium.org> Tue Oct 22 14:27:14 2019
tree ee203bcb0d396af95908595c0c7bf93b4a887b40
parent e76b3abf610bc4acd386dbc5de9aff00a64823a3

AnalyzeReverseStream with StreamConfig

Adding a version of AnalyzeReverseStream with audio parameters
described by StreamConfig. This is part of preparations for
multichannel APM in Chromium.

Bug: webrtc:10913
Change-Id: I7c4650eab8bd7fcdec970a7e4a8fa203f09bed9e
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/157897
Commit-Queue: Gustaf Ullberg <gustaf@webrtc.org>
Reviewed-by: Per Åhgren <peah@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#29573}

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 84d56fc..c4ef3b2 100644
--- a/modules/audio_processing/audio_processing_impl.cc
+++ b/modules/audio_processing/audio_processing_impl.cc
@@ -1493,6 +1493,14 @@
   return AnalyzeReverseStreamLocked(data, reverse_config, reverse_config);
 }
 
+int AudioProcessingImpl::AnalyzeReverseStream(
+    const float* const* data,
+    const StreamConfig& reverse_config) {
+  TRACE_EVENT0("webrtc", "AudioProcessing::AnalyzeReverseStream_StreamConfig");
+  rtc::CritScope cs(&crit_render_);
+  return AnalyzeReverseStreamLocked(data, reverse_config, reverse_config);
+}
+
 int AudioProcessingImpl::ProcessReverseStream(const float* const* src,
                                               const StreamConfig& input_config,
                                               const StreamConfig& output_config,

modules/audio_processing/audio_processing_impl.h

diff --git a/modules/audio_processing/audio_processing_impl.h b/modules/audio_processing/audio_processing_impl.h
index caf96e9..98c8f12 100644
--- a/modules/audio_processing/audio_processing_impl.h
+++ b/modules/audio_processing/audio_processing_impl.h
@@ -108,6 +108,8 @@
                            size_t samples_per_channel,
                            int sample_rate_hz,
                            ChannelLayout layout) override;
+  int AnalyzeReverseStream(const float* const* data,
+                           const StreamConfig& reverse_config) override;
   int ProcessReverseStream(const float* const* src,
                            const StreamConfig& input_config,
                            const StreamConfig& output_config,

modules/audio_processing/include/audio_processing.h

diff --git a/modules/audio_processing/include/audio_processing.h b/modules/audio_processing/include/audio_processing.h
index 0087f0b..bcd7293 100644
--- a/modules/audio_processing/include/audio_processing.h
+++ b/modules/audio_processing/include/audio_processing.h
@@ -593,6 +593,12 @@
                                    int sample_rate_hz,
                                    ChannelLayout layout) = 0;
 
+  // Accepts deinterleaved float audio with the range [-1, 1]. Each element
+  // of |data| points to a channel buffer, arranged according to
+  // |reverse_config|.
+  virtual int AnalyzeReverseStream(const float* const* data,
+                                   const StreamConfig& reverse_config) = 0;
+
   // Accepts deinterleaved float audio with the range [-1, 1]. Each element of
   // |data| points to a channel buffer, arranged according to |reverse_config|.
   virtual int ProcessReverseStream(const float* const* src,

modules/audio_processing/include/mock_audio_processing.h

diff --git a/modules/audio_processing/include/mock_audio_processing.h b/modules/audio_processing/include/mock_audio_processing.h
index 3f66ce6..ba57d78 100644
--- a/modules/audio_processing/include/mock_audio_processing.h
+++ b/modules/audio_processing/include/mock_audio_processing.h
@@ -97,6 +97,9 @@
                    size_t samples_per_channel,
                    int sample_rate_hz,
                    ChannelLayout layout));
+  MOCK_METHOD2(AnalyzeReverseStream,
+               int(const float* const* data,
+                   const StreamConfig& reverse_config));
   MOCK_METHOD4(ProcessReverseStream,
                int(const float* const* src,
                    const StreamConfig& input_config,