diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-14 20:28:01 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-14 20:28:01 +0000 |
| commit | fb0b6de9ebf451952e32faad2ac3a1087f93cb5a (patch) | |
| tree | 9a803e8b86cf15f9aad85c7660e253c31bf2f774 /media | |
| parent | 31cbe0ba16b9e2557c8a4b9c3dcffe602720ca16 (diff) | |
| download | chromium_src-fb0b6de9ebf451952e32faad2ac3a1087f93cb5a.zip chromium_src-fb0b6de9ebf451952e32faad2ac3a1087f93cb5a.tar.gz chromium_src-fb0b6de9ebf451952e32faad2ac3a1087f93cb5a.tar.bz2 | |
Revert 92590 - add CaptureVideoDecoder for local preview and VideoCaptureModuleImpl for rtc encoding channel.
BUG=none
TEST=try bots
Review URL: http://codereview.chromium.org/7204008
TBR=wjia@chromium.org
Review URL: http://codereview.chromium.org/7375007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92592 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 9a197e2..65789fb 100644 --- a/media/video/capture/video_capture.h +++ b/media/video/capture/video_capture.h @@ -24,7 +24,6 @@ class VideoCapture { kStarted, kPaused, kStopped, - kStopping, kError, }; @@ -43,7 +42,7 @@ class VideoCapture { int height; int stride; size_t buffer_size; - uint8* memory_pointer; + void* memory_pointer; base::Time timestamp; private: @@ -99,8 +98,9 @@ class VideoCapture { // Request video capture to stop capturing for client |handler|. virtual void StopCapture(EventHandler* handler) = 0; - // Feed buffer to video capture when done with it. - virtual void FeedBuffer(scoped_refptr<VideoFrameBuffer> buffer) = 0; + // TODO(wjia): Add FeedBuffer when buffer sharing is needed between video + // capture and downstream module. + // virtual void FeedBuffer(scoped_refptr<VideoFrameBuffer> buffer) = 0; virtual bool CaptureStarted() = 0; virtual int CaptureWidth() = 0; |