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

Unified Diff: media/video/capture/win/video_capture_device_mf_win.cc

Issue 17846002: Refactor the VideoCaptureDevice::Name struct. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments Created 7 years, 6 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/win/video_capture_device_mf_win.cc
diff --git a/media/video/capture/win/video_capture_device_mf_win.cc b/media/video/capture/win/video_capture_device_mf_win.cc
index 113d77767631d88843578d48f3885d383892affe..7776574a34e66dcaa73f5dfe16f723b82e9956eb 100644
--- a/media/video/capture/win/video_capture_device_mf_win.cc
+++ b/media/video/capture/win/video_capture_device_mf_win.cc
@@ -268,9 +268,7 @@ void VideoCaptureDeviceMFWin::GetDeviceNames(Names* device_names) {
MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_SYMBOLIC_LINK, &id,
&id_size))) {
std::wstring name_w(name, name_size), id_w(id, id_size);
- Name device;
- device.device_name = base::SysWideToUTF8(name_w);
- device.unique_id = base::SysWideToUTF8(id_w);
+ Name device(base::SysWideToUTF8(name_w), base::SysWideToUTF8(id_w));
device_names->push_back(device);
} else {
DLOG(WARNING) << "GetAllocatedString failed: " << std::hex << hr;
@@ -293,7 +291,7 @@ bool VideoCaptureDeviceMFWin::Init() {
DCHECK(!reader_);
ScopedComPtr<IMFMediaSource> source;
- if (!CreateVideoCaptureDevice(name_.unique_id.c_str(), source.Receive()))
+ if (!CreateVideoCaptureDevice(name_.id().c_str(), source.Receive()))
return false;
ScopedComPtr<IMFAttributes> attributes;
« no previous file with comments | « media/video/capture/video_capture_device_unittest.cc ('k') | media/video/capture/win/video_capture_device_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698