Moved CreateBuiltinDecoderFactory out to VoEBaseImpl.

webrtc/voice_engine/channel_manager.cc

Index: webrtc/voice_engine/channel_manager.cc
diff --git a/webrtc/voice_engine/channel_manager.cc b/webrtc/voice_engine/channel_manager.cc
index 6071f19548edf1c8447d512e8a36f86d10ab6ff7..47350b59c9a69c272b9dccd77468b7a49c36cc49 100644
--- a/webrtc/voice_engine/channel_manager.cc
+++ b/webrtc/voice_engine/channel_manager.cc
@@ -11,6 +11,7 @@
 #include "webrtc/voice_engine/channel_manager.h"
 
 #include "webrtc/common.h"
+#include "webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.h"
 #include "webrtc/voice_engine/channel.h"
 
 namespace webrtc {
@@ -52,17 +53,30 @@ ChannelManager::ChannelManager(uint32_t instance_id, const Config& config)
       event_log_(RtcEventLog::Create(Clock::GetRealTimeClock())) {}
 
 ChannelOwner ChannelManager::CreateChannel() {
-  return CreateChannelInternal(config_);
+  return CreateChannel(CreateBuiltinAudioDecoderFactory());

[kwiberg-webrtc, 2016/05/25 09:19:16]

Forward straight to the two-argument CreateChannel?

[ossu, 2016/05/26 12:09:53]

I think this is fine. Means we only need to change in one place if, for example,
the way we handle the internal config_ changes in the other version.

 }
 
 ChannelOwner ChannelManager::CreateChannel(const Config& external_config) {
-  return CreateChannelInternal(external_config);
+  return CreateChannel(external_config, CreateBuiltinAudioDecoderFactory());
 }
 
-ChannelOwner ChannelManager::CreateChannelInternal(const Config& config) {
+ChannelOwner ChannelManager::CreateChannel(
+    const rtc::scoped_refptr<AudioDecoderFactory>& decoder_factory) {
+  return CreateChannelInternal(config_, decoder_factory);
+}
+
+ChannelOwner ChannelManager::CreateChannel(
+    const Config& external_config,
+    const rtc::scoped_refptr<AudioDecoderFactory>& decoder_factory) {
+  return CreateChannelInternal(external_config, decoder_factory);
+}
+
+ChannelOwner ChannelManager::CreateChannelInternal(
+    const Config& config,
+    const rtc::scoped_refptr<AudioDecoderFactory>& decoder_factory) {
   Channel* channel;
   Channel::CreateChannel(channel, ++last_channel_id_, instance_id_,
-                         event_log_.get(), config);
+                         event_log_.get(), config, decoder_factory);
   ChannelOwner channel_owner(channel);
 
   rtc::CritScope crit(&lock_);