From ab2c4737d17cc4ce21e16e5382f19ce7aac8d7d7 Mon Sep 17 00:00:00 2001 From: "wjia@chromium.org" Date: Wed, 20 Jul 2011 19:57:40 +0000 Subject: 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 --- media/video/capture/video_capture.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'media') 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 buffer) = 0; + // Feed buffer to video capture when done with it. + virtual void FeedBuffer(scoped_refptr buffer) = 0; virtual bool CaptureStarted() = 0; virtual int CaptureWidth() = 0; -- cgit v1.1