Use ProcessReverseStream in VoiceEngines OutputMixer

webrtc/modules/audio_processing/include/audio_processing.h

 /*
  *  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 278 matching lines @@
                          int output_sample_rate_hz,
                          int reverse_sample_rate_hz,
                          ChannelLayout input_layout,
                          ChannelLayout output_layout,
                          ChannelLayout reverse_layout) = 0;
 
   // Pass down additional options which don't have explicit setters. This
   // ensures the options are applied immediately.
   virtual void SetExtraOptions(const Config& config) = 0;
 
-  // TODO(peah): Remove after voice engine no longer requires it to resample
-  // the reverse stream to the forward rate.
-  virtual int input_sample_rate_hz() const = 0;
-
   // TODO(ajm): Only intended for internal use. Make private and friend the
   // necessary classes?
   virtual int proc_sample_rate_hz() const = 0;
   virtual int proc_split_sample_rate_hz() const = 0;
   virtual size_t num_input_channels() const = 0;
   virtual size_t num_proc_channels() const = 0;
   virtual size_t num_output_channels() const = 0;
   virtual size_t num_reverse_channels() const = 0;
 
   // Set to true when the output of AudioProcessing will be muted or in some
@@ skipping 47 matching lines @@
   // will not be modified. On the client-side, this is the far-end (or to be
   // rendered) audio.
   //
   // It is only necessary to provide this if echo processing is enabled, as the
   // reverse stream forms the echo reference signal. It is recommended, but not
   // necessary, to provide if gain control is enabled. On the server-side this
   // typically will not be used. If you're not sure what to pass in here,
   // chances are you don't need to use it.
   //
   // The |sample_rate_hz_|, |num_channels_|, and |samples_per_channel_|
-  // members of |frame| must be valid. |sample_rate_hz_| must correspond to
-  // |input_sample_rate_hz()|
+  // members of |frame| must be valid.
   //
   // TODO(ajm): add const to input; requires an implementation fix.
   // DEPRECATED: Use |ProcessReverseStream| instead.

[the sun, 2016/03/10 12:49:22]

If this is deprecated, can we make it a thin wrapper around
ProcessReverseStream, which DCHECKs that the IE is disabled? Also - move the
commentary to ProcessReverseStream.

[aluebs-webrtc, 2016/03/10 16:33:17]

Actually, now that we are updating the VoE, we can remove this completely. I
will do this in a follow up CL.

   // TODO(ekm): Remove once all users have updated to |ProcessReverseStream|.
   virtual int AnalyzeReverseStream(AudioFrame* frame) = 0;
 
   // Same as |AnalyzeReverseStream|, but may modify |frame| if intelligibility
   // is enabled.
   virtual int ProcessReverseStream(AudioFrame* frame) = 0;
 
   // Accepts deinterleaved float audio with the range [-1, 1]. Each element
   // of |data| points to a channel buffer, arranged according to |layout|.
   // TODO(mgraczyk): Remove once clients are updated to use the new interface.
@@ skipping 592 matching lines @@
   // This does not impact the size of frames passed to |ProcessStream()|.
   virtual int set_frame_size_ms(int size) = 0;
   virtual int frame_size_ms() const = 0;
 
  protected:
   virtual ~VoiceDetection() {}
 };
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_AUDIO_PROCESSING_INCLUDE_AUDIO_PROCESSING_H_