diff options
| author | wjia@google.com <wjia@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-24 23:02:03 +0000 |
|---|---|---|
| committer | wjia@google.com <wjia@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-24 23:02:03 +0000 |
| commit | c980f9d21f7342c895fc4689df1e8acdd53c09d1 (patch) | |
| tree | 53b5e2981c55b521c43e796030b8ba7da8cf6c33 /media | |
| parent | b223d583d961fe5db4c0230dc9c7de711428930c (diff) | |
| download | chromium_src-c980f9d21f7342c895fc4689df1e8acdd53c09d1.zip chromium_src-c980f9d21f7342c895fc4689df1e8acdd53c09d1.tar.gz chromium_src-c980f9d21f7342c895fc4689df1e8acdd53c09d1.tar.bz2 | |
VideoCaptureManager opens/closes, starts/stops and enumerates video capture devices. VideoCaptureManager Open/Close/EnumerateDevices will be used by MediaStreamManager (will be added later) to implement parts of WhatWG peer connection API. VideoCaptureHost (will also be added later) will call Start/Stop to controll the media flow.
A unit test is provided and added to chrome/chrome_tests.gypi.
content/browser/media_stream/media_stream_provider.h will later be inherited by an audio capture manager as well.
patch by mflodman@google.com
BUG=none
TEST=try bots
Review URL: http://codereview.chromium.org/6946001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86511 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/video/capture/fake_video_capture_device.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/video/capture/fake_video_capture_device.h b/media/video/capture/fake_video_capture_device.h index 089efb0..582e55f 100644 --- a/media/video/capture/fake_video_capture_device.h +++ b/media/video/capture/fake_video_capture_device.h @@ -50,7 +50,7 @@ class FakeVideoCaptureDevice : public VideoCaptureDevice { VideoCaptureDevice::EventHandler* observer_; InternalState state_; base::Thread capture_thread_; - scoped_ptr<uint8> fake_frame_; + scoped_array<uint8> fake_frame_; DISALLOW_IMPLICIT_CONSTRUCTORS(FakeVideoCaptureDevice); }; |