Change class VideoCaptureDevice::Name to struct VideoCaptureDeviceDescriptor

media/capture/video/video_capture_device_unittest.cc

 // 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.
 
 #include "media/capture/video/video_capture_device.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
@@ skipping 150 matching lines @@
                void(const base::Callback<void(mojom::BlobPtr)>&));
 
  private:
   friend class base::RefCounted<MockImageCaptureClient>;
   virtual ~MockImageCaptureClient() {}
 };
 
 class DeviceEnumerationListener
     : public base::RefCounted<DeviceEnumerationListener> {
  public:
-  MOCK_METHOD1(OnEnumeratedDevicesCallbackPtr,
-               void(VideoCaptureDevice::Names* names));
+  MOCK_METHOD1(OnEnumerateDeviceDescriptorsCallbackPtr,
+               void(VideoCaptureDeviceDescriptors* device_descriptors));
   // GMock doesn't support move-only arguments, so we use this forward method.
-  void OnEnumeratedDevicesCallback(
-      std::unique_ptr<VideoCaptureDevice::Names> names) {
-    OnEnumeratedDevicesCallbackPtr(names.release());
+  void OnEnumerateDeviceDescriptorsCallback(
+      std::unique_ptr<VideoCaptureDeviceDescriptors> device_descriptors) {
+    OnEnumerateDeviceDescriptorsCallbackPtr(device_descriptors.release());
   }
 
  private:
   friend class base::RefCounted<DeviceEnumerationListener>;
   virtual ~DeviceEnumerationListener() {}
 };
 
 }  // namespace
 
 class VideoCaptureDeviceTest : public testing::TestWithParam<gfx::Size> {
@@ skipping 32 matching lines @@
   void OnFrameCaptured(const VideoCaptureFormat& format) {
     last_format_ = format;
     run_loop_->QuitClosure().Run();
   }
 
   void WaitForCapturedFrame() {
     run_loop_.reset(new base::RunLoop());
     run_loop_->Run();
   }
 
-  std::unique_ptr<VideoCaptureDevice::Names> EnumerateDevices() {
-    VideoCaptureDevice::Names* names;
+  std::unique_ptr<VideoCaptureDeviceDescriptors> EnumerateDeviceDescriptors() {
+    VideoCaptureDeviceDescriptors* device_descriptors;
     EXPECT_CALL(*device_enumeration_listener_.get(),
-                OnEnumeratedDevicesCallbackPtr(_)).WillOnce(SaveArg<0>(&names));
+                OnEnumerateDeviceDescriptorsCallbackPtr(_))
+        .WillOnce(SaveArg<0>(&device_descriptors));
 
-    video_capture_device_factory_->EnumerateDeviceNames(
-        base::Bind(&DeviceEnumerationListener::OnEnumeratedDevicesCallback,
-                   device_enumeration_listener_));
+    video_capture_device_factory_->EnumerateDeviceDescriptors(base::Bind(
+        &DeviceEnumerationListener::OnEnumerateDeviceDescriptorsCallback,
+        device_enumeration_listener_));
     base::RunLoop().RunUntilIdle();
-    return std::unique_ptr<VideoCaptureDevice::Names>(names);
+    return std::unique_ptr<VideoCaptureDeviceDescriptors>(device_descriptors);
   }
 
   const VideoCaptureFormat& last_format() const { return last_format_; }
 
-  std::unique_ptr<VideoCaptureDevice::Name>
-  GetFirstDeviceNameSupportingPixelFormat(
+  std::unique_ptr<VideoCaptureDeviceDescriptor>
+  GetFirstDeviceDescriptorSupportingPixelFormat(
       const VideoPixelFormat& pixel_format) {
-    names_ = EnumerateDevices();
-    if (names_->empty()) {
+    device_descriptors_ = EnumerateDeviceDescriptors();
+    if (device_descriptors_->empty()) {
       DVLOG(1) << "No camera available.";
-      return std::unique_ptr<VideoCaptureDevice::Name>();
+      return std::unique_ptr<VideoCaptureDeviceDescriptor>();
     }
-    for (const auto& names_iterator : *names_) {
-      VideoCaptureFormats supported_formats;
-      video_capture_device_factory_->GetDeviceSupportedFormats(
-          names_iterator, &supported_formats);
-      for (const auto& formats_iterator : supported_formats) {
+    for (const auto& descriptors_iterator : *device_descriptors_) {
+      VideoCaptureDeviceInfo device_info;
+      video_capture_device_factory_->GetDeviceInfo(descriptors_iterator,
+                                                   &device_info);
+      for (const auto& formats_iterator : device_info.supported_formats) {
         if (formats_iterator.pixel_format == pixel_format) {
-          return std::unique_ptr<VideoCaptureDevice::Name>(
-              new VideoCaptureDevice::Name(names_iterator));
+          return std::unique_ptr<VideoCaptureDeviceDescriptor>(
+              new VideoCaptureDeviceDescriptor(descriptors_iterator));
         }
       }
     }
     DVLOG_IF(1, pixel_format != PIXEL_FORMAT_MAX)
         << "No camera can capture the"
         << " format: " << VideoPixelFormatToString(pixel_format);
-    return std::unique_ptr<VideoCaptureDevice::Name>();
+    return std::unique_ptr<VideoCaptureDeviceDescriptor>();
   }
 
-  bool IsCaptureSizeSupported(const VideoCaptureDevice::Name& device,
+  bool IsCaptureSizeSupported(const VideoCaptureDeviceDescriptor& device,
                               const gfx::Size& size) {
-    VideoCaptureFormats supported_formats;
-    video_capture_device_factory_->GetDeviceSupportedFormats(
-        device, &supported_formats);
+    VideoCaptureDeviceInfo device_info;
+    video_capture_device_factory_->GetDeviceInfo(device, &device_info);
     const auto it = std::find_if(
-        supported_formats.begin(), supported_formats.end(),
+        device_info.supported_formats.begin(),
+        device_info.supported_formats.end(),
         [&size](VideoCaptureFormat const& f) { return f.frame_size == size; });
-    if (it == supported_formats.end()) {
+    if (it == device_info.supported_formats.end()) {
       DVLOG(1) << "Size " << size.ToString() << " is not supported.";
       return false;
     }
     return true;
   }
 
 #if defined(OS_WIN)
   base::win::ScopedCOMInitializer initialize_com_;
 #endif
-  std::unique_ptr<VideoCaptureDevice::Names> names_;
+  std::unique_ptr<VideoCaptureDeviceDescriptors> device_descriptors_;
   const std::unique_ptr<base::MessageLoop> loop_;
   std::unique_ptr<base::RunLoop> run_loop_;
   std::unique_ptr<MockVideoCaptureClient> video_capture_client_;
   const scoped_refptr<DeviceEnumerationListener> device_enumeration_listener_;
   const scoped_refptr<MockImageCaptureClient> image_capture_client_;
   VideoCaptureFormat last_format_;
   const std::unique_ptr<VideoCaptureDeviceFactory>
       video_capture_device_factory_;
 };
 
 // Cause hangs on Windows Debug. http://crbug.com/417824
 #if defined(OS_WIN) && !defined(NDEBUG)
 #define MAYBE_OpenInvalidDevice DISABLED_OpenInvalidDevice
 #else
 #define MAYBE_OpenInvalidDevice OpenInvalidDevice
 #endif
 
 TEST_F(VideoCaptureDeviceTest, MAYBE_OpenInvalidDevice) {
+  VideoCaptureDeviceDescriptor invalid_descriptor;
+  invalid_descriptor.device_id = "jibberish";
+  invalid_descriptor.friendly_name = "jibberish";
 #if defined(OS_WIN)
-  VideoCaptureDevice::Name::CaptureApiType api_type =
+  invalid_descriptor.capture_api =
       VideoCaptureDeviceFactoryWin::PlatformSupportsMediaFoundation()
-          ? VideoCaptureDevice::Name::MEDIA_FOUNDATION
-          : VideoCaptureDevice::Name::DIRECT_SHOW;
-  VideoCaptureDevice::Name device_name("jibberish", "jibberish", api_type);
+          ? VideoCaptureApiType::WINDOWS_MEDIA_FOUNDATION
+          : VideoCaptureApiType::WINDOWS_DIRECT_SHOW;
 #elif defined(OS_MACOSX)
-  VideoCaptureDevice::Name device_name("jibberish", "jibberish",
-                                       VideoCaptureDevice::Name::AVFOUNDATION);
-#else
-  VideoCaptureDevice::Name device_name("jibberish", "jibberish");
+  invalid_descriptor.capture_api = VideoCaptureApiType::MACOSX_AVFOUNDATION;
 #endif
   std::unique_ptr<VideoCaptureDevice> device =
-      video_capture_device_factory_->Create(device_name);
+      video_capture_device_factory_->Create(invalid_descriptor);
 
 #if !defined(OS_MACOSX)
   EXPECT_TRUE(device == NULL);
 #else
   // The presence of the actual device is only checked on AllocateAndStart()
   // and not on creation.
   EXPECT_CALL(*video_capture_client_, OnError(_, _)).Times(1);
 
   VideoCaptureParams capture_params;
   capture_params.requested_format.frame_size.SetSize(640, 480);
   capture_params.requested_format.frame_rate = 30;
   capture_params.requested_format.pixel_format = PIXEL_FORMAT_I420;
   device->AllocateAndStart(capture_params, std::move(video_capture_client_));
   device->StopAndDeAllocate();
 #endif
 }
 
 TEST_P(VideoCaptureDeviceTest, CaptureWithSize) {
-  names_ = EnumerateDevices();
-  if (names_->empty()) {
+  device_descriptors_ = EnumerateDeviceDescriptors();
+  if (device_descriptors_->empty()) {
     VLOG(1) << "No camera available. Exiting test.";
     return;
   }
 
   const gfx::Size& size = GetParam();
-  if (!IsCaptureSizeSupported(names_->front(), size))
+  if (!IsCaptureSizeSupported(device_descriptors_->front(), size))
     return;
   const int width = size.width();
   const int height = size.height();
 
   std::unique_ptr<VideoCaptureDevice> device(
-      video_capture_device_factory_->Create(names_->front()));
+      video_capture_device_factory_->Create(device_descriptors_->front()));
   ASSERT_TRUE(device);
-  DVLOG(1) << names_->front().id();
+  DVLOG(1) << device_descriptors_->front().device_id;
 
   EXPECT_CALL(*video_capture_client_, OnError(_, _)).Times(0);
 
   VideoCaptureParams capture_params;
   capture_params.requested_format.frame_size.SetSize(width, height);
   capture_params.requested_format.frame_rate = 30.0f;
   capture_params.requested_format.pixel_format = PIXEL_FORMAT_I420;
   device->AllocateAndStart(capture_params, std::move(video_capture_client_));
   // Get captured video frames.
   WaitForCapturedFrame();
   EXPECT_EQ(last_format().frame_size.width(), width);
   EXPECT_EQ(last_format().frame_size.height(), height);
   if (last_format().pixel_format != PIXEL_FORMAT_MJPEG)
     EXPECT_EQ(size.GetArea(), last_format().frame_size.GetArea());
   device->StopAndDeAllocate();
 }
 
 #if !defined(OS_ANDROID)
 const gfx::Size kCaptureSizes[] = {gfx::Size(640, 480), gfx::Size(1280, 720)};
 
 INSTANTIATE_TEST_CASE_P(VideoCaptureDeviceTests,
                         VideoCaptureDeviceTest,
                         testing::ValuesIn(kCaptureSizes));
 #endif
 
 TEST_F(VideoCaptureDeviceTest, MAYBE_AllocateBadSize) {
-  names_ = EnumerateDevices();
-  if (names_->empty()) {
+  device_descriptors_ = EnumerateDeviceDescriptors();
+  if (device_descriptors_->empty()) {
     VLOG(1) << "No camera available. Exiting test.";
     return;
   }
   std::unique_ptr<VideoCaptureDevice> device(
-      video_capture_device_factory_->Create(names_->front()));
+      video_capture_device_factory_->Create(device_descriptors_->front()));
   ASSERT_TRUE(device);
 
   EXPECT_CALL(*video_capture_client_, OnError(_, _)).Times(0);
 
   const gfx::Size input_size(640, 480);
   VideoCaptureParams capture_params;
   capture_params.requested_format.frame_size.SetSize(637, 472);
   capture_params.requested_format.frame_rate = 35;
   capture_params.requested_format.pixel_format = PIXEL_FORMAT_I420;
   device->AllocateAndStart(capture_params, std::move(video_capture_client_));
   WaitForCapturedFrame();
   device->StopAndDeAllocate();
   EXPECT_EQ(last_format().frame_size.width(), input_size.width());
   EXPECT_EQ(last_format().frame_size.height(), input_size.height());
   if (last_format().pixel_format != PIXEL_FORMAT_MJPEG)
     EXPECT_EQ(input_size.GetArea(), last_format().frame_size.GetArea());
 }
 
 // Cause hangs on Windows, Linux. Fails Android. http://crbug.com/417824
 TEST_F(VideoCaptureDeviceTest, DISABLED_ReAllocateCamera) {
-  names_ = EnumerateDevices();
-  if (names_->empty()) {
+  device_descriptors_ = EnumerateDeviceDescriptors();
+  if (device_descriptors_->empty()) {
     VLOG(1) << "No camera available. Exiting test.";
     return;
   }
 
   // First, do a number of very fast device start/stops.
   for (int i = 0; i <= 5; i++) {
     ResetWithNewClient();
     std::unique_ptr<VideoCaptureDevice> device(
-        video_capture_device_factory_->Create(names_->front()));
+        video_capture_device_factory_->Create(device_descriptors_->front()));
     gfx::Size resolution;
     if (i % 2) {
       resolution = gfx::Size(640, 480);
     } else {
       resolution = gfx::Size(1280, 1024);
     }
     VideoCaptureParams capture_params;
     capture_params.requested_format.frame_size = resolution;
     capture_params.requested_format.frame_rate = 30;
     capture_params.requested_format.pixel_format = PIXEL_FORMAT_I420;
     device->AllocateAndStart(capture_params, std::move(video_capture_client_));
     device->StopAndDeAllocate();
   }
 
   // Finally, do a device start and wait for it to finish.
   VideoCaptureParams capture_params;
   capture_params.requested_format.frame_size.SetSize(320, 240);
   capture_params.requested_format.frame_rate = 30;
   capture_params.requested_format.pixel_format = PIXEL_FORMAT_I420;
 
   ResetWithNewClient();
   std::unique_ptr<VideoCaptureDevice> device(
-      video_capture_device_factory_->Create(names_->front()));
+      video_capture_device_factory_->Create(device_descriptors_->front()));
 
   device->AllocateAndStart(capture_params, std::move(video_capture_client_));
   WaitForCapturedFrame();
   device->StopAndDeAllocate();
   device.reset();
   EXPECT_EQ(last_format().frame_size.width(), 320);
   EXPECT_EQ(last_format().frame_size.height(), 240);
 }
 
 TEST_F(VideoCaptureDeviceTest, DeAllocateCameraWhileRunning) {
-  names_ = EnumerateDevices();
-  if (names_->empty()) {
+  device_descriptors_ = EnumerateDeviceDescriptors();
+  if (device_descriptors_->empty()) {
     VLOG(1) << "No camera available. Exiting test.";
     return;
   }
   std::unique_ptr<VideoCaptureDevice> device(
-      video_capture_device_factory_->Create(names_->front()));
+      video_capture_device_factory_->Create(device_descriptors_->front()));
   ASSERT_TRUE(device);
 
   EXPECT_CALL(*video_capture_client_, OnError(_, _)).Times(0);
 
   VideoCaptureParams capture_params;
   capture_params.requested_format.frame_size.SetSize(640, 480);
   capture_params.requested_format.frame_rate = 30;
   capture_params.requested_format.pixel_format = PIXEL_FORMAT_I420;
   device->AllocateAndStart(capture_params, std::move(video_capture_client_));
   // Get captured video frames.
   WaitForCapturedFrame();
   EXPECT_EQ(last_format().frame_size.width(), 640);
   EXPECT_EQ(last_format().frame_size.height(), 480);
   EXPECT_EQ(last_format().frame_rate, 30);
   device->StopAndDeAllocate();
 }
 
 // Start the camera in 720p to capture MJPEG instead of a raw format.
 TEST_F(VideoCaptureDeviceTest, MAYBE_CaptureMjpeg) {
-  std::unique_ptr<VideoCaptureDevice::Name> name =
-      GetFirstDeviceNameSupportingPixelFormat(PIXEL_FORMAT_MJPEG);
-  if (!name) {
+  std::unique_ptr<VideoCaptureDeviceDescriptor> device_descriptor =
+      GetFirstDeviceDescriptorSupportingPixelFormat(PIXEL_FORMAT_MJPEG);
+  if (!device_descriptor) {
     VLOG(1) << "No camera supports MJPEG format. Exiting test.";
     return;
   }
 #if defined(OS_WIN)
   base::win::Version version = base::win::GetVersion();
   VLOG(1) << "Windows version: " << (int)version;
   if (version >= base::win::VERSION_WIN10) {
     VLOG(1) << "Skipped on Win10: http://crbug.com/570604.";
     return;
   }
 #endif
   std::unique_ptr<VideoCaptureDevice> device(
-      video_capture_device_factory_->Create(*name));
+      video_capture_device_factory_->Create(*device_descriptor));
   ASSERT_TRUE(device);
 
   EXPECT_CALL(*video_capture_client_, OnError(_, _)).Times(0);
 
   VideoCaptureParams capture_params;
   capture_params.requested_format.frame_size.SetSize(1280, 720);
   capture_params.requested_format.frame_rate = 30;
   capture_params.requested_format.pixel_format = PIXEL_FORMAT_MJPEG;
   device->AllocateAndStart(capture_params, std::move(video_capture_client_));
   // Get captured video frames.
   WaitForCapturedFrame();
   // Verify we get MJPEG from the device. Not all devices can capture 1280x720
   // @ 30 fps, so we don't care about the exact resolution we get.
   EXPECT_EQ(last_format().pixel_format, PIXEL_FORMAT_MJPEG);
   EXPECT_GE(static_cast<size_t>(1280 * 720),
             last_format().ImageAllocationSize());
   device->StopAndDeAllocate();
 }
 
 TEST_F(VideoCaptureDeviceTest, GetDeviceSupportedFormats) {
   // Use PIXEL_FORMAT_MAX to iterate all device names for testing
   // GetDeviceSupportedFormats().
-  std::unique_ptr<VideoCaptureDevice::Name> name =
-      GetFirstDeviceNameSupportingPixelFormat(PIXEL_FORMAT_MAX);
+  std::unique_ptr<VideoCaptureDeviceDescriptor> device_descriptor =
+      GetFirstDeviceDescriptorSupportingPixelFormat(PIXEL_FORMAT_MAX);
   // Verify no camera returned for PIXEL_FORMAT_MAX. Nothing else to test here
   // since we cannot forecast the hardware capabilities.
-  ASSERT_FALSE(name);
+  ASSERT_FALSE(device_descriptor);
 }
 
 // Start the camera and take a photo.
 TEST_F(VideoCaptureDeviceTest, MAYBE_TakePhoto) {
-  names_ = EnumerateDevices();
-  if (names_->empty()) {
+  device_descriptors_ = EnumerateDeviceDescriptors();
+  if (device_descriptors_->empty()) {
     VLOG(1) << "No camera available. Exiting test.";
     return;
   }
   std::unique_ptr<VideoCaptureDevice> device(
-      video_capture_device_factory_->Create(names_->front()));
+      video_capture_device_factory_->Create(device_descriptors_->front()));
   ASSERT_TRUE(device);
 
   EXPECT_CALL(*video_capture_client_, OnError(_, _)).Times(0);
 
   VideoCaptureParams capture_params;
   capture_params.requested_format.frame_size.SetSize(640, 480);
   capture_params.requested_format.frame_rate = 30;
   capture_params.requested_format.pixel_format = PIXEL_FORMAT_I420;
   device->AllocateAndStart(capture_params, std::move(video_capture_client_));
   WaitForCapturedFrame();
 
   VideoCaptureDevice::TakePhotoCallback scoped_callback(
       base::Bind(&MockImageCaptureClient::DoOnPhotoTaken,
                  image_capture_client_),
       media::BindToCurrentLoop(base::Bind(
           &MockImageCaptureClient::OnTakePhotoFailure, image_capture_client_)));
 
   EXPECT_CALL(*image_capture_client_.get(), OnCorrectPhotoTaken()).Times(1);
   device->TakePhoto(std::move(scoped_callback));
   WaitForCapturedFrame();
 
   device->StopAndDeAllocate();
 }
 
 };  // namespace media