Keep track of the user-facing number of channels in a ChannelBuffer

webrtc/modules/audio_processing/audio_buffer.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 166 matching lines @@
     memcpy(data[i], data[0], output_num_frames_ * sizeof(**data));
   }
 }
 
 void AudioBuffer::InitForNewData() {
   keyboard_data_ = NULL;
   mixed_low_pass_valid_ = false;
   reference_copied_ = false;
   activity_ = AudioFrame::kVadUnknown;
   num_channels_ = num_proc_channels_;
+  data_->set_num_channels(num_proc_channels_);
+  if (split_data_.get()) {
+    split_data_->set_num_channels(num_proc_channels_);
+  }
 }
 
 const int16_t* const* AudioBuffer::channels_const() const {
   return data_->ibuf_const()->channels();
 }
 
 int16_t* const* AudioBuffer::channels() {
   mixed_low_pass_valid_ = false;
   return data_->ibuf()->channels();
 }
@@ skipping 141 matching lines @@
 AudioFrame::VADActivity AudioBuffer::activity() const {
   return activity_;
 }
 
 size_t AudioBuffer::num_channels() const {
   return num_channels_;
 }
 
 void AudioBuffer::set_num_channels(size_t num_channels) {
   num_channels_ = num_channels;
+  data_->set_num_channels(num_channels);
+  if (split_data_.get()) {
+    split_data_->set_num_channels(num_channels);
+  }
 }
 
 size_t AudioBuffer::num_frames() const {
   return proc_num_frames_;
 }
 
 size_t AudioBuffer::num_frames_per_band() const {
   return num_split_frames_;
 }
 
@@ skipping 98 matching lines @@
 
 void AudioBuffer::SplitIntoFrequencyBands() {
   splitting_filter_->Analysis(data_.get(), split_data_.get());
 }
 
 void AudioBuffer::MergeFrequencyBands() {
   splitting_filter_->Synthesis(split_data_.get(), data_.get());
 }
 
 }  // namespace webrtc