commit b2328d11dcc86fba1661ee3fa0d51fc126939764
author aluebs <aluebs@webrtc.org> Mon Jan 11 20:32:29 2016 -0800
committer Commit bot <commit-bot@chromium.org> Tue Jan 12 04:32:32 2016 +0000
tree 54514d04c1037e1bce85076e3c30ba6c13c469b0
parent e93ad1b12913981eaf2c8ba278921a30167bf77f

Remove additional channel constraints when Beamforming is enabled in AudioProcessing

The general constraints on number of channels for AudioProcessing is:
num_in_channels == num_out_channels || num_out_channels == 1

When Beamforming is enabled and additional constraint was added forcing:
num_out_channels == 1

This artificial constraint was removed by adding upmixing support in CopyTo, since it was already supported for the AudioFrame interface using InterleaveTo.

Review URL: https://codereview.webrtc.org/1571013002

Cr-Commit-Position: refs/heads/master@{#11215}

webrtc/modules/audio_processing/include/audio_processing.h

diff --git a/webrtc/modules/audio_processing/include/audio_processing.h b/webrtc/modules/audio_processing/include/audio_processing.h
index 5fcc4d4..d39d27e 100644
--- a/webrtc/modules/audio_processing/include/audio_processing.h
+++ b/webrtc/modules/audio_processing/include/audio_processing.h
@@ -288,6 +288,7 @@
   virtual int proc_sample_rate_hz() const = 0;
   virtual int proc_split_sample_rate_hz() const = 0;
   virtual int num_input_channels() const = 0;
+  virtual int num_proc_channels() const = 0;
   virtual int num_output_channels() const = 0;
   virtual int num_reverse_channels() const = 0;