From 0c108d0b4d47c573ccb8ccb6fc13fa0d96f2e2b1 Mon Sep 17 00:00:00 2001 From: "henrik.lundin@webrtc.org" Date: Tue, 22 Apr 2014 09:44:00 +0000 Subject: [PATCH] Revert "Stop using ACM factory in VoiceEngine" Some of the bots where breaking. TBR=henrika@webrtc.org BUG=2996 Review URL: https://webrtc-codereview.appspot.com/12319004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@5955 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/voice_engine/channel.cc | 2 +- webrtc/voice_engine/voice_engine_impl.cc | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/webrtc/voice_engine/channel.cc b/webrtc/voice_engine/channel.cc index fb73c1397..576331ad5 100644 --- a/webrtc/voice_engine/channel.cc +++ b/webrtc/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_(AudioCodingModule::Create( + audio_coding_(config.Get().Create( VoEModuleId(instanceId, channelId))), _rtpDumpIn(*RtpDump::CreateRtpDump()), _rtpDumpOut(*RtpDump::CreateRtpDump()), diff --git a/webrtc/voice_engine/voice_engine_impl.cc b/webrtc/voice_engine/voice_engine_impl.cc index e7ae5de3c..52882f54c 100644 --- a/webrtc/voice_engine/voice_engine_impl.cc +++ b/webrtc/voice_engine/voice_engine_impl.cc @@ -86,6 +86,8 @@ int VoiceEngineImpl::Release() { VoiceEngine* VoiceEngine::Create() { Config* config = new Config(); + config->Set(new NewAudioCodingModuleFactory()); + return GetVoiceEngine(config, true); }