commit 62411a21c9461265cc0fa69e947afafc00f8c807
author deadbeef <deadbeef@webrtc.org> Sun Mar 20 21:24:49 2016
committer Commit bot <commit-bot@chromium.org> Sun Mar 20 21:24:55 2016
tree ced45050691c9d4823dec09f4d9b003c2004327e
parent bdbceeffe8a7360dd90958ccc1c30b478a08c350

Fixing crash that may occur after destroying a VideoSendStream.

It was possible that even after a VideoSendStream was destroyed,
it remained registered as a BitrateAllocator observer, causing a
segfault later.

Review URL: https://codereview.webrtc.org/1815733002

Cr-Commit-Position: refs/heads/master@{#12067}

webrtc/video/video_send_stream.cc

diff --git a/webrtc/video/video_send_stream.cc b/webrtc/video/video_send_stream.cc
index 6682396..5b941da 100644
--- a/webrtc/video/video_send_stream.cc
+++ b/webrtc/video/video_send_stream.cc
@@ -452,7 +452,6 @@
 VideoSendStream::~VideoSendStream() {
   LOG(LS_INFO) << "~VideoSendStream: " << config_.ToString();
 
-  bitrate_allocator_->RemoveObserver(this);
   Stop();
 
   // Stop the encoder thread permanently.
@@ -460,6 +459,10 @@
   encoder_wakeup_event_.Set();
   encoder_thread_.Stop();
 
+  // This needs to happen after stopping the encoder thread,
+  // since the encoder thread calls AddObserver.
+  bitrate_allocator_->RemoveObserver(this);
+
   module_process_thread_->DeRegisterModule(&overuse_detector_);
   vie_channel_.RegisterSendFrameCountObserver(nullptr);
   vie_channel_.RegisterSendBitrateObserver(nullptr);