admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reland "Stop using ACM factory in VoiceEngine"

Browse Source 
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@5958 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
henrik.lundin@webrtc.org 2014-04-22 19:04:34 +00:00
parent d59359af4d
commit 34fe0153b9
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/voice_engine/channel.cc
View File

@ -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()),

2
webrtc/voice_engine/voice_engine_impl.cc
View File

@ -86,8 +86,6 @@ int VoiceEngineImpl::Release() {
VoiceEngine* VoiceEngine::Create() {
Config* config = new Config();
config->Set<AudioCodingModuleFactory>(new NewAudioCodingModuleFactory());
return GetVoiceEngine(config, true);
}