diff options
| author | wjia@chromium.org <wjia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-20 19:57:40 +0000 |
|---|---|---|
| committer | wjia@chromium.org <wjia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-20 19:57:40 +0000 |
| commit | ab2c4737d17cc4ce21e16e5382f19ce7aac8d7d7 (patch) | |
| tree | aa8b742f1721b64c1ccc9486616bf05b5640de9d /media | |
| parent | 13a8f498151ac4e1e771cb3d70d56f38848be04a (diff) | |
| download | chromium_src-ab2c4737d17cc4ce21e16e5382f19ce7aac8d7d7.zip chromium_src-ab2c4737d17cc4ce21e16e5382f19ce7aac8d7d7.tar.gz chromium_src-ab2c4737d17cc4ce21e16e5382f19ce7aac8d7d7.tar.bz2 | |
reland patch http://codereview.chromium.org/7204008 after webrtc build has been fixed.
BUG=none
TEST=try bots
Review URL: http://codereview.chromium.org/7458006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93235 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/video/capture/video_capture.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/media/video/capture/video_capture.h b/media/video/capture/video_capture.h index 65789fb..9a197e2 100644 --- a/media/video/capture/video_capture.h +++ b/media/video/capture/video_capture.h @@ -24,6 +24,7 @@ class VideoCapture { kStarted, kPaused, kStopped, + kStopping, kError, }; @@ -42,7 +43,7 @@ class VideoCapture { int height; int stride; size_t buffer_size; - void* memory_pointer; + uint8* memory_pointer; base::Time timestamp; private: @@ -98,9 +99,8 @@ class VideoCapture { // Request video capture to stop capturing for client |handler|. virtual void StopCapture(EventHandler* handler) = 0; - // TODO(wjia): Add FeedBuffer when buffer sharing is needed between video - // capture and downstream module. - // virtual void FeedBuffer(scoped_refptr<VideoFrameBuffer> buffer) = 0; + // Feed buffer to video capture when done with it. + virtual void FeedBuffer(scoped_refptr<VideoFrameBuffer> buffer) = 0; virtual bool CaptureStarted() = 0; virtual int CaptureWidth() = 0; |