Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(426)

Unified Diff: media/video/capture/fake_video_capture_device.cc

Issue 10035054: Merge VideoCaptureDevice::Capability with media::VideoCaptureCapability (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/video/capture/fake_video_capture_device.cc
diff --git a/media/video/capture/fake_video_capture_device.cc b/media/video/capture/fake_video_capture_device.cc
index acbd83a74ef5ccba3b2f07cfcb8c6d4480747e96..e7eab31fd64077e4cdb12b2d9afc773af2b27de9 100644
--- a/media/video/capture/fake_video_capture_device.cc
+++ b/media/video/capture/fake_video_capture_device.cc
@@ -60,8 +60,10 @@ void FakeVideoCaptureDevice::Allocate(int width,
}
observer_ = observer;
- Capability current_settings;
- current_settings.color = kI420;
+ media::VideoCaptureCapability current_settings;
+ current_settings.color = media::VideoFrame::kI420;
+ current_settings.expected_capture_delay = 0; // Ignored.
+ current_settings.interlaced = false; // Ignore.
if (width > 320) { // VGA
current_settings.width = 640;
current_settings.height = 480;

Powered by Google App Engine
This is Rietveld 408576698