Add VDA supported profile to GPUInfo.

gpu/config/gpu_info.cc

Index: gpu/config/gpu_info.cc
diff --git a/gpu/config/gpu_info.cc b/gpu/config/gpu_info.cc
index 6ceb7fcf5155bc982cea2adec22d83897ec4b59d..6b06b243b202a386685a86c245e7382fe00a032d 100644
--- a/gpu/config/gpu_info.cc
+++ b/gpu/config/gpu_info.cc
@@ -6,8 +6,8 @@
 
 namespace {
 
-void EnumerateGPUDevice(gpu::GPUInfo::Enumerator* enumerator,
-                        const gpu::GPUInfo::GPUDevice& device) {
+void EnumerateGPUDevice(const gpu::GPUInfo::GPUDevice& device,
+                        gpu::GPUInfo::Enumerator* enumerator) {
   enumerator->BeginGPUDevice();
   enumerator->AddInt("vendorId", device.vendor_id);
   enumerator->AddInt("deviceId", device.device_id);
@@ -17,9 +17,22 @@ void EnumerateGPUDevice(gpu::GPUInfo::Enumerator* enumerator,
   enumerator->EndGPUDevice();
 }
 
+void EnumerateVideoDecodeAcceleratorSupportedProfile(
+    const gpu::VideoDecodeAcceleratorSupportedProfile& profile,
+    gpu::GPUInfo::Enumerator* enumerator) {
+  enumerator->BeginVideoDecodeAcceleratorSupportedProfile();
+  enumerator->AddInt("profile", profile.profile);
+  enumerator->AddInt("maxResolutionWidth", profile.max_resolution.width());
+  enumerator->AddInt("maxResolutionHeight", profile.max_resolution.height());
+  enumerator->AddInt("minResolutionWidth", profile.min_resolution.width());
+  enumerator->AddInt("minResolutionHeight", profile.min_resolution.height());
+  enumerator->AddBool("supportQueryProfile", profile.support_query_profile);

[wuchengli, 2015/03/18 08:02:38]

remove

[henryhsu, 2015/03/18 11:06:09]

Done.

+  enumerator->EndVideoDecodeAcceleratorSupportedProfile();
+}
+
 void EnumerateVideoEncodeAcceleratorSupportedProfile(
-    gpu::GPUInfo::Enumerator* enumerator,
-    const gpu::VideoEncodeAcceleratorSupportedProfile profile) {
+    const gpu::VideoEncodeAcceleratorSupportedProfile& profile,
+    gpu::GPUInfo::Enumerator* enumerator) {
   enumerator->BeginVideoEncodeAcceleratorSupportedProfile();
   enumerator->AddInt("profile", profile.profile);
   enumerator->AddInt("maxResolutionWidth", profile.max_resolution.width());
@@ -101,6 +114,8 @@ void GPUInfo::EnumerateFields(Enumerator* enumerator) const {
     CollectInfoResult dx_diagnostics_info_state;
     DxDiagNode dx_diagnostics;
 #endif

[wuchengli, 2015/03/18 08:02:38]

bool support_query_video_decode_profile;

[henryhsu, 2015/03/18 11:06:09]

Done.

+    std::vector<VideoDecodeAcceleratorSupportedProfile>
+        video_decode_accelerator_supported_profiles;
     std::vector<VideoEncodeAcceleratorSupportedProfile>
         video_encode_accelerator_supported_profiles;
   };
@@ -115,10 +130,9 @@ void GPUInfo::EnumerateFields(Enumerator* enumerator) const {
   // Required fields (according to DevTools protocol) first.
   enumerator->AddString("machineModelName", machine_model_name);
   enumerator->AddString("machineModelVersion", machine_model_version);
-  EnumerateGPUDevice(enumerator, gpu);
-  for (size_t ii = 0; ii < secondary_gpus.size(); ++ii) {
-    EnumerateGPUDevice(enumerator, secondary_gpus[ii]);
-  }
+  EnumerateGPUDevice(gpu, enumerator);
+  for (const auto& secondary_gpu: secondary_gpus)
+    EnumerateGPUDevice(secondary_gpu, enumerator);
 
   enumerator->BeginAuxAttributes();
   enumerator->AddTimeDeltaInSecondsF("initializationTime",
@@ -158,11 +172,10 @@ void GPUInfo::EnumerateFields(Enumerator* enumerator) const {
   enumerator->AddInt("DxDiagnosticsInfoState", dx_diagnostics_info_state);
 #endif
   // TODO(kbr): add dx_diagnostics on Windows.
-  for (size_t ii = 0; ii < video_encode_accelerator_supported_profiles.size();
-       ++ii) {
-    EnumerateVideoEncodeAcceleratorSupportedProfile(
-        enumerator, video_encode_accelerator_supported_profiles[ii]);
-  }
+  for (const auto& profile : video_decode_accelerator_supported_profiles)
+    EnumerateVideoDecodeAcceleratorSupportedProfile(profile, enumerator);
+  for (const auto& profile : video_encode_accelerator_supported_profiles)
+    EnumerateVideoEncodeAcceleratorSupportedProfile(profile, enumerator);
   enumerator->EndAuxAttributes();
 }