diff options
Diffstat (limited to 'webrtc/voice_engine/output_mixer.h')
| -rw-r--r-- | webrtc/voice_engine/output_mixer.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/webrtc/voice_engine/output_mixer.h b/webrtc/voice_engine/output_mixer.h index 71e55e4885..91387e6256 100644 --- a/webrtc/voice_engine/output_mixer.h +++ b/webrtc/voice_engine/output_mixer.h @@ -13,9 +13,9 @@ #include "webrtc/common_audio/resampler/include/push_resampler.h" #include "webrtc/common_types.h" -#include "webrtc/modules/audio_conference_mixer/interface/audio_conference_mixer.h" -#include "webrtc/modules/audio_conference_mixer/interface/audio_conference_mixer_defines.h" -#include "webrtc/modules/utility/interface/file_recorder.h" +#include "webrtc/modules/audio_conference_mixer/include/audio_conference_mixer.h" +#include "webrtc/modules/audio_conference_mixer/include/audio_conference_mixer_defines.h" +#include "webrtc/modules/utility/include/file_recorder.h" #include "webrtc/voice_engine/dtmf_inband.h" #include "webrtc/voice_engine/level_indicator.h" #include "webrtc/voice_engine/voice_engine_defines.h" @@ -63,7 +63,7 @@ public: int32_t SetAnonymousMixabilityStatus(MixerParticipant& participant, bool mixable); - int GetMixedAudio(int sample_rate_hz, int num_channels, + int GetMixedAudio(int sample_rate_hz, size_t num_channels, AudioFrame* audioFrame); // VoEVolumeControl @@ -102,7 +102,6 @@ public: private: OutputMixer(uint32_t instanceId); - void APMProcessReverseStream(); int InsertInbandDtmfTone(); // uses |