WIP: Move the creation of AudioCodecFactory into PeerConnectionFactory.

webrtc/api/peerconnectionfactory.cc

 /*
  *  Copyright 2004 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.
  */
 
@@ skipping 10 matching lines @@
 #include "webrtc/api/peerconnection.h"
 #include "webrtc/api/peerconnectionfactoryproxy.h"
 #include "webrtc/api/peerconnectionproxy.h"
 #include "webrtc/api/videocapturertracksource.h"
 #include "webrtc/api/videosourceproxy.h"
 #include "webrtc/api/videotrack.h"
 #include "webrtc/base/bind.h"
 #include "webrtc/media/engine/webrtcmediaengine.h"
 #include "webrtc/media/engine/webrtcvideodecoderfactory.h"
 #include "webrtc/media/engine/webrtcvideoencoderfactory.h"
+#include "webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.h"
 #include "webrtc/modules/audio_device/include/audio_device.h"
 #include "webrtc/p2p/base/basicpacketsocketfactory.h"
 #include "webrtc/p2p/client/basicportallocator.h"
 
 namespace webrtc {
 
 namespace {
 
 // Passes down the calls to |store_|. See usage in CreatePeerConnection.
 class DtlsIdentityStoreWrapper : public DtlsIdentityStoreInterface {
@@ skipping 31 matching lines @@
   }
   return PeerConnectionFactoryProxy::Create(pc_factory->signaling_thread(),
                                             pc_factory);
 }
 
 rtc::scoped_refptr<PeerConnectionFactoryInterface>
 CreatePeerConnectionFactory(
     rtc::Thread* worker_thread,
     rtc::Thread* signaling_thread,
     AudioDeviceModule* default_adm,
-    cricket::WebRtcVideoEncoderFactory* encoder_factory,
-    cricket::WebRtcVideoDecoderFactory* decoder_factory) {
+    cricket::WebRtcVideoEncoderFactory* video_encoder_factory,
+    cricket::WebRtcVideoDecoderFactory* video_decoder_factory) {
   rtc::scoped_refptr<PeerConnectionFactory> pc_factory(
-      new rtc::RefCountedObject<PeerConnectionFactory>(worker_thread,
-                                                       signaling_thread,
-                                                       default_adm,
-                                                       encoder_factory,
-                                                       decoder_factory));
+      new rtc::RefCountedObject<PeerConnectionFactory>(
+          worker_thread,
+          signaling_thread,
+          default_adm,
+          std::shared_ptr<AudioDecoderFactory>(
+              CreateBuiltinAudioDecoderFactory()),
+          video_encoder_factory,
+          video_decoder_factory));
 
   // Call Initialize synchronously but make sure its executed on
   // |signaling_thread|.
   MethodCall0<PeerConnectionFactory, bool> call(
       pc_factory.get(),
       &PeerConnectionFactory::Initialize);
   bool result =  call.Marshal(signaling_thread);
 
   if (!result) {
     return nullptr;
@@ skipping 10 matching lines @@
     signaling_thread_ = rtc::ThreadManager::Instance()->WrapCurrentThread();
     wraps_current_thread_ = true;
   }
   worker_thread_->Start();
 }
 
 PeerConnectionFactory::PeerConnectionFactory(
     rtc::Thread* worker_thread,
     rtc::Thread* signaling_thread,
     AudioDeviceModule* default_adm,
+    std::shared_ptr<webrtc::AudioDecoderFactory> audio_decoder_factory,
     cricket::WebRtcVideoEncoderFactory* video_encoder_factory,
     cricket::WebRtcVideoDecoderFactory* video_decoder_factory)
     : owns_ptrs_(false),
       wraps_current_thread_(false),
       signaling_thread_(signaling_thread),
       worker_thread_(worker_thread),
       default_adm_(default_adm),
+      audio_decoder_factory_(std::move(audio_decoder_factory)),
       video_encoder_factory_(video_encoder_factory),
       video_decoder_factory_(video_decoder_factory) {
   ASSERT(worker_thread != NULL);
   ASSERT(signaling_thread != NULL);
   // TODO: Currently there is no way creating an external adm in
   // libjingle source tree. So we can 't currently assert if this is NULL.
   // ASSERT(default_adm != NULL);
 }
 
 PeerConnectionFactory::~PeerConnectionFactory() {
@@ skipping 195 matching lines @@
 }
 
 rtc::Thread* PeerConnectionFactory::worker_thread() {
   RTC_DCHECK(signaling_thread_->IsCurrent());
   return worker_thread_;
 }
 
 cricket::MediaEngineInterface* PeerConnectionFactory::CreateMediaEngine_w() {
   ASSERT(worker_thread_ == rtc::Thread::Current());
   return cricket::WebRtcMediaEngineFactory::Create(
-      default_adm_.get(), video_encoder_factory_.get(),
+      default_adm_.get(),
+      audio_decoder_factory_,
+      video_encoder_factory_.get(),
       video_decoder_factory_.get());
 }
 
 }  // namespace webrtc