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

Unified Diff: media/capture/video/mac/video_capture_device_avfoundation_mac.mm

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
Index: media/capture/video/mac/video_capture_device_avfoundation_mac.mm
diff --git a/media/capture/video/mac/video_capture_device_avfoundation_mac.mm b/media/capture/video/mac/video_capture_device_avfoundation_mac.mm
index eef4feaf62ed0dad5a68ca39c0e8a24115c14714..72685e864d0e138eebd0b473f26c5d626fa6ed13 100644
--- a/media/capture/video/mac/video_capture_device_avfoundation_mac.mm
+++ b/media/capture/video/mac/video_capture_device_avfoundation_mac.mm
@@ -165,12 +165,12 @@ void ExtractBaseAddressAndLength(
return deviceNames;
}
-+ (void)getDevice:(const media::VideoCaptureDevice::Name&)name
- supportedFormats:(media::VideoCaptureFormats*)formats {
++ (void)getDevice:(const media::VideoCaptureDeviceDescriptor&)descriptor
+ supportedFormats:(media::VideoCaptureFormats*)formats {
NSArray* devices = [AVCaptureDeviceGlue devices];
CrAVCaptureDevice* device = nil;
for (device in devices) {
- if ([[device uniqueID] UTF8String] == name.id())
+ if ([[device uniqueID] UTF8String] == descriptor.device_id)
break;
}
if (device == nil)
@@ -192,7 +192,7 @@ void ExtractBaseAddressAndLength(
gfx::Size(dimensions.width, dimensions.height),
frameRate.maxFrameRate, pixelFormat);
formats->push_back(format);
- DVLOG(2) << name.name() << " "
+ DVLOG(2) << descriptor.display_name << " "
<< media::VideoCaptureFormat::ToString(format);
}
}

Powered by Google App Engine
This is Rietveld 408576698