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

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

Issue 22876027: Consolidate duplicated frame / capability structures in video_capture_types.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 4 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 665f728b3c66ffb4fbda40f1cc1c6f5479740364..e63453fe13a4ee2bbdc9e0300040b688f2a7aff7 100644
--- a/media/video/capture/fake_video_capture_device.cc
+++ b/media/video/capture/fake_video_capture_device.cc
@@ -78,7 +78,7 @@ void FakeVideoCaptureDevice::Allocate(
}
observer_ = observer;
- capture_format_.color = VideoCaptureCapability::kI420;
+ capture_format_.color = kI420;
capture_format_.expected_capture_delay = 0;
capture_format_.interlaced = false;
if (capture_format.width > 320) { // VGA
@@ -103,7 +103,7 @@ void FakeVideoCaptureDevice::Reallocate() {
DCHECK_EQ(state_, kCapturing);
capture_format_ = capabilities_roster_.at(++capabilities_roster_index_ %
capabilities_roster_.size());
- DCHECK_EQ(capture_format_.color, VideoCaptureCapability::kI420);
+ DCHECK_EQ(capture_format_.color, kI420);
DVLOG(3) << "Reallocating FakeVideoCaptureDevice, new capture resolution ("
<< capture_format_.width << "x" << capture_format_.height << ")";
@@ -225,7 +225,7 @@ void FakeVideoCaptureDevice::PopulateCapabilitiesRoster() {
media::VideoCaptureCapability(320,
240,
30,
- VideoCaptureCapability::kI420,
+ kI420,
0,
false,
VariableResolutionVideoCaptureDevice));
@@ -233,7 +233,7 @@ void FakeVideoCaptureDevice::PopulateCapabilitiesRoster() {
media::VideoCaptureCapability(640,
480,
30,
- VideoCaptureCapability::kI420,
+ kI420,
0,
false,
VariableResolutionVideoCaptureDevice));
@@ -241,7 +241,7 @@ void FakeVideoCaptureDevice::PopulateCapabilitiesRoster() {
media::VideoCaptureCapability(800,
600,
30,
- VideoCaptureCapability::kI420,
+ kI420,
0,
false,
VariableResolutionVideoCaptureDevice));

Powered by Google App Engine
This is Rietveld 408576698