1 files changed, 5 insertions, 7 deletions
diff --git a/chromium/third_party/webrtc/voice_engine/output_mixer.h b/chromium/third_party/webrtc/voice_engine/output_mixer.h
index fc9afd8c542..e5c65e41bc1 100644
--- a/chromium/third_party/webrtc/voice_engine/output_mixer.h
+++ b/chromium/third_party/webrtc/voice_engine/output_mixer.h
@@ -54,13 +54,9 @@ public:
     // VoEDtmf
     int PlayDtmfTone(uint8_t eventCode, int lengthMs, int attenuationDb);
 
-    int StartPlayingDtmfTone(uint8_t eventCode, int attenuationDb);
-
-    int StopPlayingDtmfTone();
-
     int32_t MixActiveChannels();
 
-    int32_t DoOperationsOnCombinedSignal();
+    int32_t DoOperationsOnCombinedSignal(bool feed_data_to_apm);
 
     int32_t SetMixabilityStatus(MixerParticipant& participant,
                                 bool mixable);
@@ -133,8 +129,10 @@ private:
     CriticalSectionWrapper& _fileCritSect;
     AudioConferenceMixer& _mixerModule;
     AudioFrame _audioFrame;
-    PushResampler resampler_;  // converts mixed audio to fit ADM format
-    PushResampler audioproc_resampler_;  // converts mixed audio to fit APM rate
+    // 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
     DtmfInband _dtmfGenerator;
     int _instanceId;