Mac VideoCapture: return empty GetModel() for non-USB non-built-in cameras.

Mac VideoCapture: return empty GetModel() for non-USB non-built-in cameras.

This CL adds support for storage of the camera connection
information in the devices' names enumeration and subsequently
in the VideoCaptureDevice::Name structure.

-[AVCaptureDevice transportType] indicates the connection type 
to the camera: USB, Built-in, PCI, etc. Note that this info is only 
available for AVFoundation API and not for QTKit. 

Chromium style check forces to move complex constructors
and destructors from video_capture_device.h to .cc.

TEST: Verify that the FaceTime Built-in HD (USB) used in 
MBA >=2013 does not show incorrect modelID and vendorID
in the camera name -- those fields should be empty since
they only exist for USB or built-in cameras..

BUG=336651
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=282063

[mcasas, 2014-07-01 12:43:24]

rsesek@ PTAL.

[Robert Sesek, 2014-07-01 14:16:08]

https://codereview.chromium.org/366593003/diff/10009/media/video/capture/mac/...
File media/video/capture/mac/video_capture_device_avfoundation_mac.mm (right):

https://codereview.chromium.org/366593003/diff/10009/media/video/capture/mac/...
media/video/capture/mac/video_capture_device_avfoundation_mac.mm:26:
[deviceNames setObject:[[DeviceNameAndTransportType alloc]
This is leaked. I'd also pull this out into a local.

https://codereview.chromium.org/366593003/diff/10009/media/video/capture/mac/...
File media/video/capture/mac/video_capture_device_mac.h (right):

https://codereview.chromium.org/366593003/diff/10009/media/video/capture/mac/...
media/video/capture/mac/video_capture_device_mac.h:13: #import
<Foundation/Foundation.h>
nit: blank line after

https://codereview.chromium.org/366593003/diff/10009/media/video/capture/mac/...
media/video/capture/mac/video_capture_device_mac.h:29: @interface
DeviceNameAndTransportType : NSObject {
Class needs a comment about its purpose.

https://codereview.chromium.org/366593003/diff/10009/media/video/capture/mac/...
media/video/capture/mac/video_capture_device_mac.h:34: };
nit: blank line after, and I"d maybe move this enum out of @interface – that's
pretty atypical.

https://codereview.chromium.org/366593003/diff/10009/media/video/capture/mac/...
media/video/capture/mac/video_capture_device_mac.h:36: NSString* deviceName_;
This should be strongly referenced, otherwise who owns the memory?

https://codereview.chromium.org/366593003/diff/10009/media/video/capture/mac/...
File media/video/capture/mac/video_capture_device_qtkit_mac.mm (right):

https://codereview.chromium.org/366593003/diff/10009/media/video/capture/mac/...
media/video/capture/mac/video_capture_device_qtkit_mac.mm:34: [deviceNames
setObject:[[DeviceNameAndTransportType alloc]
Same comments as in the other file.

https://codereview.chromium.org/366593003/diff/10009/media/video/capture/vide...
File media/video/capture/video_capture_device.h (right):

https://codereview.chromium.org/366593003/diff/10009/media/video/capture/vide...
media/video/capture/video_capture_device.h:138: class TransportClass {
Could you just use a struct instead? I guess that's now how it's done above,
though… Another option would be to just handle the default enum value in
business logic.

[mcasas, 2014-07-01 16:06:10]

rsesek@ PTAL.

https://codereview.chromium.org/366593003/diff/10009/media/video/capture/mac/...
File media/video/capture/mac/video_capture_device_avfoundation_mac.mm (right):

https://codereview.chromium.org/366593003/diff/10009/media/video/capture/mac/...
media/video/capture/mac/video_capture_device_avfoundation_mac.mm:26:
[deviceNames setObject:[[DeviceNameAndTransportType alloc]
On 2014/07/01 14:16:07, rsesek wrote:
> This is leaked. I'd also pull this out into a local.

Done.

https://codereview.chromium.org/366593003/diff/10009/media/video/capture/mac/...
File media/video/capture/mac/video_capture_device_mac.h (right):

https://codereview.chromium.org/366593003/diff/10009/media/video/capture/mac/...
media/video/capture/mac/video_capture_device_mac.h:13: #import
<Foundation/Foundation.h>
On 2014/07/01 14:16:07, rsesek wrote:
> nit: blank line after

Done.

https://codereview.chromium.org/366593003/diff/10009/media/video/capture/mac/...
media/video/capture/mac/video_capture_device_mac.h:29: @interface
DeviceNameAndTransportType : NSObject {
On 2014/07/01 14:16:07, rsesek wrote:
> Class needs a comment about its purpose.

Done.

https://codereview.chromium.org/366593003/diff/10009/media/video/capture/mac/...
media/video/capture/mac/video_capture_device_mac.h:34: };
On 2014/07/01 14:16:07, rsesek wrote:
> nit: blank line after, and I"d maybe move this enum out of @interface
–&nbsp;that's
> pretty atypical.

Done.

https://codereview.chromium.org/366593003/diff/10009/media/video/capture/mac/...
media/video/capture/mac/video_capture_device_mac.h:36: NSString* deviceName_;
On 2014/07/01 14:16:07, rsesek wrote:
> This should be strongly referenced, otherwise who owns the memory?

Done.

https://codereview.chromium.org/366593003/diff/10009/media/video/capture/mac/...
File media/video/capture/mac/video_capture_device_qtkit_mac.mm (right):

https://codereview.chromium.org/366593003/diff/10009/media/video/capture/mac/...
media/video/capture/mac/video_capture_device_qtkit_mac.mm:34: [deviceNames
setObject:[[DeviceNameAndTransportType alloc]
On 2014/07/01 14:16:07, rsesek wrote:
> Same comments as in the other file.

Done.

https://codereview.chromium.org/366593003/diff/10009/media/video/capture/vide...
File media/video/capture/video_capture_device.h (right):

https://codereview.chromium.org/366593003/diff/10009/media/video/capture/vide...
media/video/capture/video_capture_device.h:138: class TransportClass {
On 2014/07/01 14:16:07, rsesek wrote:
> Could you just use a struct instead? I guess that's now how it's done above,
> though… Another option would be to just handle the default enum value in
> business logic.

I was doubting about this one but your comment decided me to remove
the class for TransportClass and operate directly with TransportType and
in-class member initialization -- so I don't need to touch the reduced
size constructors.

[Robert Sesek, 2014-07-01 16:23:57]

https://codereview.chromium.org/366593003/diff/40001/media/video/capture/mac/...
File media/video/capture/mac/video_capture_device_avfoundation_mac.mm (right):

https://codereview.chromium.org/366593003/diff/40001/media/video/capture/mac/...
media/video/capture/mac/video_capture_device_avfoundation_mac.mm:26:
DeviceNameAndTransportType* name_and_transport_type =
naming: nameAndTransportType, since this is in an ObjC method

https://codereview.chromium.org/366593003/diff/40001/media/video/capture/mac/...
File media/video/capture/mac/video_capture_device_factory_mac.mm (right):

https://codereview.chromium.org/366593003/diff/40001/media/video/capture/mac/...
media/video/capture/mac/video_capture_device_factory_mac.mm:115: transport_type
== kIOAudioDeviceTransportTypeUSB) ?
nit: indent this line 4 more spaces, since the condition is a continuation of
line 114

https://codereview.chromium.org/366593003/diff/40001/media/video/capture/mac/...
File media/video/capture/mac/video_capture_device_qtkit_mac.mm (right):

https://codereview.chromium.org/366593003/diff/40001/media/video/capture/mac/...
media/video/capture/mac/video_capture_device_qtkit_mac.mm:34:
DeviceNameAndTransportType* name_and_transport_type =
nit: naming again

https://codereview.chromium.org/366593003/diff/40001/media/video/capture/vide...
File media/video/capture/video_capture_device.h (right):

https://codereview.chromium.org/366593003/diff/40001/media/video/capture/vide...
media/video/capture/video_capture_device.h:136: TransportType transport_type_ =
OTHER_TRANSPORT;
I think this is only C++11 and I'm not sure it's standard in Chrome. Move this
to an initializer list instead, I think.

[mcasas, 2014-07-02 07:37:35]

rsesek@ PTAL.

https://codereview.chromium.org/366593003/diff/40001/media/video/capture/mac/...
File media/video/capture/mac/video_capture_device_avfoundation_mac.mm (right):

https://codereview.chromium.org/366593003/diff/40001/media/video/capture/mac/...
media/video/capture/mac/video_capture_device_avfoundation_mac.mm:26:
DeviceNameAndTransportType* name_and_transport_type =
On 2014/07/01 16:23:57, rsesek wrote:
> naming: nameAndTransportType, since this is in an ObjC method

Done.

https://codereview.chromium.org/366593003/diff/40001/media/video/capture/mac/...
File media/video/capture/mac/video_capture_device_factory_mac.mm (right):

https://codereview.chromium.org/366593003/diff/40001/media/video/capture/mac/...
media/video/capture/mac/video_capture_device_factory_mac.mm:115: transport_type
== kIOAudioDeviceTransportTypeUSB) ?
On 2014/07/01 16:23:57, rsesek wrote:
> nit: indent this line 4 more spaces, since the condition is a continuation of
> line 114

Done.

https://codereview.chromium.org/366593003/diff/40001/media/video/capture/mac/...
File media/video/capture/mac/video_capture_device_qtkit_mac.mm (right):

https://codereview.chromium.org/366593003/diff/40001/media/video/capture/mac/...
media/video/capture/mac/video_capture_device_qtkit_mac.mm:34:
DeviceNameAndTransportType* name_and_transport_type =
On 2014/07/01 16:23:57, rsesek wrote:
> nit: naming again

Done.

https://codereview.chromium.org/366593003/diff/40001/media/video/capture/vide...
File media/video/capture/video_capture_device.h (right):

https://codereview.chromium.org/366593003/diff/40001/media/video/capture/vide...
media/video/capture/video_capture_device.h:136: TransportType transport_type_ =
OTHER_TRANSPORT;
On 2014/07/01 16:23:57, rsesek wrote:
> I think this is only C++11 and I'm not sure it's standard in Chrome. Move this
> to an initializer list instead, I think.

Done.

[Robert Sesek, 2014-07-02 15:01:48]

LGTM

[mcasas, 2014-07-02 15:15:35]

tommi@ Owners RS/ PTAL.

[tommi (sloooow) - chröme, 2014-07-03 10:28:36]

rs lgtm

https://codereview.chromium.org/366593003/diff/60001/media/video/capture/mac/...
File media/video/capture/mac/video_capture_device_factory_mac.mm (right):

https://codereview.chromium.org/366593003/diff/60001/media/video/capture/mac/...
media/video/capture/mac/video_capture_device_factory_mac.mm:115: transport_type
== kIOAudioDeviceTransportTypeUSB) ?
nit: align the conditions

https://codereview.chromium.org/366593003/diff/60001/media/video/capture/vide...
File media/video/capture/video_capture_device.cc (right):

https://codereview.chromium.org/366593003/diff/60001/media/video/capture/vide...
media/video/capture/video_capture_device.cc:42:
VideoCaptureDevice::Name::Name(const std::string& name,
empty line above this one

[mcasas, 2014-07-03 11:10:15]

The CQ bit was checked by mcasas@chromium.org

[commit-bot: I haz the power, 2014-07-03 11:11:12]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/mcasas@chromium.org/366593003/80001

[commit-bot: I haz the power, 2014-07-03 14:08:05]

FYI, CQ is re-trying this CL (attempt #1).
The failing builders are:
  mac_chromium_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/mac_chromium_rel/buil...)

[commit-bot: I haz the power, 2014-07-03 14:10:00]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-07-03 14:10:01]

Try jobs failed on following builders:
  mac_chromium_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/mac_chromium_rel/buil...)

[mcasas, 2014-07-03 16:08:35]

The CQ bit was checked by mcasas@chromium.org

[mcasas, 2014-07-03 16:08:36]

The CQ bit was unchecked by mcasas@chromium.org

[mcasas, 2014-07-03 16:08:54]

The CQ bit was checked by mcasas@chromium.org

[commit-bot: I haz the power, 2014-07-03 16:09:16]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/mcasas@chromium.org/366593003/80001

[mcasas, 2014-07-03 16:18:36]

Publishing drafts, please ignore.

https://codereview.chromium.org/366593003/diff/60001/media/video/capture/mac/...
File media/video/capture/mac/video_capture_device_factory_mac.mm (right):

https://codereview.chromium.org/366593003/diff/60001/media/video/capture/mac/...
media/video/capture/mac/video_capture_device_factory_mac.mm:115: transport_type
== kIOAudioDeviceTransportTypeUSB) ?
On 2014/07/03 10:28:36, tommi wrote:
> nit: align the conditions

Done.

https://codereview.chromium.org/366593003/diff/60001/media/video/capture/vide...
File media/video/capture/video_capture_device.cc (right):

https://codereview.chromium.org/366593003/diff/60001/media/video/capture/vide...
media/video/capture/video_capture_device.cc:42:
VideoCaptureDevice::Name::Name(const std::string& name,
On 2014/07/03 10:28:36, tommi wrote:
> empty line above this one

Done.

[commit-bot: I haz the power, 2014-07-03 17:48:49]

FYI, CQ is re-trying this CL (attempt #1).
The failing builders are:
  mac_chromium_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/mac_chromium_rel/buil...)

[commit-bot: I haz the power, 2014-07-03 17:50:21]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-07-03 17:50:23]

Try jobs failed on following builders:
  mac_chromium_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/mac_chromium_rel/buil...)

[mcasas, 2014-07-04 07:00:04]

The CQ bit was checked by mcasas@chromium.org

[commit-bot: I haz the power, 2014-07-04 07:00:21]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/mcasas@chromium.org/366593003/100001

[commit-bot: I haz the power, 2014-07-04 08:43:21]

FYI, CQ is re-trying this CL (attempt #1).
The failing builders are:
  ios_dbg_simulator on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/ios_dbg_simulator/bui...)
  mac_chromium_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/mac_chromium_rel/buil...)

[commit-bot: I haz the power, 2014-07-04 10:15:13]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-07-04 10:15:14]

Try jobs failed on following builders:
  mac_chromium_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/mac_chromium_rel/buil...)

[mcasas, 2014-07-04 10:41:39]

The CQ bit was checked by mcasas@chromium.org

[commit-bot: I haz the power, 2014-07-04 10:42:05]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/mcasas@chromium.org/366593003/100001

[commit-bot: I haz the power, 2014-07-04 12:01:11]

FYI, CQ is re-trying this CL (attempt #1).
The failing builders are:
  mac_chromium_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/mac_chromium_rel/buil...)

[commit-bot: I haz the power, 2014-07-04 13:38:06]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-07-04 13:38:07]

Try jobs failed on following builders:
  mac_chromium_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/mac_chromium_rel/buil...)

[mcasas, 2014-07-09 11:58:32]

The CQ bit was checked by mcasas@chromium.org

[commit-bot: I haz the power, 2014-07-09 11:59:50]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/mcasas@chromium.org/366593003/140001

[mcasas, 2014-07-09 13:14:08]

The CQ bit was unchecked by mcasas@chromium.org

[mcasas, 2014-07-09 13:14:58]

The CQ bit was checked by mcasas@chromium.org

[commit-bot: I haz the power, 2014-07-09 13:16:32]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/mcasas@chromium.org/366593003/160001

[commit-bot: I haz the power, 2014-07-09 16:34:16]

Change committed as 282063