diff options
| author | wjia@chromium.org <wjia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-23 18:39:42 +0000 |
|---|---|---|
| committer | wjia@chromium.org <wjia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-23 18:39:42 +0000 |
| commit | d843cc13b385ed30100bfa0cd3b08897ca8cd8b9 (patch) | |
| tree | 7805cc828612b296ebef94541b12bf14064e1785 /content/renderer/media/video_capture_impl.h | |
| parent | 5f31c18bb4f01034c9b6076746cd98f56ab9c196 (diff) | |
| download | chromium_src-d843cc13b385ed30100bfa0cd3b08897ca8cd8b9.zip chromium_src-d843cc13b385ed30100bfa0cd3b08897ca8cd8b9.tar.gz chromium_src-d843cc13b385ed30100bfa0cd3b08897ca8cd8b9.tar.bz2 | |
fix a racing condition when renderer process requests StopCapture before host gets controller
fix a typo (thanks ihf@)
BUG=104581
TEST=trybots
Review URL: http://codereview.chromium.org/8549010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111373 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/media/video_capture_impl.h')
| -rw-r--r-- | content/renderer/media/video_capture_impl.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/content/renderer/media/video_capture_impl.h b/content/renderer/media/video_capture_impl.h index b7df349..6175725 100644 --- a/content/renderer/media/video_capture_impl.h +++ b/content/renderer/media/video_capture_impl.h @@ -13,6 +13,7 @@ #include <map> #include "content/common/content_export.h" +#include "content/common/media/video_capture.h" #include "content/renderer/media/video_capture_message_filter.h" #include "media/video/capture/video_capture.h" @@ -37,7 +38,7 @@ class CONTENT_EXPORT VideoCaptureImpl virtual void OnBufferCreated(base::SharedMemoryHandle handle, int length, int buffer_id) OVERRIDE; virtual void OnBufferReceived(int buffer_id, base::Time timestamp) OVERRIDE; - virtual void OnStateChanged(const media::VideoCapture::State& state) OVERRIDE; + virtual void OnStateChanged(video_capture::State state) OVERRIDE; virtual void OnDeviceInfoReceived( const media::VideoCaptureParams& device_info) OVERRIDE; virtual void OnDelegateAdded(int32 device_id) OVERRIDE; @@ -62,7 +63,7 @@ class CONTENT_EXPORT VideoCaptureImpl void DoBufferCreated(base::SharedMemoryHandle handle, int length, int buffer_id); void DoBufferReceived(int buffer_id, base::Time timestamp); - void DoStateChanged(const media::VideoCapture::State& state); + void DoStateChanged(video_capture::State state); void DoDeviceInfoReceived(const media::VideoCaptureParams& device_info); void DoDelegateAdded(int32 device_id); @@ -104,7 +105,7 @@ class CONTENT_EXPORT VideoCaptureImpl media::VideoCaptureParams device_info_; bool device_info_available_; - State state_; + video_capture::State state_; DISALLOW_COPY_AND_ASSIGN(VideoCaptureImpl); }; |