Change class VideoCaptureDevice::Name to struct VideoCaptureDeviceDescriptor

media/capture/video/android/video_capture_device_factory_android.cc

 // 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/capture/video/android/video_capture_device_factory_android.h"
 
 #include <utility>
 
 #include "base/android/context_utils.h"
 #include "base/android/jni_string.h"
@@ skipping 17 matching lines @@
 ScopedJavaLocalRef<jobject>
 VideoCaptureDeviceFactoryAndroid::createVideoCaptureAndroid(
     int id,
     jlong nativeVideoCaptureDeviceAndroid) {
   return (Java_VideoCaptureFactory_createVideoCapture(
       AttachCurrentThread(), base::android::GetApplicationContext(), id,
       nativeVideoCaptureDeviceAndroid));
 }
 
 std::unique_ptr<VideoCaptureDevice> VideoCaptureDeviceFactoryAndroid::Create(
-    const VideoCaptureDevice::Name& device_name) {
+    const VideoCaptureDeviceDescriptor& device_descriptor) {
   DCHECK(thread_checker_.CalledOnValidThread());
   int id;
-  if (!base::StringToInt(device_name.id(), &id))
+  if (!base::StringToInt(device_descriptor.device_id, &id))
     return std::unique_ptr<VideoCaptureDevice>();
 
   std::unique_ptr<VideoCaptureDeviceAndroid> video_capture_device(
-      new VideoCaptureDeviceAndroid(device_name));
+      new VideoCaptureDeviceAndroid(device_descriptor));
 
   if (video_capture_device->Init())
     return std::move(video_capture_device);
 
   DLOG(ERROR) << "Error creating Video Capture Device.";
   return std::unique_ptr<VideoCaptureDevice>();
 }
 
-void VideoCaptureDeviceFactoryAndroid::GetDeviceNames(
-    VideoCaptureDevice::Names* device_names) {
+void VideoCaptureDeviceFactoryAndroid::GetDeviceDescriptors(
+    VideoCaptureDeviceDescriptors* device_descriptors) {
   DCHECK(thread_checker_.CalledOnValidThread());
-  device_names->clear();
+  device_descriptors->clear();
 
   JNIEnv* env = AttachCurrentThread();
 
   const jobject context = base::android::GetApplicationContext();
   const int num_cameras =
       Java_VideoCaptureFactory_getNumberOfCameras(env, context);
   DVLOG(1) << "VideoCaptureDevice::GetDeviceNames: num_cameras=" << num_cameras;
   if (num_cameras <= 0)
     return;
 
   for (int camera_id = num_cameras - 1; camera_id >= 0; --camera_id) {
     base::android::ScopedJavaLocalRef<jstring> device_name =
         Java_VideoCaptureFactory_getDeviceName(env, camera_id, context);
     if (device_name.obj() == NULL)
       continue;
 
     const int capture_api_type =
         Java_VideoCaptureFactory_getCaptureApiType(env, camera_id, context);
 
-    VideoCaptureDevice::Name name(
-        base::android::ConvertJavaStringToUTF8(device_name),
-        base::IntToString(camera_id),
-        static_cast<VideoCaptureDevice::Name::CaptureApiType>(
-            capture_api_type));
-    device_names->push_back(name);
+    VideoCaptureDeviceDescriptor descriptor;
+    descriptor.friendly_name =
+        base::android::ConvertJavaStringToUTF8(device_name);
+    descriptor.device_id = base::IntToString(camera_id);
+    descriptor.capture_api = static_cast<VideoCaptureApiType>(capture_api_type);
+    device_descriptors->push_back(descriptor);
 
     DVLOG(1) << "VideoCaptureDeviceFactoryAndroid::GetDeviceNames: camera "
-             << "device_name=" << name.name() << ", unique_id=" << name.id();
+             << "device_name=" << descriptor.friendly_name
+             << ", unique_id=" << descriptor.device_id;
   }
 }
 
+void VideoCaptureDeviceFactoryAndroid::GetDeviceInfo(
+    const VideoCaptureDeviceDescriptor& device_descriptor,
+    VideoCaptureDeviceInfo* device_info) {
+  DCHECK(device_info);
+  device_info->descriptor = device_descriptor;
+  GetDeviceSupportedFormats(device_descriptor,
+                            &(device_info->supported_formats));
+  // Android cameras are not typically USB devices, and the model_id is
+  // currently only used for USB model identifiers, so this implementation just
+  // indicates an unknown device model.
+  device_info->model_id = "";
+}
+
 void VideoCaptureDeviceFactoryAndroid::GetDeviceSupportedFormats(
-    const VideoCaptureDevice::Name& device,
+    const VideoCaptureDeviceDescriptor& device,
     VideoCaptureFormats* capture_formats) {
   DCHECK(thread_checker_.CalledOnValidThread());
   int id;
-  if (!base::StringToInt(device.id(), &id))
+  if (!base::StringToInt(device.device_id, &id))
     return;
   JNIEnv* env = AttachCurrentThread();
   base::android::ScopedJavaLocalRef<jobjectArray> collected_formats =
       Java_VideoCaptureFactory_getDeviceSupportedFormats(
           env, base::android::GetApplicationContext(), id);
   if (collected_formats.is_null())
     return;
 
   jsize num_formats = env->GetArrayLength(collected_formats.obj());
   for (int i = 0; i < num_formats; ++i) {
@@ skipping 15 matching lines @@
     }
     VideoCaptureFormat capture_format(
         gfx::Size(media::Java_VideoCaptureFactory_getCaptureFormatWidth(
                       env, format.obj()),
                   media::Java_VideoCaptureFactory_getCaptureFormatHeight(
                       env, format.obj())),
         media::Java_VideoCaptureFactory_getCaptureFormatFramerate(env,
                                                                   format.obj()),
         pixel_format);
     capture_formats->push_back(capture_format);
-    DVLOG(1) << device.name() << " "
+    DVLOG(1) << device.friendly_name << " "
              << VideoCaptureFormat::ToString(capture_format);
   }
 }
 
 // static
 VideoCaptureDeviceFactory*
 VideoCaptureDeviceFactory::CreateVideoCaptureDeviceFactory(
     scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) {
   return new VideoCaptureDeviceFactoryAndroid();
 }
 
 }  // namespace media