AVFoundation video capture: blacklisting micro fix

media/video/capture/mac/video_capture_device_factory_mac.mm

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/video/capture/mac/video_capture_device_factory_mac.h"
 
 #import <IOKit/audio/IOAudioTypes.h>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 100 matching lines @@
           (transport_type == kIOAudioDeviceTransportTypeBuiltIn ||
               transport_type == kIOAudioDeviceTransportTypeUSB)
           ? VideoCaptureDevice::Name::USB_OR_BUILT_IN
           : VideoCaptureDevice::Name::OTHER_TRANSPORT;
       VideoCaptureDevice::Name name(
           [[[capture_devices valueForKey:key] deviceName] UTF8String],
           [key UTF8String], VideoCaptureDevice::Name::AVFOUNDATION,
           device_transport_type);
       device_names->push_back(name);
       for (size_t i = 0; i < arraysize(kBlacklistedCameras); ++i) {
-        is_any_device_blacklisted = EndsWith(name.id(),
+        is_any_device_blacklisted |= EndsWith(name.id(),

[tommi (sloooow) - chröme, 2014/07/17 10:46:57]

The loop breaks as soon as is_any_device_blacklisted is set to true, so this
doesn't make any difference.

[mcasas, 2014/07/17 11:25:13]

This flag accumulates over the devices walked in the loop at line 107.

             kBlacklistedCameras[i].unique_id_signature, false);
         if (is_any_device_blacklisted)
           break;
       }
     }
     // If there is any device blacklisted in the system, walk the QTKit device
     // list and add those devices with a blacklisted name to the |device_names|.
     // AVFoundation and QTKit device lists partially overlap, so add a "QTKit"
     // prefix to the latter ones to distinguish them from the AVFoundation ones.
     if (is_any_device_blacklisted) {
@@ skipping 41 matching lines @@
   if (device.capture_api_type() == VideoCaptureDevice::Name::AVFOUNDATION) {
     DVLOG(1) << "Enumerating video capture capabilities, AVFoundation";
     [VideoCaptureDeviceAVFoundation getDevice:device
                              supportedFormats:supported_formats];
   } else {
     NOTIMPLEMENTED();
   }
 }
 
 }  // namespace media