diff options
author | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-11 09:34:12 +0000 |
---|---|---|
committer | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-11 09:34:12 +0000 |
commit | 21ddd6a1622b423488ec424941b186aaa1b3a8b1 (patch) | |
tree | 6280bbce787a657d4cda22516186e8a4479e41a4 /remoting/host/video_scheduler.h | |
parent | 514168e8e5a047960fc6ffea6fa86dc549bfa9af (diff) | |
download | chromium_src-21ddd6a1622b423488ec424941b186aaa1b3a8b1.zip chromium_src-21ddd6a1622b423488ec424941b186aaa1b3a8b1.tar.gz chromium_src-21ddd6a1622b423488ec424941b186aaa1b3a8b1.tar.bz2 |
Wait for encode thread during VideoScheduler teardown.
VideoFrameCapturer currently owns the buffers underlying CaptureData
instances, so VideoScheduler::Stop() mustn't notify completion until
it is done accessing them.
BUG=163641
Review URL: https://chromiumcodereview.appspot.com/11474043
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@172280 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host/video_scheduler.h')
-rw-r--r-- | remoting/host/video_scheduler.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/remoting/host/video_scheduler.h b/remoting/host/video_scheduler.h index 9eafc22..8671530 100644 --- a/remoting/host/video_scheduler.h +++ b/remoting/host/video_scheduler.h @@ -155,6 +155,10 @@ class VideoScheduler : public base::RefCountedThreadSafe<VideoScheduler>, void EncodedDataAvailableCallback(scoped_ptr<VideoPacket> packet); + // Used to synchronize capture and encode thread teardown, notifying the + // network thread when done. + void StopOnEncodeThread(const base::Closure& done_task); + // Task runners used by this class. scoped_refptr<base::SingleThreadTaskRunner> capture_task_runner_; scoped_refptr<base::SingleThreadTaskRunner> encode_task_runner_; |