Move VoiceEngineObserver into AudioSendStream so that we detect typing noises and return properly i…

talk/app/webrtc/mediacontroller.cc

Index: talk/app/webrtc/mediacontroller.cc
diff --git a/talk/app/webrtc/mediacontroller.cc b/talk/app/webrtc/mediacontroller.cc
index f7d85116b19c6ff83bdc9c474777e5739f7e6a13..ecd54e8b05b46d25ea4b30a58c983c7c0ea8bcf8 100644
--- a/talk/app/webrtc/mediacontroller.cc
+++ b/talk/app/webrtc/mediacontroller.cc
@@ -47,7 +47,7 @@ class MediaController : public webrtc::MediaControllerInterface,
     RTC_DCHECK(nullptr != worker_thread);
     worker_thread_->Invoke<void>(
         rtc::Bind(&MediaController::Construct_w, this,
-                  channel_manager_->media_engine()->GetVoE()));
+                  channel_manager_->media_engine()->GetAudioState()));

[tommi, 2015/11/02 13:46:53]

Since we're passing pointers between threads, we can't use linked_ptr
unfortunately :(
Going back to using raw pointers will avoid the race in linked_ptr but it feels
a bit like giving up.  As is, I don't see the lifetime guarantees (how is it
guaranteed that the object will never be deleted when accessed on a different
thread).

[the sun, 2015/11/03 12:41:07]

Well, given how things were being configured, the AudioState and VoiceEngine
were guaranteed to outlive all Call objects (and hence streams too), but I agree
we're better off with some clothes on; using scoped_refptr.

   }
   ~MediaController() override {
     worker_thread_->Invoke<void>(
@@ -64,10 +64,10 @@ class MediaController : public webrtc::MediaControllerInterface,
   }
 
  private:
-  void Construct_w(webrtc::VoiceEngine* voice_engine)  {
+  void Construct_w(rtc::linked_ptr<webrtc::AudioState> audio_state)  {
     RTC_DCHECK(worker_thread_->IsCurrent());
     webrtc::Call::Config config;
-    config.voice_engine = voice_engine;
+    config.audio_state = audio_state;
     config.bitrate_config.min_bitrate_bps = kMinBandwidthBps;
     config.bitrate_config.start_bitrate_bps = kStartBandwidthBps;
     config.bitrate_config.max_bitrate_bps = kMaxBandwidthBps;