diff options
| author | andrew@webrtc.org <andrew@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-05-02 00:30:36 +0000 |
|---|---|---|
| committer | andrew@webrtc.org <andrew@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-05-02 00:30:36 +0000 |
| commit | 4a68e95e2b6b6da1def731fa5f96559ee6f76c23 (patch) | |
| tree | c172b28dd013fe937dc9f4a44753ef2523640fec /voice_engine/transmit_mixer.h | |
| parent | 166153edf3ca7372f62d86b050ea91a7ec494be9 (diff) | |
| download | webrtc-4a68e95e2b6b6da1def731fa5f96559ee6f76c23.tar.gz | |
Replace Resampler with PushResampler in transmit_mixer.
* VoE can now exchange 44.1 kHz audio with AudioDevice.
* Changes still required in AudioDevice to remove the 44 kHz workarounds and
enable native 44.1 kHz.
BUG=webrtc:1395
TESTED=voe_cmd_test loopback running through codecs using all combinations of {8, 16, 32} kHz and {1, 2} channels, and Opus (48 kHz, stereo)
R=bjornv@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/1373004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@3930 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'voice_engine/transmit_mixer.h')
| -rw-r--r-- | voice_engine/transmit_mixer.h | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/voice_engine/transmit_mixer.h b/voice_engine/transmit_mixer.h index f01362f5..c98f6406 100644 --- a/voice_engine/transmit_mixer.h +++ b/voice_engine/transmit_mixer.h @@ -11,16 +11,15 @@ #ifndef WEBRTC_VOICE_ENGINE_TRANSMIT_MIXER_H #define WEBRTC_VOICE_ENGINE_TRANSMIT_MIXER_H -#include "common_types.h" -#include "voe_base.h" -#include "file_player.h" -#include "file_recorder.h" -#include "level_indicator.h" -#include "module_common_types.h" -#include "monitor_module.h" -#include "resampler.h" -#include "voice_engine_defines.h" - +#include "webrtc/common_audio/resampler/include/push_resampler.h" +#include "webrtc/common_types.h" +#include "webrtc/modules/interface/module_common_types.h" +#include "webrtc/modules/utility/interface/file_player.h" +#include "webrtc/modules/utility/interface/file_recorder.h" +#include "webrtc/voice_engine/include/voe_base.h" +#include "webrtc/voice_engine/level_indicator.h" +#include "webrtc/voice_engine/monitor_module.h" +#include "webrtc/voice_engine/voice_engine_defines.h" namespace webrtc { @@ -192,7 +191,7 @@ private: // owns MonitorModule _monitorModule; AudioFrame _audioFrame; - Resampler _audioResampler; // ADM sample rate -> mixing rate + PushResampler resampler_; // ADM sample rate -> mixing rate FilePlayer* _filePlayerPtr; FileRecorder* _fileRecorderPtr; FileRecorder* _fileCallRecorderPtr; |