| Index: media/video/capture/mac/video_capture_device_mac.mm
|
| diff --git a/media/video/capture/mac/video_capture_device_mac.mm b/media/video/capture/mac/video_capture_device_mac.mm
|
| index 04ded067f6455acce7733a69dc474be97eb8cefc..15c57412dc000787d441d8a69a37c3e0c41503a8 100644
|
| --- a/media/video/capture/mac/video_capture_device_mac.mm
|
| +++ b/media/video/capture/mac/video_capture_device_mac.mm
|
| @@ -83,7 +83,7 @@ void VideoCaptureDevice::GetDeviceNames(Names* device_names) {
|
|
|
| // static
|
| void VideoCaptureDevice::GetDeviceSupportedFormats(const Name& device,
|
| - VideoCaptureCapabilities* formats) {
|
| + VideoCaptureFormats* formats) {
|
| NOTIMPLEMENTED();
|
| }
|
|
|
| @@ -203,10 +203,17 @@ bool VideoCaptureDeviceMac::Init() {
|
| DCHECK_EQ(loop_proxy_, base::MessageLoopProxy::current());
|
| DCHECK_EQ(state_, kNotInitialized);
|
|
|
| + // TODO(mcasas): The following check might not be necessary; if the device has
|
| + // disappeared after enumeration and before coming here, opening would just
|
| + // fail but not necessarily produce a crash.
|
| Names device_names;
|
| GetDeviceNames(&device_names);
|
| - Name* found = device_names.FindById(device_name_.id());
|
| - if (!found)
|
| + Names::iterator it = device_names.begin();
|
| + for (; it != device_names.end(); ++it) {
|
| + if (it->id() == device_name_.id())
|
| + break;
|
| + }
|
| + if (it == device_names.end())
|
| return false;
|
|
|
| if (AVFoundationGlue::IsAVFoundationSupported()) {
|
|
|