Support multiple video decoders and encoders

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 "build/build_config.h"
 #include "content/common/gpu/gpu_channel.h"
 #include "content/common/gpu/gpu_messages.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) && defined(USE_X11)
 
 #if defined(ARCH_CPU_ARMEL)
 #include "content/common/gpu/media/v4l2_video_encode_accelerator.h"
 #elif defined(ARCH_CPU_X86_FAMILY)
+#include "content/common/gpu/media/v4l2_video_encode_accelerator.h"
 #include "content/common/gpu/media/vaapi_video_encode_accelerator.h"
 #include "ui/gfx/x/x11_types.h"
 #endif
 
 #elif defined(OS_ANDROID) && defined(ENABLE_WEBRTC)
 #include "content/common/gpu/media/android_video_encode_accelerator.h"
 #endif
 
 namespace content {
 
@@ skipping 53 matching lines @@
   if (input_visible_size.width() > media::limits::kMaxDimension ||
       input_visible_size.height() > media::limits::kMaxDimension ||
       input_visible_size.GetArea() > media::limits::kMaxCanvas) {
     DLOG(ERROR) << "GpuVideoEncodeAccelerator::Initialize(): "
                    "input_visible_size " << input_visible_size.ToString()
                 << " too large";
     SendCreateEncoderReply(init_done_msg, false);
     return;
   }
 
-  encoder_ = CreateEncoder();
-  if (!encoder_) {
+  encoder_list_ = CreateEncoder();
+  if (!encoder_list_.size()) {

[Pawel Osciak, 2014/12/26 01:11:35]

if (encoder_list_.empty())

[henryhsu, 2014/12/26 08:40:40]

Done.

     DLOG(ERROR)
         << "GpuVideoEncodeAccelerator::Initialize(): VEA creation failed";
     SendCreateEncoderReply(init_done_msg, false);
     return;
   }
-  if (!encoder_->Initialize(input_format,
-                            input_visible_size,
-                            output_profile,
-                            initial_bitrate,
-                            this)) {
-    DLOG(ERROR)
-        << "GpuVideoEncodeAccelerator::Initialize(): VEA initialization failed";
-    SendCreateEncoderReply(init_done_msg, false);
-    return;
+  for (size_t i = 0; i < encoder_list_.size(); ++i) {
+    if (encoder_list_[i]->Initialize(input_format,
+                                      input_visible_size,

[Pawel Osciak, 2014/12/26 01:11:36]

Indent.

[henryhsu, 2014/12/26 08:40:40]

Done.

+                                      output_profile,
+                                      initial_bitrate,
+                                      this)) {
+      encoder_ = encoder_list_[i];

[Pawel Osciak, 2014/12/26 01:11:36]

Do we need to keep all the encoders, if we only use one?

[henryhsu, 2014/12/26 08:40:40]

Done.

+      input_format_ = input_format;
+      input_visible_size_ = input_visible_size;
+      SendCreateEncoderReply(init_done_msg, true);
+      return;
+    }
   }
-  input_format_ = input_format;
-  input_visible_size_ = input_visible_size;
-  SendCreateEncoderReply(init_done_msg, true);
+  encoder_ = NULL;
+  DLOG(ERROR)
+      << "GpuVideoEncodeAccelerator::Initialize(): VEA initialization failed";
+  SendCreateEncoderReply(init_done_msg, false);
 }
 
 bool GpuVideoEncodeAccelerator::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(GpuVideoEncodeAccelerator, message)
     IPC_MESSAGE_HANDLER(AcceleratedVideoEncoderMsg_Encode, OnEncode)
     IPC_MESSAGE_HANDLER(AcceleratedVideoEncoderMsg_UseOutputBitstreamBuffer,
                         OnUseOutputBitstreamBuffer)
     IPC_MESSAGE_HANDLER(
         AcceleratedVideoEncoderMsg_RequestEncodingParametersChange,
@@ skipping 23 matching lines @@
 
 void GpuVideoEncodeAccelerator::NotifyError(
     media::VideoEncodeAccelerator::Error error) {
   Send(new AcceleratedVideoEncoderHostMsg_NotifyError(host_route_id_, error));
 }
 
 void GpuVideoEncodeAccelerator::OnWillDestroyStub() {
   DCHECK(stub_);
   stub_->channel()->RemoveRoute(host_route_id_);
   stub_->RemoveDestructionObserver(this);
-  encoder_.reset();
+  encoder_list_.clear();
   delete this;
 }
 
 // static
 std::vector<gpu::VideoEncodeAcceleratorSupportedProfile>
 GpuVideoEncodeAccelerator::GetSupportedProfiles() {
-  scoped_ptr<media::VideoEncodeAccelerator> encoder = CreateEncoder();
-  if (!encoder)
+  std::vector<media::VideoEncodeAccelerator::SupportedProfile> profiles;
+  ScopedVector<media::VideoEncodeAccelerator>

[Pawel Osciak, 2014/12/26 01:11:36]

Is the newline needed?

[henryhsu, 2014/12/26 08:40:40]

Done.

+      encoder_list = CreateEncoder();
+  if (!encoder_list.size())

[Pawel Osciak, 2014/12/26 01:11:36]

if empty()

[henryhsu, 2014/12/26 08:40:40]

Done.

     return std::vector<gpu::VideoEncodeAcceleratorSupportedProfile>();
-  return ConvertMediaToGpuProfiles(encoder->GetSupportedProfiles());
+  for (size_t i = 0; i < encoder_list.size(); ++i) {
+    std::vector<media::VideoEncodeAccelerator::SupportedProfile>
+        vea_profiles = encoder_list[i]->GetSupportedProfiles();
+    profiles.insert(profiles.end(), vea_profiles.begin(), vea_profiles.end());

[Pawel Osciak, 2014/12/26 01:11:36]

This may result in profiles containing duplicates, which is not preferable...

[henryhsu, 2014/12/26 08:40:40]

How to decide which profile should be used when VideoCodecProfile are the same
but framerate and max_resolution are different.

+  }
+  return ConvertMediaToGpuProfiles(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;
 }
 
-scoped_ptr<media::VideoEncodeAccelerator>
+// static
+ScopedVector<media::VideoEncodeAccelerator>
 GpuVideoEncodeAccelerator::CreateEncoder() {
-  scoped_ptr<media::VideoEncodeAccelerator> encoder;
+  ScopedVector<media::VideoEncodeAccelerator> encoder_list;
 #if defined(OS_CHROMEOS) && defined(USE_X11)
-#if defined(ARCH_CPU_ARMEL)
   scoped_ptr<V4L2Device> device = V4L2Device::Create(V4L2Device::kEncoder);
   if (device)
-    encoder.reset(new V4L2VideoEncodeAccelerator(device.Pass()));
-#elif defined(ARCH_CPU_X86_FAMILY)
+    encoder_list.push_back(new V4L2VideoEncodeAccelerator(device.Pass()));
+#if defined(ARCH_CPU_X86_FAMILY)
   const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
   if (!cmd_line->HasSwitch(switches::kDisableVaapiAcceleratedVideoEncode))
-    encoder.reset(new VaapiVideoEncodeAccelerator(gfx::GetXDisplay()));
+    encoder_list.push_back(new VaapiVideoEncodeAccelerator(gfx::GetXDisplay()));
 #endif
 #elif defined(OS_ANDROID) && defined(ENABLE_WEBRTC)
-  encoder.reset(new AndroidVideoEncodeAccelerator());
+  encoder_list.push_back(new AndroidVideoEncodeAccelerator());
 #endif
-  return encoder.Pass();
+  return encoder_list.Pass();
 }
 
 void GpuVideoEncodeAccelerator::OnEncode(int32 frame_id,
                                          base::SharedMemoryHandle buffer_handle,
                                          uint32 buffer_size,
                                          bool force_keyframe) {
   DVLOG(3) << "GpuVideoEncodeAccelerator::OnEncode(): frame_id=" << frame_id
            << ", buffer_size=" << buffer_size
            << ", force_keyframe=" << force_keyframe;
   if (!encoder_)
@@ skipping 97 matching lines @@
   stub_->channel()->Send(message);
 }
 
 void GpuVideoEncodeAccelerator::SendCreateEncoderReply(IPC::Message* message,
                                                        bool succeeded) {
   GpuCommandBufferMsg_CreateVideoEncoder::WriteReplyParams(message, succeeded);
   Send(message);
 }
 
 }  // namespace content