Pepper: PPB_VideoEncoder implementation

content/renderer/pepper/pepper_video_encoder_host.cc

Index: content/renderer/pepper/pepper_video_encoder_host.cc
diff --git a/content/renderer/pepper/pepper_video_encoder_host.cc b/content/renderer/pepper/pepper_video_encoder_host.cc
new file mode 100644
index 0000000000000000000000000000000000000000..b639daa46041bd1fa3085cab910d79baf656383a
--- /dev/null
+++ b/content/renderer/pepper/pepper_video_encoder_host.cc
@@ -0,0 +1,591 @@
+// 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/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/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"
+#include "ppapi/proxy/ppapi_messages.h"
+#include "ppapi/shared_impl/media_stream_buffer.h"
+
+using ppapi::proxy::SerializedHandle;
+
+namespace content {
+
+namespace {
+
+const int32_t kDefaultNumberOfBitstreamBuffers = 4;
+
+base::PlatformFile ConvertSharedMemoryHandle(
+    const base::SharedMemory& shared_memory) {
+#if defined(OS_POSIX)
+  return shared_memory.handle().fd;
+#elif defined(OS_WIN)
+  return shared_memory.handle();
+#else
+#error "Platform not supported."
+#endif
+}
+
+int32_t PP_FromMediaEncodeAcceleratorError(
+    media::VideoEncodeAccelerator::Error error) {
+  switch (error) {
+    case media::VideoEncodeAccelerator::kInvalidArgumentError:
+      return PP_ERROR_MALFORMED_INPUT;
+    case media::VideoEncodeAccelerator::kIllegalStateError:
+    case media::VideoEncodeAccelerator::kPlatformFailureError:
+      return PP_ERROR_RESOURCE_FAILED;
+    // No default case, to catch unhandled enum values.
+  }
+  return PP_ERROR_FAILED;
+}
+
+// TODO(llandwerlin): move following to media_conversion.cc/h?
+media::VideoCodecProfile PP_ToMediaVideoProfile(PP_VideoProfile profile) {
+  switch (profile) {
+    case PP_VIDEOPROFILE_H264BASELINE:
+      return media::H264PROFILE_BASELINE;
+    case PP_VIDEOPROFILE_H264MAIN:
+      return media::H264PROFILE_MAIN;
+    case PP_VIDEOPROFILE_H264EXTENDED:
+      return media::H264PROFILE_EXTENDED;
+    case PP_VIDEOPROFILE_H264HIGH:
+      return media::H264PROFILE_HIGH;
+    case PP_VIDEOPROFILE_H264HIGH10PROFILE:
+      return media::H264PROFILE_HIGH10PROFILE;
+    case PP_VIDEOPROFILE_H264HIGH422PROFILE:
+      return media::H264PROFILE_HIGH422PROFILE;
+    case PP_VIDEOPROFILE_H264HIGH444PREDICTIVEPROFILE:
+      return media::H264PROFILE_HIGH444PREDICTIVEPROFILE;
+    case PP_VIDEOPROFILE_H264SCALABLEBASELINE:
+      return media::H264PROFILE_SCALABLEBASELINE;
+    case PP_VIDEOPROFILE_H264SCALABLEHIGH:
+      return media::H264PROFILE_SCALABLEHIGH;
+    case PP_VIDEOPROFILE_H264STEREOHIGH:
+      return media::H264PROFILE_STEREOHIGH;
+    case PP_VIDEOPROFILE_H264MULTIVIEWHIGH:
+      return media::H264PROFILE_MULTIVIEWHIGH;
+    case PP_VIDEOPROFILE_VP8_ANY:
+      return media::VP8PROFILE_ANY;
+    case PP_VIDEOPROFILE_VP9_ANY:
+      return media::VP9PROFILE_ANY;
+    // No default case, to catch unhandled PP_VideoProfile values.
+  }
+  return media::VIDEO_CODEC_PROFILE_UNKNOWN;
+}
+
+PP_VideoProfile PP_FromMediaVideoProfile(media::VideoCodecProfile profile) {
+  switch (profile) {
+    case media::H264PROFILE_BASELINE:
+      return PP_VIDEOPROFILE_H264BASELINE;
+    case media::H264PROFILE_MAIN:
+      return PP_VIDEOPROFILE_H264MAIN;
+    case media::H264PROFILE_EXTENDED:
+      return PP_VIDEOPROFILE_H264EXTENDED;
+    case media::H264PROFILE_HIGH:
+      return PP_VIDEOPROFILE_H264HIGH;
+    case media::H264PROFILE_HIGH10PROFILE:
+      return PP_VIDEOPROFILE_H264HIGH10PROFILE;
+    case media::H264PROFILE_HIGH422PROFILE:
+      return PP_VIDEOPROFILE_H264HIGH422PROFILE;
+    case media::H264PROFILE_HIGH444PREDICTIVEPROFILE:
+      return PP_VIDEOPROFILE_H264HIGH444PREDICTIVEPROFILE;
+    case media::H264PROFILE_SCALABLEBASELINE:
+      return PP_VIDEOPROFILE_H264SCALABLEBASELINE;
+    case media::H264PROFILE_SCALABLEHIGH:
+      return PP_VIDEOPROFILE_H264SCALABLEHIGH;
+    case media::H264PROFILE_STEREOHIGH:
+      return PP_VIDEOPROFILE_H264STEREOHIGH;
+    case media::H264PROFILE_MULTIVIEWHIGH:
+      return PP_VIDEOPROFILE_H264MULTIVIEWHIGH;
+    case media::VP8PROFILE_ANY:
+      return PP_VIDEOPROFILE_VP8_ANY;
+    case media::VP9PROFILE_ANY:
+      return PP_VIDEOPROFILE_VP9_ANY;
+    default:
+      NOTREACHED();
+      return static_cast<PP_VideoProfile>(-1);
+  }
+}
+
+media::VideoFrame::Format PP_ToMediaVideoFormat(PP_VideoFrame_Format format) {
+  switch (format) {
+    case PP_VIDEOFRAME_FORMAT_UNKNOWN:
+      return media::VideoFrame::UNKNOWN;
+    case PP_VIDEOFRAME_FORMAT_YV12:
+      return media::VideoFrame::YV12;
+    case PP_VIDEOFRAME_FORMAT_I420:
+      return media::VideoFrame::I420;
+    case PP_VIDEOFRAME_FORMAT_BGRA:
+      return media::VideoFrame::UNKNOWN;
+    // No default case, to catch unhandled PP_VideoFrame_Format values.
+  }
+  return media::VideoFrame::UNKNOWN;
+}
+
+PP_VideoFrame_Format PP_FromMediaVideoFormat(media::VideoFrame::Format format) {
+  switch (format) {
+    case media::VideoFrame::UNKNOWN:
+      return PP_VIDEOFRAME_FORMAT_UNKNOWN;
+    case media::VideoFrame::YV12:
+      return PP_VIDEOFRAME_FORMAT_YV12;
+    case media::VideoFrame::I420:
+      return PP_VIDEOFRAME_FORMAT_I420;
+    default:
+      return PP_VIDEOFRAME_FORMAT_UNKNOWN;
+  }
+}
+
+PP_VideoProfileDescription PP_FromVideoEncodeAcceleratorSupportedProfile(
+    media::VideoEncodeAccelerator::SupportedProfile profile,
+    PP_HardwareAcceleration acceleration) {
+  PP_VideoProfileDescription pp_profile;
+  pp_profile.profile = PP_FromMediaVideoProfile(profile.profile);
+  pp_profile.max_resolution = PP_FromGfxSize(profile.max_resolution);
+  pp_profile.max_framerate_numerator = profile.max_framerate_numerator;
+  pp_profile.max_framerate_denominator = profile.max_framerate_denominator;
+  pp_profile.acceleration = acceleration;
+  return pp_profile;
+}
+
+bool PP_HardwareAccelerationCompatible(PP_HardwareAcceleration supply,
+                                       PP_HardwareAcceleration demand) {
+  switch (supply) {
+    case PP_HARDWAREACCELERATION_ONLY:
+      return (demand == PP_HARDWAREACCELERATION_ONLY ||
+              demand == PP_HARDWAREACCELERATION_WITHFALLBACK);
+    case PP_HARDWAREACCELERATION_WITHFALLBACK:
+      return true;
+    case PP_HARDWAREACCELERATION_NONE:
+      return (demand == PP_HARDWAREACCELERATION_WITHFALLBACK ||
+              demand == PP_HARDWAREACCELERATION_NONE);
+    // No default case, to catch unhandled PP_HardwareAcceleration values.
+  }
+  return false;
+}
+
+}  // namespace
+
+PepperVideoEncoderHost::ShmBuffer::ShmBuffer(
+    int32_t id,
+    scoped_ptr<base::SharedMemory> memory,

[bbudge, 2015/02/12 22:22:09]

nit: s/memory/shm ?

[llandwerlin-old, 2015/02/13 20:12:25]

Done.

+    size_t size)
+    : id(id), shm(memory.Pass()), in_use(true) {
+  if (shm)

[bbudge, 2015/02/12 22:22:09]

Since it's only called inside this file, shm should always be non-null. Maybe a
DCHECK?

[llandwerlin-old, 2015/02/13 20:12:24]

Done.

+    shm->Map(size);
+}
+
+PepperVideoEncoderHost::ShmBuffer::~ShmBuffer() {
+}
+
+media::BitstreamBuffer PepperVideoEncoderHost::ShmBuffer::toBitstreamBuffer() {
+  return media::BitstreamBuffer(id, shm->handle(), shm->mapped_size());
+}
+
+PepperVideoEncoderHost::PepperVideoEncoderHost(RendererPpapiHost* host,
+                                               PP_Instance instance,
+                                               PP_Resource resource)
+    : ResourceHost(host->GetPpapiHost(), instance, resource),
+      renderer_ppapi_host_(host),
+      buffer_manager_(this),
+      command_buffer_(nullptr),
+      initialized_(false),
+      encoder_last_error_(PP_ERROR_FAILED),
+      frame_count_(0),
+      media_input_format_(media::VideoFrame::UNKNOWN),
+      weak_ptr_factory_(this) {
+}
+
+PepperVideoEncoderHost::~PepperVideoEncoderHost() {
+  if (encoder_)

[bbudge, 2015/02/12 22:22:09]

nit: 'if' isn't necessary.

[llandwerlin-old, 2015/02/13 20:12:24]

Done.

+    encoder_ = nullptr;
+  if (command_buffer_) {
+    DCHECK(channel_);
+    channel_->DestroyCommandBuffer(command_buffer_);
+    command_buffer_ = nullptr;
+  }
+}

[bbudge, 2015/02/12 22:22:10]

Suggestion: Add a new utility method, Close() that does all of this. Then call
it here, and in OnHostMsgClose, which currently doesn't release the
command_buffer_.

[llandwerlin-old, 2015/02/13 20:12:25]

Done.

+
+int32_t PepperVideoEncoderHost::OnResourceMessageReceived(
+    const IPC::Message& msg,
+    ppapi::host::HostMessageContext* context) {
+  PPAPI_BEGIN_MESSAGE_MAP(PepperVideoEncoderHost, msg)
+    PPAPI_DISPATCH_HOST_RESOURCE_CALL_0(
+        PpapiHostMsg_VideoEncoder_GetSupportedProfiles,
+        OnHostMsgGetSupportedProfiles)
+    PPAPI_DISPATCH_HOST_RESOURCE_CALL(PpapiHostMsg_VideoEncoder_Initialize,
+                                      OnHostMsgInitialize)
+    PPAPI_DISPATCH_HOST_RESOURCE_CALL_0(
+        PpapiHostMsg_VideoEncoder_GetVideoFrames,
+        OnHostMsgGetVideoFrames)
+    PPAPI_DISPATCH_HOST_RESOURCE_CALL(PpapiHostMsg_VideoEncoder_Encode,
+                                      OnHostMsgEncode)
+    PPAPI_DISPATCH_HOST_RESOURCE_CALL(
+        PpapiHostMsg_VideoEncoder_RecycleBitstreamBuffer,
+        OnHostMsgRecycleBitstreamBuffer)
+    PPAPI_DISPATCH_HOST_RESOURCE_CALL(
+        PpapiHostMsg_VideoEncoder_RequestEncodingParametersChange,
+        OnHostMsgRequestEncodingParametersChange)
+    PPAPI_DISPATCH_HOST_RESOURCE_CALL_0(PpapiHostMsg_VideoEncoder_Close,
+                                        OnHostMsgClose)
+  PPAPI_END_MESSAGE_MAP()
+  return PP_ERROR_FAILED;
+}
+
+int32_t PepperVideoEncoderHost::OnHostMsgGetSupportedProfiles(
+    ppapi::host::HostMessageContext* context) {
+  std::vector<PP_VideoProfileDescription> pp_profiles;
+  GetSupportedProfiles(&pp_profiles);
+
+  host()->SendReply(
+      context->MakeReplyMessageContext(),
+      PpapiPluginMsg_VideoEncoder_GetSupportedProfilesReply(pp_profiles));
+
+  return PP_OK_COMPLETIONPENDING;
+}
+
+int32_t PepperVideoEncoderHost::OnHostMsgInitialize(
+    ppapi::host::HostMessageContext* context,
+    PP_VideoFrame_Format input_format,
+    const PP_Size& input_visible_size,
+    PP_VideoProfile output_profile,
+    uint32_t initial_bitrate,
+    PP_HardwareAcceleration acceleration) {
+  if (initialized_)
+    return PP_ERROR_FAILED;
+
+  media_input_format_ = PP_ToMediaVideoFormat(input_format);
+  if (media_input_format_ == media::VideoFrame::UNKNOWN)
+    return PP_ERROR_BADARGUMENT;
+
+  media::VideoCodecProfile media_profile =
+      PP_ToMediaVideoProfile(output_profile);
+  if (media_profile == media::VIDEO_CODEC_PROFILE_UNKNOWN)
+    return PP_ERROR_BADARGUMENT;
+
+  gfx::Size input_size(input_visible_size.width, input_visible_size.height);
+  if (input_size.IsEmpty())
+    return PP_ERROR_BADARGUMENT;
+
+  if (!IsInitializationValid(input_visible_size, output_profile, acceleration))
+    return PP_ERROR_NOTSUPPORTED;
+
+  initialize_reply_context_ = context->MakeReplyMessageContext();
+
+  if (acceleration == PP_HARDWAREACCELERATION_ONLY ||
+      acceleration == PP_HARDWAREACCELERATION_WITHFALLBACK) {
+    // There is no guarantee that we have a 3D context to work with. So
+    // we create a dummy command buffer to communicate with the gpu process.
+    channel_ = RenderThreadImpl::current()->EstablishGpuChannelSync(
+        CAUSE_FOR_GPU_LAUNCH_PEPPERVIDEOENCODERACCELERATOR_INITIALIZE);
+    if (!channel_.get())
+      return PP_ERROR_FAILED;
+
+    std::vector<int32> attribs(1, PP_GRAPHICS3DATTRIB_NONE);
+
+    command_buffer_ = channel_->CreateOffscreenCommandBuffer(
+        gfx::Size(), nullptr, attribs, GURL::EmptyGURL(),
+        gfx::PreferIntegratedGpu);
+    if (!command_buffer_)
+      return PP_ERROR_FAILED;
+
+    command_buffer_->SetChannelErrorCallback(media::BindToCurrentLoop(
+        base::Bind(&PepperVideoEncoderHost::NotifyPepperError,
+                   weak_ptr_factory_.GetWeakPtr(), PP_ERROR_FAILED)));
+
+    if (!command_buffer_->Initialize())
+      return PP_ERROR_FAILED;
+
+    encoder_ = command_buffer_->CreateVideoEncoder();
+    if (encoder_ &&
+        encoder_->Initialize(media_input_format_, input_size, media_profile,
+                             initial_bitrate, this)) {
+      initialized_ = true;
+      host()->SendReply(context->MakeReplyMessageContext(),
+                        PpapiPluginMsg_VideoEncoder_InitializeReply());
+      return PP_OK;
+    }
+
+    if (acceleration == PP_HARDWAREACCELERATION_ONLY) {
+      encoder_ = nullptr;

[bbudge, 2015/02/12 22:22:09]

You probably should Close() this instance here. See my comments on the dtor.

[llandwerlin-old, 2015/02/13 20:12:25]

Done.

+      return PP_ERROR_FAILED;
+    }
+  }
+
+  // TODO(llandwerlin): Software encoder.
+  return PP_ERROR_NOTSUPPORTED;
+}
+
+int32_t PepperVideoEncoderHost::OnHostMsgGetVideoFrames(
+    ppapi::host::HostMessageContext* context) {
+  if (encoder_last_error_)
+    return encoder_last_error_;
+
+  uint32_t frame_length =
+      media::VideoFrame::AllocationSize(media_input_format_, input_coded_size_);

[bbudge, 2015/02/12 22:22:09]

This doesn't overflow because of your input validation, but it's not obvious
from looking here, and could be broken by a future maintainer. Also, the
following statement could in theory overflow. Could you do all checked math like
this?

  base::CheckedNumeric<uint32_t> size =
      media::VideoFrame::AllocationSize(media_input_format_, input_coded_size_);
  uint32_t frame_size = size.ValueOrDie();
  size += sizeof(ppapi::MediaStreamBuffer::Video) -
          sizeof(ppapi::MediaStreamBuffer::Video::data);
  uint32_t buffer_size = size.ValueOrDie();
  size += (4 - buffer_size % 4);
  base::CheckedNumeric<int32_t> buffer_size_aligned = size.ValueOrDie();
  size *= frame_count_;
  base::CheckedNumeric<int32_t> total_size = size.valueOrDie();

[llandwerlin-old, 2015/02/13 20:12:24]

Done.

+  uint32_t buffer_size = frame_length +
+                         sizeof(ppapi::MediaStreamBuffer::Video) -
+                         sizeof(ppapi::MediaStreamBuffer::Video::data);
+
+  // Make each buffer 4 byte aligned.
+  base::CheckedNumeric<int32_t> buffer_size_aligned = buffer_size;
+  buffer_size_aligned += (4 - buffer_size % 4);
+
+  base::CheckedNumeric<int32_t> total_size = frame_count_ * buffer_size_aligned;
+  if (!total_size.IsValid())
+    return PP_ERROR_FAILED;
+
+  scoped_ptr<base::SharedMemory> shm(
+      RenderThreadImpl::current()
+          ->HostAllocateSharedMemoryBuffer(total_size.ValueOrDie())
+          .Pass());
+  if (!shm)
+    return PP_ERROR_FAILED;

[bbudge, 2015/02/12 22:22:10]

PP_ERROR_NOMEMORY is more consistent.

[llandwerlin-old, 2015/02/13 20:12:25]

Done.

+
+  VLOG(4) << " frame_count=" << frame_count_ << " frame_length=" << frame_length
+          << " buffer_size=" << buffer_size_aligned.ValueOrDie();
+
+  if (!buffer_manager_.SetBuffers(
+          frame_count_, buffer_size_aligned.ValueOrDie(), shm.Pass(), true))
+    return PP_ERROR_FAILED;
+
+  for (int32_t i = 0; i < buffer_manager_.number_of_buffers(); ++i) {
+    ppapi::MediaStreamBuffer::Video* buffer =
+        &(buffer_manager_.GetBufferPointer(i)->video);
+    buffer->header.size = buffer_manager_.buffer_size();
+    buffer->header.type = ppapi::MediaStreamBuffer::TYPE_VIDEO;
+    buffer->format = PP_FromMediaVideoFormat(media_input_format_);
+    buffer->size.width = input_coded_size_.width();
+    buffer->size.height = input_coded_size_.height();
+    buffer->data_size = frame_length;
+  }
+
+  ppapi::host::ReplyMessageContext reply_context =
+      context->MakeReplyMessageContext();
+  reply_context.params.AppendHandle(SerializedHandle(
+      renderer_ppapi_host_->ShareHandleWithRemote(
+          ConvertSharedMemoryHandle(*buffer_manager_.shm()), false),
+      total_size.ValueOrDie()));
+
+  host()->SendReply(reply_context,
+                    PpapiPluginMsg_VideoEncoder_GetVideoFramesReply(
+                        frame_count_, buffer_size_aligned.ValueOrDie(),
+                        PP_FromGfxSize(input_coded_size_)));
+
+  return PP_OK_COMPLETIONPENDING;
+}
+
+int32_t PepperVideoEncoderHost::OnHostMsgEncode(
+    ppapi::host::HostMessageContext* context,
+    uint32_t frame_id,
+    bool force_keyframe) {
+  if (encoder_last_error_)
+    return encoder_last_error_;
+
+  if (frame_id >= static_cast<uint32_t>(buffer_manager_.number_of_buffers()))

[bbudge, 2015/02/12 22:22:09]

Could you use frame_count_ instead of buffer_manager_.number_of_buffers()?
Here and below.

[llandwerlin-old, 2015/02/13 20:12:24]

Done.

+    return PP_ERROR_FAILED;
+
+  encoder_->Encode(
+      CreateVideoFrame(frame_id, context->MakeReplyMessageContext()),
+      force_keyframe);
+
+  return PP_OK_COMPLETIONPENDING;
+}
+
+int32_t PepperVideoEncoderHost::OnHostMsgRecycleBitstreamBuffer(
+    ppapi::host::HostMessageContext* context,
+    uint32_t buffer_id) {
+  if (encoder_last_error_)
+    return encoder_last_error_;
+
+  if (buffer_id < 0 ||

[bbudge, 2015/02/12 22:22:09]

buffer_id is unsigned

[llandwerlin-old, 2015/02/13 20:12:25]

Done.

+      buffer_id >= shm_buffers_.size() ||
+      shm_buffers_[buffer_id]->in_use)
+    return PP_ERROR_FAILED;
+
+  shm_buffers_[buffer_id]->in_use = true;
+  encoder_->UseOutputBitstreamBuffer(
+      shm_buffers_[buffer_id]->toBitstreamBuffer());
+
+  return PP_OK;
+}
+
+int32_t PepperVideoEncoderHost::OnHostMsgRequestEncodingParametersChange(
+    ppapi::host::HostMessageContext* context,
+    uint32_t bitrate,
+    uint32_t framerate) {
+  if (encoder_last_error_)
+    return encoder_last_error_;
+
+  encoder_->RequestEncodingParametersChange(bitrate, framerate);
+
+  return PP_OK;
+}
+
+int32_t PepperVideoEncoderHost::OnHostMsgClose(
+    ppapi::host::HostMessageContext* context) {
+  encoder_last_error_ = PP_ERROR_ABORTED;

[bbudge, 2015/02/12 22:22:09]

This error code just seems odd to me here, as it's usually generated on the
resource side before calling back into the plugin (though I see some precedent
in content/renderer/pepper.) Could a generic PP_ERROR_FAILED also work here?

[llandwerlin-old, 2015/02/13 20:12:25]

Sure.

+  encoder_ = nullptr;
+
+  return PP_OK;
+}
+
+void PepperVideoEncoderHost::RequireBitstreamBuffers(
+    unsigned int frame_count,
+    const gfx::Size& input_coded_size,
+    size_t output_buffer_size) {
+  DCHECK(RenderThreadImpl::current());
+
+  std::vector<SerializedHandle> handles;
+  for (int32_t i = 0; i < kDefaultNumberOfBitstreamBuffers; ++i) {
+    scoped_ptr<base::SharedMemory> shm(
+        RenderThread::Get()
+            ->HostAllocateSharedMemoryBuffer(output_buffer_size)
+            .Pass());
+
+    if (!shm || !shm->Map(output_buffer_size)) {
+      shm_buffers_.clear();
+      break;
+    }
+
+    shm_buffers_.push_back(new ShmBuffer(i, shm.Pass(), output_buffer_size));
+
+    handles.push_back(SerializedHandle(
+        renderer_ppapi_host_->ShareHandleWithRemote(
+            ConvertSharedMemoryHandle(*shm_buffers_.back()->shm), false),
+        output_buffer_size));

[bbudge, 2015/02/12 22:22:10]

You could save a loop by creating the SerializedHandles when you feed them to
the encoder (thus not needing to Close() them if you can't get all the shm
buffers.)

[llandwerlin-old, 2015/02/13 20:12:25]

Nicer indeed.

+  }
+
+  if (shm_buffers_.empty()) {
+    for (SerializedHandle& handle : handles)
+      handle.Close();
+    NotifyPepperError(PP_ERROR_FAILED);

[bbudge, 2015/02/12 22:22:09]

PP_ERROR_NOMEMORY

[llandwerlin-old, 2015/02/13 20:12:25]

Done.

+    return;
+  }
+
+  // Feed buffers to the encoder.
+  for (size_t i = 0; i < shm_buffers_.size(); ++i) {
+    encoder_->UseOutputBitstreamBuffer(shm_buffers_[i]->toBitstreamBuffer());
+  }
+
+  // Notify the plugin of the buffers and the input size.

[bbudge, 2015/02/12 22:22:09]

nit: s/input size/encoding parameters
because there's output_buffer_size, frame_count, and size.
nit: s/size/pp_input_coded_size

[llandwerlin-old, 2015/02/13 20:12:25]

Done.

+  PP_Size size =
+      PP_MakeSize(input_coded_size.width(), input_coded_size.height());
+  input_coded_size_ = input_coded_size;
+  frame_count_ = frame_count;
+  encoder_last_error_ = PP_OK;

[bbudge, 2015/02/12 22:22:09]

I think this should be set in OnHostMsgInitialize() by my earlier comments about
when the encoder is ready.

[llandwerlin-old, 2015/02/13 20:12:25]

Done.

+
+  host()->SendUnsolicitedReplyWithHandles(
+      pp_resource(),
+      PpapiPluginMsg_VideoEncoder_BitstreamBuffers(output_buffer_size,

[bbudge, 2015/02/12 22:22:09]

output_buffer_size is size_t but param is uint32_t.

[llandwerlin-old, 2015/02/13 20:12:25]

Done.

+                                                   frame_count,
+                                                   size),
+      handles);
+}
+
+void PepperVideoEncoderHost::BitstreamBufferReady(int32 buffer_id,
+                                                  size_t payload_size,
+                                                  bool key_frame) {
+  DCHECK(RenderThreadImpl::current());
+  DCHECK(shm_buffers_[buffer_id]->in_use);
+
+  shm_buffers_[buffer_id]->in_use = false;
+  host()->SendUnsolicitedReply(pp_resource(),
+                               PpapiPluginMsg_VideoEncoder_BitstreamBufferReady(
+                                   buffer_id, payload_size, key_frame));
+}
+
+void PepperVideoEncoderHost::NotifyError(
+    media::VideoEncodeAccelerator::Error error) {
+  DCHECK(RenderThreadImpl::current());
+  NotifyPepperError(PP_FromMediaEncodeAcceleratorError(error));
+}
+
+void PepperVideoEncoderHost::GetSupportedProfiles(
+    std::vector<PP_VideoProfileDescription>* pp_profiles) {
+  std::vector<media::VideoEncodeAccelerator::SupportedProfile> profiles =
+      RenderThreadImpl::current()
+          ->GetGpuFactories()
+          ->GetVideoEncodeAcceleratorSupportedProfiles();
+  for (media::VideoEncodeAccelerator::SupportedProfile profile : profiles)
+    pp_profiles->push_back(PP_FromVideoEncodeAcceleratorSupportedProfile(
+        profile, PP_HARDWAREACCELERATION_ONLY));
+
+  // TODO(llandwerlin): add software supported profiles.
+}
+
+bool PepperVideoEncoderHost::IsInitializationValid(
+    const PP_Size& input_size,
+    PP_VideoProfile output_profile,
+    PP_HardwareAcceleration acceleration) {
+  std::vector<PP_VideoProfileDescription> profiles;
+  GetSupportedProfiles(&profiles);
+
+  for (const PP_VideoProfileDescription& profile : profiles) {
+    if (output_profile == profile.profile &&
+        input_size.width <= profile.max_resolution.width &&
+        input_size.height <= profile.max_resolution.height &&
+        PP_HardwareAccelerationCompatible(profile.acceleration, acceleration))
+      return true;
+  }
+
+  return false;
+}
+
+scoped_refptr<media::VideoFrame> PepperVideoEncoderHost::CreateVideoFrame(
+    uint32_t frame_id,
+    const ppapi::host::ReplyMessageContext& reply_context) {
+  DCHECK_LT(frame_id,
+            static_cast<uint32_t>(buffer_manager_.number_of_buffers()));

[bbudge, 2015/02/12 22:22:09]

frame_count_?

[llandwerlin-old, 2015/02/13 20:12:25]

Done.

+
+  ppapi::MediaStreamBuffer* buffer = buffer_manager_.GetBufferPointer(frame_id);

[bbudge, 2015/02/12 22:22:10]

This returns NULL if frame_id is out of range, so you could DCHECK that instead
of your above range check.

[llandwerlin-old, 2015/02/13 20:12:25]

Done.

+  uint32_t shm_offset = frame_id * buffer_manager_.buffer_size() +
+                        sizeof(ppapi::MediaStreamBuffer::Video) -
+                        sizeof(ppapi::MediaStreamBuffer::Video::data);
+
+  return media::VideoFrame::WrapExternalPackedMemory(
+      media_input_format_, input_coded_size_, gfx::Rect(input_coded_size_),
+      input_coded_size_, static_cast<uint8*>(buffer->video.data),
+      buffer->video.data_size, buffer_manager_.shm()->handle(), shm_offset,
+      base::TimeDelta(), base::Bind(
+          &PepperVideoEncoderHost::EncodeDone,
+          weak_ptr_factory_.GetWeakPtr(), reply_context, frame_id));
+}
+
+void PepperVideoEncoderHost::EncodeDone(
+    const ppapi::host::ReplyMessageContext& reply_context,
+    uint32_t frame_id) {
+  DCHECK(RenderThreadImpl::current());
+
+  ppapi::host::ReplyMessageContext context = reply_context;
+  context.params.set_result(encoder_last_error_);

[bbudge, 2015/02/12 22:22:09]

EncodeDone is a confusing to me. Could we rename this FrameReleased or something
that indicates the encoder has returned the frame to us?

[llandwerlin-old, 2015/02/13 20:12:24]

Sure.

+  host()->SendReply(reply_context,
+                    PpapiPluginMsg_VideoEncoder_EncodeReply(frame_id));
+}
+
+void PepperVideoEncoderHost::NotifyPepperError(int32_t error) {
+  DCHECK(RenderThreadImpl::current());
+
+  encoder_last_error_ = error;
+  encoder_ = nullptr;

[bbudge, 2015/02/12 22:22:10]

Close() here instead?

[llandwerlin-old, 2015/02/13 20:12:25]

Done.

+  host()->SendUnsolicitedReply(
+      pp_resource(),
+      PpapiPluginMsg_VideoEncoder_NotifyError(encoder_last_error_));
+}
+
+}  // namespace content