Moved CreateBuiltinDecoderFactory out to VoEBaseImpl.

webrtc/voice_engine/channel_manager.cc

 /*
  *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #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 {
 namespace voe {
 
 ChannelOwner::ChannelOwner(class Channel* channel)
     : channel_ref_(new ChannelRef(channel)) {}
 
 ChannelOwner::ChannelOwner(const ChannelOwner& channel_owner)
     : channel_ref_(channel_owner.channel_ref_) {
@@ skipping 21 matching lines @@
 ChannelOwner::ChannelRef::ChannelRef(class Channel* channel)
     : channel(channel), ref_count(1) {}
 
 ChannelManager::ChannelManager(uint32_t instance_id, const Config& config)
     : instance_id_(instance_id),
       last_channel_id_(-1),
       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_);
 
   channels_.push_back(channel_owner);
 
   return channel_owner;
 }
 
 ChannelOwner ChannelManager::GetChannel(int32_t channel_id) {
@@ skipping 71 matching lines @@
 bool ChannelManager::Iterator::IsValid() {
   return iterator_pos_ < channels_.size();
 }
 
 void ChannelManager::Iterator::Increment() {
   ++iterator_pos_;
 }
 
 }  // namespace voe
 }  // namespace webrtc