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

media/video/capture/video_capture_device.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.
 //
 // VideoCaptureDevice is the abstract base class for realizing video capture
 // device support in Chromium. It provides the interface for OS dependent
 // implementations.
 // The class is created and functions are invoked on a thread owned by
 // VideoCaptureManager. Capturing is done on other threads, depending on the OS
 // specific implementation.
@@ skipping 20 matching lines @@
   // Represents a capture device name and ID.
   // You should not create an instance of this class directly by e.g. setting
   // various properties directly.  Instead use
   // VideoCaptureDevice::GetDeviceNames to do this for you and if you need to
   // cache your own copy of a name, you can do so via the copy constructor.
   // The reason for this is that a device name might contain platform specific
   // settings that are relevant only to the platform specific implementation of
   // VideoCaptureDevice::Create.
   class MEDIA_EXPORT Name {
    public:
-    Name() {}
-    Name(const std::string& name, const std::string& id)
-        : device_name_(name), unique_id_(id) {}
+    Name();
+    Name(const std::string& name, const std::string& id);
 
 #if defined(OS_WIN)
     // Windows targets Capture Api type: it can only be set on construction.
     enum CaptureApiType {
       MEDIA_FOUNDATION,
       DIRECT_SHOW,
       API_TYPE_UNKNOWN
     };
 #endif
 #if defined(OS_MACOSX)
     // Mac targets Capture Api type: it can only be set on construction.
     enum CaptureApiType {
       AVFOUNDATION,
       QTKIT,
       API_TYPE_UNKNOWN
     };
+    // For AVFoundation Api, identify devices that are built-in or USB.
+    enum TransportType {
+      USB_OR_BUILT_IN,
+      OTHER_TRANSPORT
+    };
 #endif
 #if defined(OS_WIN) || defined(OS_MACOSX)
     Name(const std::string& name,
          const std::string& id,
-         const CaptureApiType api_type)
-        : device_name_(name), unique_id_(id), capture_api_class_(api_type) {}
+         const CaptureApiType api_type);
 #endif
-    ~Name() {}
+#if defined(OS_MACOSX)
+    Name(const std::string& name,
+         const std::string& id,
+         const CaptureApiType api_type,
+         const TransportType transport_type);
+#endif
+    ~Name();
 
     // Friendly name of a device
     const std::string& name() const { return device_name_; }
 
     // Unique name of a device. Even if there are multiple devices with the same
     // friendly name connected to the computer this will be unique.
     const std::string& id() const { return unique_id_; }
 
     // The unique hardware model identifier of the capture device. Returns
     // "[vid]:[pid]" when a USB device is detected, otherwise "".
@@ skipping 10 matching lines @@
       return other.id() == unique_id_;
     }
     bool operator<(const Name& other) const {
       return unique_id_ < other.id();
     }
 
 #if defined(OS_WIN) || defined(OS_MACOSX)
     CaptureApiType capture_api_type() const {
       return capture_api_class_.capture_api_type();
     }
+#endif
+#if defined(OS_MACOSX)
+    TransportType transport_type() const {
+      return transport_class_.transport_type();
+    }
 #endif  // if defined(OS_WIN)
 
    private:
     std::string device_name_;
     std::string unique_id_;
 #if defined(OS_WIN) || defined(OS_MACOSX)
     // This class wraps the CaptureApiType to give it a by default value if not
     // initialized.
     class CaptureApiClass {
      public:
       CaptureApiClass(): capture_api_type_(API_TYPE_UNKNOWN) {}
       CaptureApiClass(const CaptureApiType api_type)
           : capture_api_type_(api_type) {}
       CaptureApiType capture_api_type() const {
         DCHECK_NE(capture_api_type_, API_TYPE_UNKNOWN);
         return capture_api_type_;
       }
      private:
       CaptureApiType capture_api_type_;
     };
 
     CaptureApiClass capture_api_class_;
 #endif
+#if defined(OS_MACOSX)
+    // This class wraps the TransportType to give it a by default value if not
+    // initialized.
+    class TransportClass {

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

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]

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.

+     public:
+      TransportClass(): transport_type_(OTHER_TRANSPORT) {}
+      TransportClass(const TransportType transport_type)
+          : transport_type_(transport_type) {}
+      TransportType transport_type() const {
+        return transport_type_;
+      }
+     private:
+      TransportType transport_type_;
+    };
+
+    TransportClass transport_class_;
+#endif
     // Allow generated copy constructor and assignment.
   };
 
   // Manages a list of Name entries.
   typedef std::list<Name> Names;
 
   class MEDIA_EXPORT Client {
    public:
     // Memory buffer returned by Client::ReserveOutputBuffer().
     class Buffer : public base::RefCountedThreadSafe<Buffer> {
@@ skipping 102 matching lines @@
   int GetPowerLineFrequencyForLocation() const;
 
  protected:
   static const int kPowerLine50Hz = 50;
   static const int kPowerLine60Hz = 60;
 };
 
 }  // namespace media
 
 #endif  // MEDIA_VIDEO_CAPTURE_VIDEO_CAPTURE_DEVICE_H_