Send data from mixer to APM limiter more often.

webrtc/modules/audio_mixer/frame_combiner.h

Index: webrtc/modules/audio_mixer/frame_combiner.h
diff --git a/webrtc/modules/audio_mixer/frame_combiner.h b/webrtc/modules/audio_mixer/frame_combiner.h
index 11c2e6892a996dcac0ff5f968474967d003a349c..9f061cefc263d6b3cbb121f14067541096536ad0 100644
--- a/webrtc/modules/audio_mixer/frame_combiner.h
+++ b/webrtc/modules/audio_mixer/frame_combiner.h
@@ -30,22 +30,10 @@ class FrameCombiner {
   void Combine(const std::vector<AudioFrame*>& mix_list,
                size_t number_of_channels,
                int sample_rate,
+               int number_of_streams,

[ivoc, 2017/03/27 15:44:55]

Please add a comment to explain this new parameter. Also, you could make this a
size_t, like number_of_channels.

[hlundin-webrtc, 2017/03/28 12:14:57]

+1 for size_t.

[aleloi, 2017/03/28 14:49:05]

Done.

                AudioFrame* audio_frame_for_mixing) const;
 
  private:
-  // Lower-level helper function called from Combine(...) when there
-  // are several input frames.
-  //
-  // TODO(aleloi): change interface to ArrayView<int16_t> output_frame
-  // once we have gotten rid of the APM limiter.
-  //
-  // Only the 'data' field of output_frame should be modified. The
-  // rest are used for potentially sending the output to the APM
-  // limiter.
-  void CombineMultipleFrames(
-      const std::vector<rtc::ArrayView<const int16_t>>& input_frames,
-      AudioFrame* audio_frame_for_mixing) const;
-
   const bool use_apm_limiter_;
   std::unique_ptr<AudioProcessing> limiter_;
 };