Changed mixing api and removed resampler

webrtc/modules/audio_mixer/audio_mixer.h

Index: webrtc/modules/audio_mixer/audio_mixer.h
diff --git a/webrtc/modules/audio_mixer/audio_mixer.h b/webrtc/modules/audio_mixer/audio_mixer.h
index c50a2cfa708dbf394b6be3b90c284573c41ad6c7..9aabfcca5b751a885e93aa67e11edef5f2ae805d 100644
--- a/webrtc/modules/audio_mixer/audio_mixer.h
+++ b/webrtc/modules/audio_mixer/audio_mixer.h
@@ -48,8 +48,6 @@ class AudioMixer : public FileCallback {
 
   int DeRegisterExternalMediaProcessing();
 
-  int32_t MixActiveChannels();
-
   int32_t DoOperationsOnCombinedSignal(bool feed_data_to_apm);
 
   int32_t SetMixabilityStatus(MixerAudioSource& audio_source,  // NOLINT
@@ -100,8 +98,6 @@ class AudioMixer : public FileCallback {
   rtc::CriticalSection _fileCritSect;
   NewAudioConferenceMixer& _mixerModule;
   AudioFrame _audioFrame;
-  // Converts mixed audio to the audio device output rate.
-  PushResampler<int16_t> resampler_;
   // Converts mixed audio to the audio processing rate.
   PushResampler<int16_t> audioproc_resampler_;
   AudioLevel _audioLevel;  // measures audio level for the combined signal