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

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

Issue 616833004: chrome://media-internals: update MediaInternals when devices capabilities are enumerated. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: FakeVCDFactory needs to specify capture API for Win. Linux/CrOs MediaInternalsVideoCaptureDeviceTes… Created 6 years, 2 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
« no previous file with comments | « media/media.gyp ('k') | media/video/capture/video_capture_device_info.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/video/capture/fake_video_capture_device_factory.cc
diff --git a/media/video/capture/fake_video_capture_device_factory.cc b/media/video/capture/fake_video_capture_device_factory.cc
index 31ad67458e5186562afea2ce262c6db90b0a029e..c8f4706307a0ac45c078bf3e96ea32748d812302 100644
--- a/media/video/capture/fake_video_capture_device_factory.cc
+++ b/media/video/capture/fake_video_capture_device_factory.cc
@@ -29,14 +29,14 @@ void FakeVideoCaptureDeviceFactory::GetDeviceNames(
DCHECK(thread_checker_.CalledOnValidThread());
DCHECK(device_names->empty());
for (int n = 0; n < number_of_devices_; ++n) {
-#if !defined(OS_MACOSX)
VideoCaptureDevice::Name name(base::StringPrintf("fake_device_%d", n),
- base::StringPrintf("/dev/video%d", n));
-#else
- VideoCaptureDevice::Name name(base::StringPrintf("fake_device_%d", n),
- base::StringPrintf("/dev/video%d", n),
- VideoCaptureDevice::Name::AVFOUNDATION);
+ base::StringPrintf("/dev/video%d", n)
+#if defined(OS_MACOSX)
+ , VideoCaptureDevice::Name::AVFOUNDATION
+#elif defined(OS_WIN)
+ , VideoCaptureDevice::Name::DIRECT_SHOW
#endif
+ );
device_names->push_back(name);
}
}
« no previous file with comments | « media/media.gyp ('k') | media/video/capture/video_capture_device_info.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698