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

talk/app/webrtc/mediacontroller.cc

 /*
  * libjingle
  * Copyright 2015 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 29 matching lines @@
 
 class MediaController : public webrtc::MediaControllerInterface,
                         public sigslot::has_slots<> {
  public:
   MediaController(rtc::Thread* worker_thread,
                   cricket::ChannelManager* channel_manager)
       : worker_thread_(worker_thread), channel_manager_(channel_manager) {
     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>(
         rtc::Bind(&MediaController::Destruct_w, this));
   }
 
   webrtc::Call* call_w() override {
     RTC_DCHECK(worker_thread_->IsCurrent());
     return call_.get();
   }
 
   cricket::ChannelManager* channel_manager() const override {
     return channel_manager_;
   }
 
  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;
     call_.reset(webrtc::Call::Create(config));
   }
   void Destruct_w() {
     RTC_DCHECK(worker_thread_->IsCurrent());
     call_.reset();
   }
 
   rtc::Thread* const worker_thread_;
   cricket::ChannelManager* const channel_manager_;
   rtc::scoped_ptr<webrtc::Call> call_;
 
   RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(MediaController);
 };
 } // namespace {
 
 namespace webrtc {
 
 MediaControllerInterface* MediaControllerInterface::Create(
     rtc::Thread* worker_thread,
     cricket::ChannelManager* channel_manager) {
   return new MediaController(worker_thread, channel_manager);
 }
 } // namespace webrtc