content: pepper: VideoEncoder: add software encoder support

content/renderer/pepper/pepper_video_encoder_host.cc

 // Copyright 2015 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 "base/bind.h"
 #include "base/memory/shared_memory.h"
 #include "base/numerics/safe_math.h"
 #include "content/common/gpu/client/command_buffer_proxy_impl.h"
 #include "content/common/gpu/client/gpu_video_encode_accelerator_host.h"
 #include "content/public/renderer/renderer_ppapi_host.h"
 #include "content/renderer/pepper/gfx_conversion.h"
 #include "content/renderer/pepper/host_globals.h"
 #include "content/renderer/pepper/pepper_video_encoder_host.h"
+#include "content/renderer/pepper/video_encoder_shim.h"
 #include "content/renderer/render_thread_impl.h"
 #include "media/base/bind_to_current_loop.h"
 #include "media/base/video_frame.h"
 #include "media/filters/gpu_video_accelerator_factories.h"
 #include "media/video/video_encode_accelerator.h"
 #include "ppapi/c/pp_codecs.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/pp_graphics_3d.h"
 #include "ppapi/host/dispatch_host_message.h"
 #include "ppapi/host/ppapi_host.h"
@@ skipping 259 matching lines @@
   if (acceleration == PP_HARDWAREACCELERATION_ONLY ||
       acceleration == PP_HARDWAREACCELERATION_WITHFALLBACK) {
     if (InitializeHardware(media_input_format_, input_size, media_profile,
                            initial_bitrate))
       return PP_OK_COMPLETIONPENDING;
 
     if (acceleration == PP_HARDWAREACCELERATION_ONLY)
       error = PP_ERROR_FAILED;
   }
 
-  // TODO(llandwerlin): Software encoder.
+  if (acceleration == PP_HARDWAREACCELERATION_NONE ||
+      acceleration == PP_HARDWAREACCELERATION_WITHFALLBACK) {

[bbudge, 2015/02/25 17:58:22]

nit: The acceleration enum contains every possibility, so it's stable and a
simpler test is sufficient:
if (acceleration != PP_HARDWAREACCELERATION_ONLY)

Similarly above:
if (acceleration != PP_HARDWAREACCELERATION_NONE)

[llandwerlin-old, 2015/02/26 13:02:13]

Done.

+    if (InitializeSoftware(media_input_format_, input_size, media_profile,
+                           initial_bitrate))
+      return PP_OK_COMPLETIONPENDING;
+
+    error = PP_ERROR_FAILED;
+  }
+
   initialize_reply_context_ = ppapi::host::ReplyMessageContext();
   Close();
   return error;
 }
 
 int32_t PepperVideoEncoderHost::OnHostMsgGetVideoFrames(
     ppapi::host::HostMessageContext* context) {
   if (encoder_last_error_)
     return encoder_last_error_;
 
@@ skipping 143 matching lines @@
   if (!EnsureGpuChannel())
     return;
 
   std::vector<media::VideoEncodeAccelerator::SupportedProfile> profiles =
       GpuVideoEncodeAcceleratorHost::ConvertGpuToMediaProfiles(
           channel_->gpu_info().video_encode_accelerator_supported_profiles);
   for (media::VideoEncodeAccelerator::SupportedProfile profile : profiles)
     pp_profiles->push_back(PP_FromVideoEncodeAcceleratorSupportedProfile(
         profile, PP_HARDWAREACCELERATION_ONLY));
 
-  // TODO(llandwerlin): add software supported profiles.
+  VideoEncoderShim software_encoder(this);
+  profiles = software_encoder.GetSupportedProfiles();
+  for (media::VideoEncodeAccelerator::SupportedProfile profile : profiles)
+    pp_profiles->push_back(PP_FromVideoEncodeAcceleratorSupportedProfile(
+        profile, PP_HARDWAREACCELERATION_NONE));
 }
 
 bool PepperVideoEncoderHost::IsInitializationValid(
     const PP_Size& input_size,
     PP_VideoProfile output_profile,
     PP_HardwareAcceleration acceleration) {
   DCHECK(RenderThreadImpl::current());
 
   std::vector<PP_VideoProfileDescription> profiles;
   GetSupportedProfiles(&profiles);
@@ skipping 54 matching lines @@
 
   encoder_ = command_buffer_->CreateVideoEncoder();
   if (!encoder_ ||
       !encoder_->Initialize(input_format, input_visible_size, output_profile,
                             initial_bitrate, this))
     return false;
 
   return true;
 }
 
+bool PepperVideoEncoderHost::InitializeSoftware(
+    media::VideoFrame::Format input_format,
+    const gfx::Size& input_visible_size,
+    media::VideoCodecProfile output_profile,
+    uint32_t initial_bitrate) {
+  encoder_.reset(new VideoEncoderShim(this));

[bbudge, 2015/02/25 17:58:22]

DCHECK(!encoder_);
Or simply inline this method at its call site. 

[llandwerlin-old, 2015/02/26 13:02:13]

Done.

+  return encoder_->Initialize(input_format, input_visible_size, output_profile,
+                              initial_bitrate, this);
+}
+
 void PepperVideoEncoderHost::Close() {
   DCHECK(RenderThreadImpl::current());
 
   encoder_ = nullptr;
   if (command_buffer_) {
     DCHECK(channel_);
     channel_->DestroyCommandBuffer(command_buffer_);
     command_buffer_ = nullptr;
   }
 }
@@ skipping 100 matching lines @@
 void PepperVideoEncoderHost::NotifyPepperError(int32_t error) {
   DCHECK(RenderThreadImpl::current());
 
   encoder_last_error_ = error;
   Close();
   host()->SendUnsolicitedReply(
       pp_resource(),
       PpapiPluginMsg_VideoEncoder_NotifyError(encoder_last_error_));
 }
 
+uint8_t* PepperVideoEncoderHost::ShmHandleToAddress(int32 buffer_id) {
+  DCHECK(RenderThreadImpl::current());
+  DCHECK_LT(buffer_id, static_cast<int32>(shm_buffers_.size()));

[bbudge, 2015/02/25 17:58:22]

since buffer_id is signed, you should check that it's >= 0.

[llandwerlin-old, 2015/02/26 13:02:13]

Done.

+  return static_cast<uint8_t*>(shm_buffers_[buffer_id]->shm->memory());
+}
+
 }  // namespace content