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

media/video/capture/mac/video_capture_device_mac.h

 // Copyright (c) 2012 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.
 
 // MacOSX implementation of generic VideoCaptureDevice, using either QTKit or
 // AVFoundation as native capture API. QTKit is available in all OSX versions,
 // although namely deprecated in 10.9, and AVFoundation is available in versions
 // 10.7 (Lion) and later.
 
 #ifndef MEDIA_VIDEO_CAPTURE_MAC_VIDEO_CAPTURE_DEVICE_MAC_H_
 #define MEDIA_VIDEO_CAPTURE_MAC_VIDEO_CAPTURE_DEVICE_MAC_H_
 
+#import <Foundation/Foundation.h>

[Robert Sesek, 2014/07/01 14:16:07]

nit: blank line after

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

Done.

 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "media/video/capture/video_capture_device.h"
 #include "media/video/capture/video_capture_types.h"
 
 @protocol PlatformVideoCapturingMac;
 
 namespace base {
 class SingleThreadTaskRunner;
 }
 
+MEDIA_EXPORT
+@interface DeviceNameAndTransportType : NSObject {

[Robert Sesek, 2014/07/01 14:16:07]

Class needs a comment about its purpose.

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

Done.

+  enum {
+    // Unknown transport type, addition to the kIOAudioDeviceTransportType*
+    // family for QTKit devices where this attribute isn't published.
+    kIOAudioDeviceTransportTypeUnknown = 'unkn'
+  };

[Robert Sesek, 2014/07/01 14:16:07]

nit: blank line after, and I"d maybe move this enum out of @interface – that's
pretty atypical.

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

Done.

+ @private
+  NSString* deviceName_;

[Robert Sesek, 2014/07/01 14:16:07]

This should be strongly referenced, otherwise who owns the memory?

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

Done.

+  // The transport type of the device (USB, PCI, etc), values are defined in
+  // <IOKit/audio/IOAudioTypes.h> as kIOAudioDeviceTransportType*.
+  int32_t transportType_;
+}
+
+- (id)initWithName:(NSString*)name transportType:(int32_t)transportType;
+
+- (NSString*)deviceName;
+- (int32_t)transportType;
+@end
+
 namespace media {
 
 // Called by VideoCaptureManager to open, close and start, stop Mac video
 // capture devices.
 class VideoCaptureDeviceMac : public VideoCaptureDevice {
  public:
   explicit VideoCaptureDeviceMac(const Name& device_name);
   virtual ~VideoCaptureDeviceMac();
 
   // VideoCaptureDevice implementation.
@@ skipping 47 matching lines @@
   // VideoCaptureDeviceMac is destroyed.
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<VideoCaptureDeviceMac> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(VideoCaptureDeviceMac);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_VIDEO_CAPTURE_MAC_VIDEO_CAPTURE_DEVICE_MAC_H_