Add VDA supported profile to GPUInfo.

content/common/gpu/media/gpu_video_decode_accelerator.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 "content/common/gpu/media/gpu_video_decode_accelerator.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/stl_util.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 "gpu/command_buffer/common/command_buffer.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_message_utils.h"
 #include "ipc/message_filter.h"
 #include "media/base/limits.h"
 #include "ui/gl/gl_context.h"
 #include "ui/gl/gl_image.h"
 #include "ui/gl/gl_surface_egl.h"
 
@@ skipping 214 matching lines @@
 #if !defined(OS_WIN)
   // Ensure we will be able to get a GL context at all before initializing
   // non-Windows VDAs.
   if (!make_context_current_.Run()) {
     SendCreateDecoderReply(init_done_msg, false);
     return;
   }
 #endif
 
   // Array of Create..VDA() function pointers, maybe applicable to the current
-  // platform. This list is ordered by priority of use.
+  // platform. This list is ordered by priority of use and it should be the
+  // same as the order of querying supported profiles of VDAs.
   const GpuVideoDecodeAccelerator::CreateVDAFp create_vda_fps[] = {
       &GpuVideoDecodeAccelerator::CreateDXVAVDA,
       &GpuVideoDecodeAccelerator::CreateV4L2VDA,
       &GpuVideoDecodeAccelerator::CreateV4L2SliceVDA,
       &GpuVideoDecodeAccelerator::CreateVaapiVDA,
       &GpuVideoDecodeAccelerator::CreateVTVDA,
       &GpuVideoDecodeAccelerator::CreateOzoneVDA,
       &GpuVideoDecodeAccelerator::CreateAndroidVDA};
 
   for (const auto& create_vda_function : create_vda_fps) {
@@ skipping 113 matching lines @@
 GpuVideoDecodeAccelerator::CreateAndroidVDA() {
   scoped_ptr<media::VideoDecodeAccelerator> decoder;
 #if defined(OS_ANDROID)
   decoder.reset(new AndroidVideoDecodeAccelerator(
       stub_->decoder()->AsWeakPtr(),
       make_context_current_));
 #endif
   return decoder.Pass();
 }
 
+// static
+std::vector<gpu::VideoDecodeAcceleratorSupportedProfile>
+GpuVideoDecodeAccelerator::GetSupportedProfiles() {
+  std::vector<media::VideoDecodeAccelerator::SupportedProfile> profiles;
+  std::vector<media::VideoDecodeAccelerator::SupportedProfile> vda_profiles;
+  // Query supported profiles for each VDA. The order of querying VDAs should
+  // be the same as the order of initializing VDAs. Then the returned profile
+  // can be initialized by corresponding VDA successfully.
+#if defined(OS_WIN)
+  vda_profiles = DXVAVideoDecodeAccelerator::GetSupportedProfiles();
+  profiles.insert(profiles.end(), vda_profiles.begin(), vda_profiles.end());

[piman, 2015/03/23 20:29:30]

nit: you can do profiles = DXVAVideoDecodeAccelerator::GetSupportedProfiles()
directly, skipping the vda_profiles intermediate and the insert.

Same in multiple places below.

[henryhsu, 2015/03/24 10:02:44]

Done.

+#elif defined(OS_CHROMEOS)
+#if defined(USE_V4L2_CODEC)
+  vda_profiles = V4L2VideoDecodeAccelerator::GetSupportedProfiles();
+  GpuVideoAcceleratorUtil::InsertUniqueDecodeProfiles(vda_profiles, &profiles);
+  vda_profiles = V4L2SliceVideoDecodeAccelerator::GetSupportedProfiles();
+  GpuVideoAcceleratorUtil::InsertUniqueDecodeProfiles(vda_profiles, &profiles);
+#endif
+#if defined(ARCH_CPU_X86_FAMILY)
+  vda_profiles = VaapiVideoDecodeAccelerator::GetSupportedProfiles();
+  GpuVideoAcceleratorUtil::InsertUniqueDecodeProfiles(vda_profiles, &profiles);
+#endif
+#elif defined(OS_MACOSX)
+  vda_profiles = VTVideoDecodeAccelerator::GetSupportedProfiles();
+  profiles.insert(profiles.end(), vda_profiles.begin(), vda_profiles.end());
+#elif defined(OS_ANDROID)
+  vda_profiles = AndroidVideoDecodeAccelerator::GetSupportedProfiles();
+  profiles.insert(profiles.end(), vda_profiles.begin(), vda_profiles.end());
+#endif // defined(OS_CHROMEOS)

[wuchengli, 2015/03/23 14:42:06]

Remove "// defined(OS_CHROMEOS)" comment

[henryhsu, 2015/03/24 10:02:44]

Done.

+  return GpuVideoAcceleratorUtil::ConvertMediaToGpuDecodeProfiles(profiles);
+}
+
 // Runs on IO thread if video_decode_accelerator_->CanDecodeOnIOThread() is
 // true, otherwise on the main thread.
 void GpuVideoDecodeAccelerator::OnDecode(
     base::SharedMemoryHandle handle, int32 id, uint32 size) {
   DCHECK(video_decode_accelerator_.get());
   if (id < 0) {
     DLOG(ERROR) << "BitstreamBuffer id " << id << " out of range";
     if (child_message_loop_->BelongsToCurrentThread()) {
       NotifyError(media::VideoDecodeAccelerator::INVALID_ARGUMENT);
     } else {
@@ skipping 180 matching lines @@
   return stub_->channel()->Send(message);
 }
 
 void GpuVideoDecodeAccelerator::SendCreateDecoderReply(IPC::Message* message,
                                                        bool succeeded) {
   GpuCommandBufferMsg_CreateVideoDecoder::WriteReplyParams(message, succeeded);
   Send(message);
 }
 
 }  // namespace content