diff options
| author | henrik.lundin@webrtc.org <henrik.lundin@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-04-22 19:04:34 +0000 |
|---|---|---|
| committer | henrik.lundin@webrtc.org <henrik.lundin@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-04-22 19:04:34 +0000 |
| commit | 6ce372053e532e2f6fbcc84c6a789d5d833e0811 (patch) | |
| tree | 94246132de0b2c55d8391f52c1b87416ebf52039 /voice_engine/channel.cc | |
| parent | 8e29911a1ab588a2bddc6ea54c0acbd445d4c114 (diff) | |
| download | webrtc-6ce372053e532e2f6fbcc84c6a789d5d833e0811.tar.gz | |
Reland "Stop using ACM factory in VoiceEngine"
This change was originally landed as r5954, but had to be reverted in
r5955 due to bots failing. The failures should be fixed in r5956,
so the original change is now relanded.
BUG=2996
TBR=henrika@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/12339004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@5958 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'voice_engine/channel.cc')
| -rw-r--r-- | voice_engine/channel.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/voice_engine/channel.cc b/voice_engine/channel.cc index 576331ad..fb73c139 100644 --- a/voice_engine/channel.cc +++ b/voice_engine/channel.cc @@ -836,7 +836,7 @@ Channel::Channel(int32_t channelId, VoEModuleId(instanceId, channelId), Clock::GetRealTimeClock(), this, this, this, rtp_payload_registry_.get())), telephone_event_handler_(rtp_receiver_->GetTelephoneEventHandler()), - audio_coding_(config.Get<AudioCodingModuleFactory>().Create( + audio_coding_(AudioCodingModule::Create( VoEModuleId(instanceId, channelId))), _rtpDumpIn(*RtpDump::CreateRtpDump()), _rtpDumpOut(*RtpDump::CreateRtpDump()), |