Enable the injection of an APM into a peerconnection

webrtc/pc/createpeerconnectionfactory.cc

 /*
  *  Copyright 2017 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 22 matching lines @@
 }
 
 rtc::scoped_refptr<PeerConnectionFactoryInterface>
 CreatePeerConnectionFactory() {
   return CreatePeerConnectionFactory(CreateBuiltinAudioEncoderFactory(),
                                      CreateBuiltinAudioDecoderFactory());
 }
 
 // Note: all the other CreatePeerConnectionFactory variants just end up calling
 // this, ultimately.
-rtc::scoped_refptr<PeerConnectionFactoryInterface>
-CreatePeerConnectionFactoryWithAudioMixer(
+rtc::scoped_refptr<PeerConnectionFactoryInterface> CreatePeerConnectionFactory(

[peah-webrtc, 2017/06/30 11:48:46]

This name was chosen in discussion with kwiberg@ as adding further suffixes
describing what modules were injected did not scale.

     rtc::Thread* network_thread,
     rtc::Thread* worker_thread,
     rtc::Thread* signaling_thread,
     AudioDeviceModule* default_adm,
     rtc::scoped_refptr<AudioEncoderFactory> audio_encoder_factory,
     rtc::scoped_refptr<AudioDecoderFactory> audio_decoder_factory,
     cricket::WebRtcVideoEncoderFactory* video_encoder_factory,
     cricket::WebRtcVideoDecoderFactory* video_decoder_factory,
-    rtc::scoped_refptr<AudioMixer> audio_mixer) {
+    rtc::scoped_refptr<AudioMixer> audio_mixer,
+    rtc::scoped_refptr<AudioProcessing> audio_processing) {
+  rtc::scoped_refptr<AudioProcessing> audio_processing_use = audio_processing;
+  if (!audio_processing_use) {
+    audio_processing_use = AudioProcessing::Create();
+  }
+
   std::unique_ptr<cricket::MediaEngineInterface> media_engine(
       cricket::WebRtcMediaEngineFactory::Create(
           default_adm, audio_encoder_factory, audio_decoder_factory,
           video_encoder_factory, video_decoder_factory, audio_mixer,
-          AudioProcessing::Create()));
+          audio_processing_use));
 
   std::unique_ptr<CallFactoryInterface> call_factory = CreateCallFactory();
 
   std::unique_ptr<RtcEventLogFactoryInterface> event_log_factory =
       CreateRtcEventLogFactory();
 
   return CreateModularPeerConnectionFactory(
       network_thread, worker_thread, signaling_thread, default_adm,
       audio_encoder_factory, audio_decoder_factory, video_encoder_factory,
       video_decoder_factory, audio_mixer, std::move(media_engine),
       std::move(call_factory), std::move(event_log_factory));
 }
 
 rtc::scoped_refptr<PeerConnectionFactoryInterface>
 CreatePeerConnectionFactoryWithAudioMixer(
     rtc::Thread* network_thread,
+    rtc::Thread* worker_thread,
+    rtc::Thread* signaling_thread,
+    AudioDeviceModule* default_adm,
+    rtc::scoped_refptr<AudioEncoderFactory> audio_encoder_factory,
+    rtc::scoped_refptr<AudioDecoderFactory> audio_decoder_factory,
+    cricket::WebRtcVideoEncoderFactory* video_encoder_factory,
+    cricket::WebRtcVideoDecoderFactory* video_decoder_factory,
+    rtc::scoped_refptr<AudioMixer> audio_mixer) {
+  return CreatePeerConnectionFactory(
+      network_thread, worker_thread, signaling_thread, default_adm,
+      audio_encoder_factory, audio_decoder_factory, video_encoder_factory,
+      video_decoder_factory, audio_mixer, nullptr);
+}
+
+rtc::scoped_refptr<PeerConnectionFactoryInterface>
+CreatePeerConnectionFactoryWithAudioMixer(
+    rtc::Thread* network_thread,
     rtc::Thread* worker_thread,
     rtc::Thread* signaling_thread,
     AudioDeviceModule* default_adm,
     cricket::WebRtcVideoEncoderFactory* encoder_factory,
     cricket::WebRtcVideoDecoderFactory* decoder_factory,
     rtc::scoped_refptr<AudioMixer> audio_mixer) {
   return CreatePeerConnectionFactoryWithAudioMixer(
       network_thread, worker_thread, signaling_thread, default_adm,
       CreateBuiltinAudioEncoderFactory(), CreateBuiltinAudioDecoderFactory(),
       encoder_factory, decoder_factory, audio_mixer);
@@ skipping 20 matching lines @@
     rtc::scoped_refptr<AudioDecoderFactory> audio_decoder_factory,
     cricket::WebRtcVideoEncoderFactory* video_encoder_factory,
     cricket::WebRtcVideoDecoderFactory* video_decoder_factory) {
   return CreatePeerConnectionFactoryWithAudioMixer(
       network_thread, worker_thread, signaling_thread, default_adm,
       audio_encoder_factory, audio_decoder_factory, video_encoder_factory,
       video_decoder_factory, nullptr);
 }
 
 }  // namespace webrtc