Allow an external audio processing module to be used in WebRTC

webrtc/voice_engine/voe_base_impl.h

 /*
  *  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.
  */
 
@@ skipping 10 matching lines @@
 
 class ProcessThread;
 
 class VoEBaseImpl : public VoEBase,
                     public AudioTransport,
                     public AudioDeviceObserver {
  public:
   int RegisterVoiceEngineObserver(VoiceEngineObserver& observer) override;
   int DeRegisterVoiceEngineObserver() override;
 
-  int Init(AudioDeviceModule* external_adm = nullptr,
-           AudioProcessing* audioproc = nullptr,
-           const rtc::scoped_refptr<AudioDecoderFactory>& decoder_factory =
-               nullptr) override;
+  int Init(
+      AudioDeviceModule* external_adm,
+      AudioProcessing* external_apm,
+      const rtc::scoped_refptr<AudioDecoderFactory>& decoder_factory) override;
   AudioProcessing* audio_processing() override {
-    return shared_->audio_processing();
+    // TODO(peah): Remove this when upstream dependencies have properly been

[Taylor Brandstetter, 2017/06/28 07:19:38]

Here too

[peah-webrtc, 2017/06/29 11:46:31]

Done.

+    // resolved.
+    RTC_DCHECK(audio_processing_);
+    return audio_processing_.get();
   }
   AudioDeviceModule* audio_device_module() override {
     return shared_->audio_device();
   }
   voe::TransmitMixer* transmit_mixer() override {
     return shared_->transmit_mixer();
   }
   int Terminate() override;
 
   int CreateChannel() override;
@@ skipping 67 matching lines @@
                       void* audio_data, int64_t* elapsed_time_ms,
                       int64_t* ntp_time_ms);
 
   // Initialize channel by setting Engine Information then initializing
   // channel.
   int InitializeChannel(voe::ChannelOwner* channel_owner);
   VoiceEngineObserver* voiceEngineObserverPtr_;
   rtc::CriticalSection callbackCritSect_;
   rtc::scoped_refptr<AudioDecoderFactory> decoder_factory_;
 
+  // TODO(peah): Remove this when upstream dependencies have properly been
+  // resolved.
+  rtc::scoped_refptr<AudioProcessing> audio_processing_;
+
   AudioFrame audioFrame_;
   voe::SharedData* shared_;
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_VOICE_ENGINE_VOE_BASE_IMPL_H