Add VDA supported profile to GPUInfo.

content/common/gpu/media/gpu_video_encode_accelerator.cc

 // Copyright 2013 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 "content/common/gpu/media/gpu_video_encode_accelerator.h"
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/shared_memory.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/numerics/safe_math.h"
 #include "base/sys_info.h"
 #include "build/build_config.h"
 #include "content/common/gpu/gpu_channel.h"
 #include "content/common/gpu/gpu_messages.h"
+#include "content/common/gpu/media/gpu_video_accelerator_util.h"
 #include "content/public/common/content_switches.h"
 #include "ipc/ipc_message_macros.h"
 #include "media/base/limits.h"
 #include "media/base/video_frame.h"
 
 #if defined(OS_CHROMEOS)
 #if defined(USE_V4L2_CODEC)
 #include "content/common/gpu/media/v4l2_video_encode_accelerator.h"
 #endif
 #if defined(ARCH_CPU_X86_FAMILY)
@@ skipping 129 matching lines @@
 
 void GpuVideoEncodeAccelerator::OnWillDestroyStub() {
   DCHECK(stub_);
   stub_->channel()->RemoveRoute(host_route_id_);
   stub_->RemoveDestructionObserver(this);
   encoder_.reset();
   delete this;
 }
 
 // static
-std::vector<gpu::VideoEncodeAcceleratorSupportedProfile>
-GpuVideoEncodeAccelerator::GetSupportedProfiles() {
+void GpuVideoEncodeAccelerator::GetSupportedProfiles(
+    std::vector<gpu::VideoEncodeAcceleratorSupportedProfile>*
+        supported_profiles) {
   std::vector<media::VideoEncodeAccelerator::SupportedProfile> profiles;
   std::vector<GpuVideoEncodeAccelerator::CreateVEAFp>
       create_vea_fps = CreateVEAFps();
 
   for (size_t i = 0; i < create_vea_fps.size(); ++i) {
     scoped_ptr<media::VideoEncodeAccelerator>
         encoder = (*create_vea_fps[i])();
     if (!encoder)
       continue;
     std::vector<media::VideoEncodeAccelerator::SupportedProfile>
         vea_profiles = encoder->GetSupportedProfiles();
-    profiles.insert(profiles.end(), vea_profiles.begin(), vea_profiles.end());
+    GpuVideoAcceleratorUtil::UniqueInsertEncodeProfiles(
+        &profiles, vea_profiles);
   }
-  return ConvertMediaToGpuProfiles(profiles);
+  *supported_profiles =
+      GpuVideoAcceleratorUtil::ConvertMediaToGpuEncodeProfiles(profiles);
 }
 
 // static
-std::vector<gpu::VideoEncodeAcceleratorSupportedProfile>
-GpuVideoEncodeAccelerator::ConvertMediaToGpuProfiles(const std::vector<
-    media::VideoEncodeAccelerator::SupportedProfile>& media_profiles) {
-  std::vector<gpu::VideoEncodeAcceleratorSupportedProfile> profiles;
-  for (size_t i = 0; i < media_profiles.size(); i++) {
-    gpu::VideoEncodeAcceleratorSupportedProfile profile;
-    profile.profile =
-        static_cast<gpu::VideoCodecProfile>(media_profiles[i].profile);
-    profile.max_resolution = media_profiles[i].max_resolution;
-    profile.max_framerate_numerator = media_profiles[i].max_framerate_numerator;
-    profile.max_framerate_denominator =
-        media_profiles[i].max_framerate_denominator;
-    profiles.push_back(profile);
-  }
-  return profiles;
-}
-
-// static
 std::vector<GpuVideoEncodeAccelerator::CreateVEAFp>
 GpuVideoEncodeAccelerator::CreateVEAFps() {
   std::vector<GpuVideoEncodeAccelerator::CreateVEAFp> create_vea_fps;
   create_vea_fps.push_back(&GpuVideoEncodeAccelerator::CreateV4L2VEA);
   create_vea_fps.push_back(&GpuVideoEncodeAccelerator::CreateVaapiVEA);
   create_vea_fps.push_back(&GpuVideoEncodeAccelerator::CreateAndroidVEA);
   return create_vea_fps;
 }
 
 // static
@@ skipping 154 matching lines @@
   stub_->channel()->Send(message);
 }
 
 void GpuVideoEncodeAccelerator::SendCreateEncoderReply(IPC::Message* message,
                                                        bool succeeded) {
   GpuCommandBufferMsg_CreateVideoEncoder::WriteReplyParams(message, succeeded);
   Send(message);
 }
 
 }  // namespace content