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_) {
+  std::vector<media::VideoEncodeAccelerator*> encoders = CreateEncoders();
+  if (encoders.empty()) {
     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)) {
+  for (size_t i = 0; i < encoders.size(); ++i) {

[Pawel Osciak, 2014/12/28 23:28:03]

Please add comments what's going on here.

[henryhsu, 2014/12/29 09:43:26]

Done.

+    if (encoders[i]->Initialize(input_format,
+                                input_visible_size,
+                                output_profile,
+                                initial_bitrate,
+                                this)) {
+      encoder_.reset(encoders[i]);

[Pawel Osciak, 2014/12/28 23:28:03]

We keep looping even if successful and overwrite the previous successful
encoder? Is this what we prefer?

[henryhsu, 2014/12/29 09:43:26]

ok. let us keep the first successful encoder.

+      input_format_ = input_format;

[Pawel Osciak, 2014/12/28 23:28:03]

This could still stay outside of the loop.

[henryhsu, 2014/12/29 09:43:26]

will return directly if initialization succeeded.

+      input_visible_size_ = input_visible_size;
+    } else {
+      encoders[i]->Destroy();

[Pawel Osciak, 2014/12/28 23:28:03]

This assumes Destroy() deletes this, which it does now, but this is too shaky,
it can change in the future and we have no protection against it.

[henryhsu, 2014/12/29 09:43:26]

back to scoped_ptr

+    }
+  }
+  if (!encoder_.get()) {
     DLOG(ERROR)
         << "GpuVideoEncodeAccelerator::Initialize(): VEA initialization failed";
     SendCreateEncoderReply(init_done_msg, false);
-    return;
+  } else {
+    SendCreateEncoderReply(init_done_msg, true);
   }
-  input_format_ = input_format;
-  input_visible_size_ = input_visible_size;
-  SendCreateEncoderReply(init_done_msg, true);
 }
 
 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 29 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() {

[Pawel Osciak, 2014/12/28 23:28:03]

Can we keep the profile list for later in a singleton and not recreate it every
time?

[henryhsu, 2014/12/29 09:43:26]

GetSupportedProfiels is only called one time when GPU process created.
Do we still need singleton to save it?

-  scoped_ptr<media::VideoEncodeAccelerator> encoder = CreateEncoder();
-  if (!encoder)
+  std::vector<media::VideoEncodeAccelerator::SupportedProfile> profiles;
+  std::vector<media::VideoEncodeAccelerator*> encoders = CreateEncoders();

[Pawel Osciak, 2014/12/28 23:28:03]

Scopers please.

[henryhsu, 2014/12/29 09:43:26]

SocopedVector doesn't support DefaultDeleter. I'll use scoped_ptr to split
CreateEncoders.

+  if (encoders.empty())
     return std::vector<gpu::VideoEncodeAcceleratorSupportedProfile>();
-  return ConvertMediaToGpuProfiles(encoder->GetSupportedProfiles());
+
+  std::set<media::VideoEncodeAccelerator::SupportedProfile> profile_set;
+  for (size_t i = 0; i < encoders.size(); ++i) {
+    std::vector<media::VideoEncodeAccelerator::SupportedProfile>
+        vea_profiles = encoders[i]->GetSupportedProfiles();
+    for (size_t j = 0; j < vea_profiles.size(); ++j)
+      profile_set.insert(vea_profiles[j]);
+    encoders[i]->Destroy();

[Pawel Osciak, 2014/12/28 23:28:03]

Please don't depend on delete this in Destroy().

[henryhsu, 2014/12/29 09:43:26]

Done.

+  }
+  profiles.assign(profile_set.begin(), profile_set.end());
+  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>
-GpuVideoEncodeAccelerator::CreateEncoder() {
-  scoped_ptr<media::VideoEncodeAccelerator> encoder;
+// static
+std::vector<media::VideoEncodeAccelerator*>
+GpuVideoEncodeAccelerator::CreateEncoders() {
+  std::vector<media::VideoEncodeAccelerator*> encoders;
 #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)
+    encoders.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()));
+    encoders.push_back(new VaapiVideoEncodeAccelerator(gfx::GetXDisplay()));
 #endif
 #elif defined(OS_ANDROID) && defined(ENABLE_WEBRTC)
-  encoder.reset(new AndroidVideoEncodeAccelerator());
+  encoders.push_back(new AndroidVideoEncodeAccelerator());
 #endif
-  return encoder.Pass();
+  return encoders;
 }
 
 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