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 237 matching lines @@
     SendCreateDecoderReply(init_done_msg, true);
     return;
   }
   video_decode_accelerator_.reset();
   NOTIMPLEMENTED() << "HW video decode acceleration not available.";
   SendCreateDecoderReply(init_done_msg, false);
 }
 
 std::vector<GpuVideoDecodeAccelerator::CreateVDAFp>
 GpuVideoDecodeAccelerator::CreateVDAFps() {
   std::vector<GpuVideoDecodeAccelerator::CreateVDAFp> create_vda_fps;

[wuchengli, 2015/03/19 06:19:25]

Add comment to say the insert order here must be the same as
GetSupportedProfiles.

[henryhsu, 2015/03/19 10:00:32]

Done.

   create_vda_fps.push_back(&GpuVideoDecodeAccelerator::CreateDXVAVDA);
   create_vda_fps.push_back(&GpuVideoDecodeAccelerator::CreateV4L2VDA);
   create_vda_fps.push_back(&GpuVideoDecodeAccelerator::CreateV4L2SliceVDA);
   create_vda_fps.push_back(&GpuVideoDecodeAccelerator::CreateVaapiVDA);
   create_vda_fps.push_back(&GpuVideoDecodeAccelerator::CreateVTVDA);
   create_vda_fps.push_back(&GpuVideoDecodeAccelerator::CreateOzoneVDA);
   create_vda_fps.push_back(&GpuVideoDecodeAccelerator::CreateAndroidVDA);
   return create_vda_fps;
 }
 
@@ skipping 96 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
+bool GpuVideoDecodeAccelerator::GetSupportedProfiles(
+    std::vector<gpu::VideoDecodeAcceleratorSupportedProfile>*
+        supported_profiles) {
+  std::vector<media::VideoDecodeAccelerator::SupportedProfile> profiles;
+  bool support_query_profile = false;
+#if defined(OS_CHROMEOS)
+  std::vector<media::VideoDecodeAccelerator::SupportedProfile> vda_profiles;
+  support_query_profile = true;

[wuchengli, 2015/03/19 06:19:25]

Add comment to say the insert order here must be the same as CreateVDAFps.

[henryhsu, 2015/03/19 10:00:32]

Done.

+#if defined(USE_V4L2_CODEC)
+  vda_profiles = V4L2VideoDecodeAccelerator::GetSupportedProfiles();
+  profiles.insert(profiles.end(), vda_profiles.begin(), vda_profiles.end());
+  vda_profiles = V4L2SliceVideoDecodeAccelerator::GetSupportedProfiles();
+  profiles.insert(profiles.end(), vda_profiles.begin(), vda_profiles.end());
+#endif
+#if defined(ARCH_CPU_X86_FAMILY)
+  vda_profiles = VaapiVideoDecodeAccelerator::GetSupportedProfiles();
+  profiles.insert(profiles.end(), vda_profiles.begin(), vda_profiles.end());
+#endif
+#endif // defined(OS_CHROMEOS)
+  *supported_profiles =
+      GpuVideoAcceleratorUtil::ConvertMediaToGpuDecodeProfiles(profiles);

[wuchengli, 2015/03/19 06:19:24]

We shouldn't touch |supported_profiles| if this function returns false. I think
setting |supported_profiles| to empty vector implies no profiles is supported.
Move this line to line 411.

[henryhsu, 2015/03/19 10:00:32]

Done.

+  return support_query_profile;
+}
+
 // 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