Moved injection of AudioDecoderFactory into voe::Channel.

webrtc/modules/audio_coding/acm2/audio_coding_module.cc

 /*
  *  Copyright (c) 2012 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/modules/audio_coding/include/audio_coding_module.h"
 
 #include "webrtc/base/checks.h"
 #include "webrtc/common_types.h"
 #include "webrtc/modules/audio_coding/acm2/audio_coding_module_impl.h"
 #include "webrtc/modules/audio_coding/acm2/rent_a_codec.h"
+#include "webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.h"
 #include "webrtc/system_wrappers/include/clock.h"
 #include "webrtc/system_wrappers/include/trace.h"
 
 namespace webrtc {
 
 // Create module
 AudioCodingModule* AudioCodingModule::Create(int id) {
   Config config;
   config.id = id;
   config.clock = Clock::GetRealTimeClock();
+  config.decoder_factory = CreateBuiltinAudioDecoderFactory();
   return Create(config);
 }
 
 AudioCodingModule* AudioCodingModule::Create(int id, Clock* clock) {
   Config config;
   config.id = id;
   config.clock = clock;
+  config.decoder_factory = CreateBuiltinAudioDecoderFactory();
   return Create(config);
 }
 
 AudioCodingModule* AudioCodingModule::Create(const Config& config) {
+  if (!config.decoder_factory) {
+    // TODO(ossu): Backwards compatibility. Will be removed after a deprecation
+    // cycle.
+    Config config_copy = config;
+    config_copy.decoder_factory = CreateBuiltinAudioDecoderFactory();
+    return new acm2::AudioCodingModuleImpl(config_copy);
+  }
   return new acm2::AudioCodingModuleImpl(config);
 }
 
 int AudioCodingModule::NumberOfCodecs() {
   return static_cast<int>(acm2::RentACodec::NumberOfCodecs());
 }
 
 int AudioCodingModule::Codec(int list_id, CodecInst* codec) {
   auto codec_id = acm2::RentACodec::CodecIdFromIndex(list_id);
   if (!codec_id)
@@ skipping 41 matching lines @@
 // Checks the validity of the parameters of the given codec
 bool AudioCodingModule::IsCodecValid(const CodecInst& codec) {
   bool valid = acm2::RentACodec::IsCodecValid(codec);
   if (!valid)
     WEBRTC_TRACE(webrtc::kTraceError, webrtc::kTraceAudioCoding, -1,
                  "Invalid codec setting");
   return valid;
 }
 
 }  // namespace webrtc