summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorwjia@chromium.org <wjia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-14 20:10:42 +0000
committerwjia@chromium.org <wjia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-14 20:10:42 +0000
commit8c23b530b65f330da6d1542307b05d5869346872 (patch)
tree8b8b6d83063db78c6ecaddca07b8c8345c256720 /media
parent42e286ecb2f3960d832f8ca5e2b7f073d5274a62 (diff)
downloadchromium_src-8c23b530b65f330da6d1542307b05d5869346872.zip
chromium_src-8c23b530b65f330da6d1542307b05d5869346872.tar.gz
chromium_src-8c23b530b65f330da6d1542307b05d5869346872.tar.bz2
add CaptureVideoDecoder for local preview and VideoCaptureModuleImpl for rtc encoding channel.
BUG=none TEST=try bots Review URL: http://codereview.chromium.org/7204008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92590 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/video/capture/video_capture.h8
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;