From 139706ec0bfc0cf70e0734a92ecba4251f9bb936 Mon Sep 17 00:00:00 2001 From: "henrik.lundin@webrtc.org" Date: Tue, 22 Apr 2014 08:51:21 +0000 Subject: [PATCH] Stop using ACM factory in VoiceEngine The factory injection was introduces in order to facilitate switching between ACM1 and ACM2. Now, ACM1 is being deprecated, and this switching mechanism is no longer needed. BUG=2996 R=henrika@webrtc.org Review URL: https://webrtc-codereview.appspot.com/12259005 git-svn-id: http://webrtc.googlecode.com/svn/trunk@5954 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/voice_engine/channel.cc | 2 +- webrtc/voice_engine/voice_engine_impl.cc | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/webrtc/voice_engine/channel.cc b/webrtc/voice_engine/channel.cc index 576331ad53..fb73c13973 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_(config.Get().Create( + audio_coding_(AudioCodingModule::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 52882f54ca..e7ae5de3c3 100644 --- a/webrtc/voice_engine/voice_engine_impl.cc +++ b/webrtc/voice_engine/voice_engine_impl.cc @@ -86,8 +86,6 @@ int VoiceEngineImpl::Release() { VoiceEngine* VoiceEngine::Create() { Config* config = new Config(); - config->Set(new NewAudioCodingModuleFactory()); - return GetVoiceEngine(config, true); }