Wait for encode thread during VideoScheduler teardown.

remoting/host/video_scheduler.cc

Index: remoting/host/video_scheduler.cc
diff --git a/remoting/host/video_scheduler.cc b/remoting/host/video_scheduler.cc
index 305caba19d9d197bffa923c14ad729c01fd857db..555a76b89d42a3a352f36e3ed7c7adc8f22eb7d0 100644
--- a/remoting/host/video_scheduler.cc
+++ b/remoting/host/video_scheduler.cc
@@ -159,9 +159,12 @@ void VideoScheduler::StopOnCaptureThread(const base::Closure& done_task) {
   // |capture_timer_| must be destroyed on the thread on which it is used.
   capture_timer_.reset();
 
-  // Activity on the encode thread will stop implicitly as a result of
-  // captures having stopped.
-  network_task_runner_->PostTask(FROM_HERE, done_task);
+  // Ensure that the encode thread is no longer processing capture data,
+  // otherwise tearing down |capturer_| will crash it.  See crbug.com/163641.
+  // TODO(wez): Make it safe to tear down capturer while buffers remain, and
+  // remove this work-around.
+  capture_task_runner_->PostTask(FROM_HERE,
+      base::Bind(&VideoScheduler::StopOnCaptureThread, this, done_task));

[alexeypa (please no reviews), 2012/12/10 21:10:12]

VideoScheduler::StopOnCaptureThread -> VideoScheduler::StopOnEncodeThread

[Wez, 2012/12/10 22:33:51]

*facepalm*

[Wez, 2012/12/10 22:33:51]

Done.

 }
 
 void VideoScheduler::ScheduleNextCapture() {
@@ -285,4 +288,12 @@ void VideoScheduler::EncodedDataAvailableCallback(
                             base::Passed(&packet)));
 }
 
+void VideoScheduler::StopOnEncodeThread(const base::Closure& done_task) {
+  DCHECK(encode_task_runner_->BelongsToCurrentThread());
+
+  // This is posted by StopOnCaptureThread, so we know that by the time we
+  // process it there are no more encode tasks queued.
+  network_task_runner_->PostTask(FROM_HERE, done_task);
+}
+
 }  // namespace remoting