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

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

Issue 2169013002: Change class VideoCaptureDevice::Name to struct VideoCaptureDeviceDescriptor (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix build errors Created 4 years, 5 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/capture/video/win/video_capture_device_win.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/capture/video/win/video_capture_device_win.cc
diff --git a/media/capture/video/win/video_capture_device_win.cc b/media/capture/video/win/video_capture_device_win.cc
index 44894ed1ea6b78ab2b4e7567be80268b08a6bcad..d3c5d539c2b6c5926da1e34f40de0079c77e8da0 100644
--- a/media/capture/video/win/video_capture_device_win.cc
+++ b/media/capture/video/win/video_capture_device_win.cc
@@ -210,8 +210,9 @@ void VideoCaptureDeviceWin::ScopedMediaType::DeleteMediaType(
}
}
-VideoCaptureDeviceWin::VideoCaptureDeviceWin(const Name& device_name)
- : device_name_(device_name), state_(kIdle) {
+VideoCaptureDeviceWin::VideoCaptureDeviceWin(
+ const VideoCaptureDeviceDescriptor& device_descriptor)
+ : device_descriptor_(device_descriptor), state_(kIdle) {
// TODO(mcasas): Check that CoInitializeEx() has been called with the
// appropriate Apartment model, i.e., Single Threaded.
}
@@ -239,7 +240,7 @@ bool VideoCaptureDeviceWin::Init() {
DCHECK(thread_checker_.CalledOnValidThread());
HRESULT hr;
- hr = GetDeviceFilter(device_name_.id(), capture_filter_.Receive());
+ hr = GetDeviceFilter(device_descriptor_.device_id, capture_filter_.Receive());
if (!capture_filter_.get()) {
DLOG(ERROR) << "Failed to create capture filter: "
« no previous file with comments | « media/capture/video/win/video_capture_device_win.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698