Moved creation of AudioDecoderFactory to inside PeerConnectionFactory.

webrtc/media/engine/webrtcmediaengine.cc

 /*
  *  Copyright (c) 2014 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 11 matching lines @@
 namespace cricket {
 
 class WebRtcMediaEngine2
 #ifdef HAVE_WEBRTC_VIDEO
     : public CompositeMediaEngine<WebRtcVoiceEngine, WebRtcVideoEngine2> {
 #else
     : public CompositeMediaEngine<WebRtcVoiceEngine, NullWebRtcVideoEngine> {
 #endif
  public:
   WebRtcMediaEngine2(webrtc::AudioDeviceModule* adm,
-                     WebRtcVideoEncoderFactory* encoder_factory,
-                     WebRtcVideoDecoderFactory* decoder_factory)
+                     const rtc::scoped_refptr<webrtc::AudioDecoderFactory>&
+                         audio_decoder_factory,
+                     WebRtcVideoEncoderFactory* video_encoder_factory,
+                     WebRtcVideoDecoderFactory* video_decoder_factory)
 #ifdef HAVE_WEBRTC_VIDEO
-      : CompositeMediaEngine<WebRtcVoiceEngine, WebRtcVideoEngine2>(adm) {
+      : CompositeMediaEngine<WebRtcVoiceEngine, WebRtcVideoEngine2>(
+            adm, audio_decoder_factory){
 #else
-      : CompositeMediaEngine<WebRtcVoiceEngine, NullWebRtcVideoEngine>(adm) {
+      : CompositeMediaEngine<WebRtcVoiceEngine, NullWebRtcVideoEngine>(
+            adm, audio_decoder_factory) {
 #endif
-    video_.SetExternalDecoderFactory(decoder_factory);
-    video_.SetExternalEncoderFactory(encoder_factory);
+    video_.SetExternalDecoderFactory(video_decoder_factory);
+    video_.SetExternalEncoderFactory(video_encoder_factory);
   }
 };
 
 }  // namespace cricket
 
 cricket::MediaEngineInterface* CreateWebRtcMediaEngine(
     webrtc::AudioDeviceModule* adm,
-    cricket::WebRtcVideoEncoderFactory* encoder_factory,
-    cricket::WebRtcVideoDecoderFactory* decoder_factory) {
-  return new cricket::WebRtcMediaEngine2(adm, encoder_factory,
-                                         decoder_factory);
+    const rtc::scoped_refptr<webrtc::AudioDecoderFactory>&
+        audio_decoder_factory,
+    cricket::WebRtcVideoEncoderFactory* video_encoder_factory,
+    cricket::WebRtcVideoDecoderFactory* video_decoder_factory) {
+  return new cricket::WebRtcMediaEngine2(
+      adm, audio_decoder_factory, video_encoder_factory, video_decoder_factory);
 }
 
 void DestroyWebRtcMediaEngine(cricket::MediaEngineInterface* media_engine) {
   delete media_engine;
 }
 
 namespace cricket {
 
 // Used by PeerConnectionFactory to create a media engine passed into
 // ChannelManager.
 MediaEngineInterface* WebRtcMediaEngineFactory::Create(
     webrtc::AudioDeviceModule* adm,
-    WebRtcVideoEncoderFactory* encoder_factory,
-    WebRtcVideoDecoderFactory* decoder_factory) {
-  return CreateWebRtcMediaEngine(adm, encoder_factory, decoder_factory);
+    const rtc::scoped_refptr<webrtc::AudioDecoderFactory>&
+        audio_decoder_factory,
+    WebRtcVideoEncoderFactory* video_encoder_factory,
+    WebRtcVideoDecoderFactory* video_decoder_factory) {
+  return CreateWebRtcMediaEngine(adm, audio_decoder_factory,
+                                 video_encoder_factory, video_decoder_factory);
 }
 
 namespace {
 // Remove mutually exclusive extensions with lower priority.
 void DiscardRedundantExtensions(
     std::vector<webrtc::RtpExtension>* extensions,
     rtc::ArrayView<const char*> extensions_decreasing_prio) {
   RTC_DCHECK(extensions);
   bool found = false;
   for (const char* uri : extensions_decreasing_prio) {
@@ skipping 63 matching lines @@
     static const char* kBweExtensionPriorities[] = {
         webrtc::RtpExtension::kTransportSequenceNumberUri,
         webrtc::RtpExtension::kAbsSendTimeUri,
         webrtc::RtpExtension::kTimestampOffsetUri};
     DiscardRedundantExtensions(&result, kBweExtensionPriorities);
   }
 
   return result;
 }
 }  // namespace cricket