Implement video renderer based on VideoDecode API.

remoting/client/plugin/pepper_video_renderer_3d.cc

Index: remoting/client/plugin/pepper_video_renderer_3d.cc
diff --git a/remoting/client/plugin/pepper_video_renderer_3d.cc b/remoting/client/plugin/pepper_video_renderer_3d.cc
new file mode 100644
index 0000000000000000000000000000000000000000..eaff78e65b6393a53c0e35a2825f2ee6a5b70f57
--- /dev/null
+++ b/remoting/client/plugin/pepper_video_renderer_3d.cc
@@ -0,0 +1,497 @@
+// Copyright 2014 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 "remoting/client/plugin/pepper_video_renderer_3d.h"
+
+#include <math.h>
+
+#include "base/callback_helpers.h"
+#include "base/stl_util.h"
+#include "ppapi/c/pp_codecs.h"
+#include "ppapi/c/ppb_opengles2.h"
+#include "ppapi/cpp/instance.h"
+#include "ppapi/lib/gl/include/GLES2/gl2ext.h"
+#include "remoting/proto/video.pb.h"
+#include "remoting/protocol/session_config.h"
+
+namespace remoting {
+
+class PepperVideoRenderer3D::PendingPacket {
+ public:
+  PendingPacket(scoped_ptr<VideoPacket> packet, const base::Closure& done)
+      : packet_(packet.Pass()),
+        done_runner_(done) {
+  }
+
+  ~PendingPacket() {}
+
+  const VideoPacket* packet() const { return packet_.get(); }
+
+ private:
+  scoped_ptr<VideoPacket> packet_;
+  base::ScopedClosureRunner done_runner_;
+};
+
+PepperVideoRenderer3D::FrameDecodeTimer::FrameDecodeTimer(
+    uint32_t frame_id,
+    base::TimeTicks decode_started_time)
+    : frame_id(frame_id), decode_started_time(decode_started_time) {
+}
+
+PepperVideoRenderer3D::PepperVideoRenderer3D()
+    : event_handler_(nullptr),
+      view_width_(0),
+      view_height_(0),
+      latest_sequence_number_(0),
+      initialized_(false),
+      decode_pending_(false),
+      get_picture_pending_(false),
+      paint_pending_(false),
+      last_frame_id_(0),
+      need_repaint_(false),
+      current_shader_program_texture_target_(0),
+      shader_program_(0),
+      shader_texcoord_scale_location_(0),
+      callback_factory_(this) {
+}
+
+PepperVideoRenderer3D::~PepperVideoRenderer3D() {
+  RecyclePictures(false);
+
+  if (shader_program_)
+    gles2_if_->DeleteProgram(graphics_.pp_resource(), shader_program_);
+
+  STLDeleteElements(&pending_packets_);
+}
+
+bool PepperVideoRenderer3D::Initialize(pp::Instance* instance,
+                                       const ClientContext& context,
+                                       EventHandler* event_handler) {
+  DCHECK(event_handler);
+  DCHECK(!event_handler_);
+
+  event_handler_ = event_handler;
+
+  const int32_t context_attributes[] = {
+      PP_GRAPHICS3DATTRIB_ALPHA_SIZE,     8,
+      PP_GRAPHICS3DATTRIB_BLUE_SIZE,      8,
+      PP_GRAPHICS3DATTRIB_GREEN_SIZE,     8,
+      PP_GRAPHICS3DATTRIB_RED_SIZE,       8,
+      PP_GRAPHICS3DATTRIB_DEPTH_SIZE,     0,
+      PP_GRAPHICS3DATTRIB_STENCIL_SIZE,   0,
+      PP_GRAPHICS3DATTRIB_SAMPLES,        0,
+      PP_GRAPHICS3DATTRIB_SAMPLE_BUFFERS, 0,
+      PP_GRAPHICS3DATTRIB_WIDTH,          1,
+      PP_GRAPHICS3DATTRIB_HEIGHT,         1,

[Wez, 2014/12/24 17:11:15]

Are you sure that 1x1 is always supported by Graphics3D? e.g. do some GLES impls
have issues with particular context sizes, perhaps?

[Sergey Ulanov, 2015/01/06 01:16:32]

changed this to 640x480

+      PP_GRAPHICS3DATTRIB_NONE,
+  };
+  graphics_ = pp::Graphics3D(instance, context_attributes);
+
+  if (graphics_.is_null()) {
+    LOG(WARNING) << "Graphics3D interface is not available.";
+    return false;
+  }
+  if (!instance->BindGraphics(graphics_)) {

[Wez, 2014/12/24 17:11:14]

Do we need to tear-down and re-create/re-bind things when the size of the view
changes?

[Sergey Ulanov, 2015/01/06 01:16:32]

No. Graphics3D.ResizeBuffers() allows to change the size dynamically. (if it
didn't it would be be big PITA to handle resizes, as we would have to
reinitialize the decoder somehow with the new context).

[Wez, 2015/01/06 22:17:10]

Agreed! I vaguely recalled that the example seemed to do that, though.

+    LOG(WARNING) << "Failed to bind Graphics3D.";
+    return false;
+  }
+
+  // Fetch the GLES2 interface to use to render frames.
+  gles2_if_ = static_cast<const PPB_OpenGLES2*>(
+      pp::Module::Get()->GetBrowserInterface(PPB_OPENGLES2_INTERFACE));
+  CHECK(gles2_if_);
+
+  video_decoder_ = pp::VideoDecoder(instance);
+  if (video_decoder_.is_null()) {
+    LOG(WARNING) << "VideoDecoder interface is not available.";
+    return false;
+  }
+
+  PP_Resource graphics_3d = graphics_.pp_resource();
+
+  gles2_if_->ClearColor(graphics_3d, 1, 0, 0, 1);
+  gles2_if_->Clear(graphics_3d, GL_COLOR_BUFFER_BIT);
+
+  // Assign vertex positions and texture coordinates to buffers for use in
+  // shader program.
+  static const float kVertices[] = {
+      -1, -1, -1, 1, 1, -1, 1, 1,  // Position coordinates.
+      0,  1,  0,  0, 1, 1,  1, 0,  // Texture coordinates.
+  };
+
+  GLuint buffer;
+  gles2_if_->GenBuffers(graphics_3d, 1, &buffer);
+  gles2_if_->BindBuffer(graphics_3d, GL_ARRAY_BUFFER, buffer);
+  gles2_if_->BufferData(graphics_3d, GL_ARRAY_BUFFER, sizeof(kVertices),
+                        kVertices, GL_STATIC_DRAW);
+
+  CheckGLError();
+
+  return true;
+}
+
+void PepperVideoRenderer3D::OnViewChanged(const pp::View& view) {
+  pp::Size size = view.GetRect().size();
+  float scale = view.GetDeviceScale();
+  view_width_ = ceilf(size.width() * scale);
+  view_height_ = ceilf(size.height() * scale);
+  graphics_.ResizeBuffers(view_width_, view_height_);
+
+  need_repaint_ = true;
+  DoPaint();
+}
+
+void PepperVideoRenderer3D::OnSessionConfig(
+    const protocol::SessionConfig& config) {
+  PP_VideoProfile video_profile = PP_VIDEOPROFILE_VP8_ANY;
+  switch (config.video_config().codec) {
+    case protocol::ChannelConfig::CODEC_VP8:
+      video_profile = PP_VIDEOPROFILE_VP8_ANY;
+      break;
+    case protocol::ChannelConfig::CODEC_VP9:
+      video_profile = PP_VIDEOPROFILE_VP9_ANY;
+      break;
+    default:
+      NOTREACHED();

[Wez, 2014/12/24 17:11:15]

This means we're defaulting to VP8_ANY; consider triggering the
OnVideoDecodeFailed notification directly in this case, instead, since there is
no always-bad PP_VideoProfile value that we can set here.

[Sergey Ulanov, 2015/01/06 01:16:33]

Protocol should not allow any codec other than VP8 or VP9, so this case can only
be reached if there is a bug in the handshake code. So I think NOTREACHED() is
appropriate here.

+  }
+  int32_t result = video_decoder_.Initialize(
+      graphics_, video_profile, PP_HARDWAREACCELERATION_WITHFALLBACK,
+      callback_factory_.NewCallback(&PepperVideoRenderer3D::OnInitialized));
+  CHECK_EQ(result, PP_OK_COMPLETIONPENDING)
+      << "video_decoder_.Initialize() returned " << result;

[Wez, 2014/12/24 17:11:14]

Strictly we should be coping with not-supported as a return-value here; probably
worth adding a comment to clarify that we assume VP8 & VP9 are not going away
any time soon.

[Sergey Ulanov, 2015/01/06 01:16:32]

We always expect PP_OK_COMPLETIONPENDING here because the callback is not
optional. Non-supported codec would need to be handled in OnInitialized(). Added
a comment there.

+}
+
+ChromotingStats* PepperVideoRenderer3D::GetStats() {
+  return &stats_;
+}
+
+void PepperVideoRenderer3D::ProcessVideoPacket(scoped_ptr<VideoPacket> packet,
+                                               const base::Closure& done) {
+  base::ScopedClosureRunner done_runner(done);
+
+  // Don't need to do anything if the packet is empty. Host sends empty video
+  // packets when the screen is not changing.
+  if (!packet->data().size())
+    return;
+
+  // Update statistics.
+  stats_.video_frame_rate()->Record(1);
+  stats_.video_bandwidth()->Record(packet->data().size());
+  if (packet->has_capture_time_ms())
+    stats_.video_capture_ms()->Record(packet->capture_time_ms());
+  if (packet->has_encode_time_ms())
+    stats_.video_encode_ms()->Record(packet->encode_time_ms());
+  if (packet->has_client_sequence_number() &&
+      packet->client_sequence_number() > latest_sequence_number_) {
+    latest_sequence_number_ = packet->client_sequence_number();
+    base::TimeDelta round_trip_latency =
+        base::Time::Now() -
+        base::Time::FromInternalValue(packet->client_sequence_number());
+    stats_.round_trip_ms()->Record(round_trip_latency.InMilliseconds());
+  }
+
+  webrtc::DesktopSize frame_size(packet->format().screen_width(),
+                                 packet->format().screen_height());
+  webrtc::DesktopVector frame_dpi(packet->format().x_dpi(),
+                                  packet->format().y_dpi());
+  if ((!frame_size.is_empty() && !frame_size_.equals(frame_size)) ||

[Wez, 2014/12/24 17:11:14]

Feels like |frame_size.is_empty()| is a different special-case to the others;
should it even be a case that we early-return, or even CHECK() for?

[Sergey Ulanov, 2015/01/06 01:16:32]

Done.

+      !frame_dpi_.equals(frame_dpi)) {
+    frame_dpi_ = frame_dpi;
+    event_handler_->OnVideoSize(frame_size, frame_dpi);
+  }
+
+  // Update the desktop shape region.
+  webrtc::DesktopRegion desktop_shape;
+  if (packet->has_use_desktop_shape()) {

[Wez, 2014/12/24 17:11:14]

nit: You also need to check that use_desktop_shape, if set, is actually set to
True. However, if it's not set then its default value will be false, so I think
"if (packet->use_desktop_shape())" should suffice.

[Sergey Ulanov, 2015/01/06 01:16:32]

This code is equivalent to what we have in VideoDecoderVpx::DecodePacket(). I
think it's better to fix it in both places in a separate CL.

[Wez, 2015/01/06 22:17:10]

Acknowledged.

+    for (int i = 0; i < packet->desktop_shape_rects_size(); ++i) {
+      Rect remoting_rect = packet->desktop_shape_rects(i);
+      desktop_shape.AddRect(webrtc::DesktopRect::MakeXYWH(
+          remoting_rect.x(), remoting_rect.y(),
+          remoting_rect.width(), remoting_rect.height()));
+    }
+  } else {
+    // Fallback for the case when the host didn't include the desktop shape.
+    desktop_shape =
+        webrtc::DesktopRegion(webrtc::DesktopRect::MakeSize(frame_size));

[Wez, 2014/12/24 17:11:15]

nit: This means that unless the remote peer sends the desktop shape with every
VideoPacket then the shape will snap back to being rectangular, which isn't
really how the shape field was intended to be used, though I see that that's
what we also have implemented in the VPX decoder. :-/

[Sergey Ulanov, 2015/01/06 01:16:32]

Exactly. It doesn't look right, but it's not related to this CL. I've opened
crbug.com/446288 to address it.

[Wez, 2015/01/06 22:17:10]

Acknowledged.

+  }
+
+  if (!desktop_shape_.Equals(desktop_shape)) {
+    desktop_shape_.Swap(&desktop_shape);
+    event_handler_->OnVideoShape(desktop_shape_);
+  }
+
+  pending_packets_.push_back(
+      new PendingPacket(packet.Pass(), done_runner.Release()));
+  DoDecode();
+}
+
+void PepperVideoRenderer3D::OnInitialized(int32_t result) {
+  CHECK_EQ(result, PP_OK) << "VideoDecoder::Initialize() failed";

[Wez, 2014/12/24 17:11:14]

Cope gracefully with initialization errors here?

[Sergey Ulanov, 2015/01/06 01:16:32]

I think we can assume that we can always initialize the decoder, because VP8 and
VP9 should always be supported. Added a comment

[Wez, 2015/01/06 22:17:10]

Acknowledged.

+  initialized_ = true;
+  DoDecode();

[Wez, 2014/12/24 17:11:15]

nit: Add a brief comment to clarify why we start the decode process here.

[Sergey Ulanov, 2015/01/06 01:16:33]

Done.

+}
+
+void PepperVideoRenderer3D::DoGetPicture() {

[Wez, 2014/12/24 17:11:14]

Move this method down to appear immediately before OnPictureReady, to aid
readability?

[Sergey Ulanov, 2015/01/06 01:16:31]

Done.

+  if (get_picture_pending_)
+    return;
+
+  int32_t result =
+      video_decoder_.GetPicture(callback_factory_.NewCallbackWithOutput(
+          &PepperVideoRenderer3D::OnPictureReady));
+  CHECK_EQ(result, PP_OK_COMPLETIONPENDING);

[Wez, 2014/12/24 17:11:14]

nit: Cope gracefully w/ errors here?

[Sergey Ulanov, 2015/01/06 01:16:31]

We always expect PP_OK_COMPLETIONPENDING here because the callback is not
optional. Getting anything else here would indicated a bug in the browser.

+  get_picture_pending_ = true;
+}
+
+void PepperVideoRenderer3D::DoDecode() {
+  if (!initialized_ || decode_pending_ || pending_packets_.empty())
+    return;
+
+  ++last_frame_id_;
+  frames_decode_timers_.push_back(
+      FrameDecodeTimer(last_frame_id_, base::TimeTicks::Now()));

[Wez, 2014/12/24 17:11:14]

Since you can only ever have a single decode operation in-progress at any one
time, and 

[Sergey Ulanov, 2015/01/06 01:16:33]

looks like this comment was cropped somehow.

+
+  const VideoPacket* packet = pending_packets_.front()->packet();
+
+  int32_t result = video_decoder_.Decode(
+      last_frame_id_, packet->data().size(), packet->data().data(),

[Wez, 2014/12/24 17:11:14]

nit: The Decode() API unfortunately doesn't specify whether it copies the
supplied data before returning; I assume that in general it's best to assume
that it does not, but in that case the API docs should be updated to clarify
that point.

[Sergey Ulanov, 2015/01/06 01:16:32]

It does copy the data and it's documented:
https://code.google.com/p/chromium/codesearch#chromium/src/ppapi/cpp/video_de...
We keep the packet until OnDecodeDone() is called.

[Wez, 2015/01/06 22:17:09]

If it copies the data then we don't need to keep the packet around until
OnDecodeDone(), though, was my point. :)

[Sergey Ulanov, 2015/01/07 19:37:30]

Ah, I see. Yes, it's not clear. I think it's better assume that it copies the
data before completion, e.g. before the callback is called, but not necessarily
before returning.

+      callback_factory_.NewCallback(&PepperVideoRenderer3D::OnDecodeDone));
+  CHECK_EQ(result, PP_OK_COMPLETIONPENDING);

[Wez, 2014/12/24 17:11:14]

The docs on GetPicture imply that Decode() could return PP_OK; this should
probably be "proper" error handling where we signal OnVideoDecodeError rather
than crashing. :)

[Sergey Ulanov, 2015/01/06 01:16:32]

The callback is not optional, so we always expect PP_OK_COMPLETIONPENDING here
and OnDecodeDone() to be called asynchronously

[Wez, 2015/01/06 22:17:10]

Acknowledged.

+  decode_pending_ = true;
+}
+
+void PepperVideoRenderer3D::OnDecodeDone(int32_t result) {
+  decode_pending_ = false;

[Wez, 2014/12/24 17:11:14]

nit: DCHECK(decode_pending_)?

[Sergey Ulanov, 2015/01/06 01:16:32]

Done.

+
+  if (result != PP_OK) {
+    LOG(ERROR) << "VideoDecoder::Decode() returned " << result;
+    event_handler_->OnVideoDecoderFailed();
+    return;
+  }
+
+  delete pending_packets_.front();
+  pending_packets_.pop_front();
+
+  DoDecode();
+  DoGetPicture();
+}
+
+void PepperVideoRenderer3D::OnPictureReady(int32_t result,
+                                           PP_VideoPicture picture) {
+  get_picture_pending_ = false;

[Wez, 2014/12/24 17:11:14]

nit: DCHECK(get_picture_pending_)

[Sergey Ulanov, 2015/01/06 01:16:32]

Done.

+
+  if (result == PP_ERROR_ABORTED)

[Wez, 2014/12/24 17:11:15]

What does PP_ERROR_ABORTED actually mean? Should we be throwing the error
notification in that case as well? If this is only generated when we ask the API
to cancel decoding then perhaps add a brief comment to explain that here.

[Sergey Ulanov, 2015/01/06 01:16:33]

GetPicture() may be aborted when the pp::VideoDecoder::Reset() is called, but we
never need to reset the decoder, so I've removed this check.

[Wez, 2015/01/06 22:17:10]

Acknowledged.

+    return;
+
+  if (result != PP_OK) {
+    LOG(ERROR) << "VideoDecoder::GetPicture() returned " << result;
+    event_handler_->OnVideoDecoderFailed();
+    return;
+  }
+
+  CHECK(!frames_decode_timers_.empty());

[Wez, 2014/12/24 17:11:15]

Do you need this check? If it's violated then front() will return a
not-dereferencable value and crash us, won't it?

[Sergey Ulanov, 2015/01/06 01:16:31]

front() behavior is undefined when the list is empty, so there is no guarantee
that it will crash below in that case.

+  const FrameDecodeTimer& frame_timer = frames_decode_timers_.front();
+  DCHECK_EQ(picture.decode_id, frame_timer.frame_id);

[Wez, 2014/12/24 17:11:15]

This check will fail if we receive a packet that does not result in a frame,
since we'll get out-of-sync with the |frame_decode_timers_| queue - in that case
we'll crash in a debug build and return bogus numbers in release builds. I think
it'd be better to always return some obviously-bogus value in this case, and to
log something obvious since that's not a behaviour we expect streams generated
by current hosts to trigger.

[Sergey Ulanov, 2015/01/06 01:16:31]

If picture.decode_id != frame_timer.frame_id it means that the buffer that we
passed to Decode() didn't contain full frame. So this should be treated as a
protocol error. Replaced this DCHECK with a OnVideoDecodeError() call.

+  stats_.video_decode_ms()->Record(
+      (base::TimeTicks::Now() - frame_timer.decode_started_time)

[Wez, 2014/12/24 17:11:14]

nit: Suggest calculating this into a const base::TimeTicks local variable, to
aid readability.

[Sergey Ulanov, 2015/01/06 01:16:33]

Done.

+          .InMilliseconds());
+  frames_decode_timers_.pop_front();
+
+  // Recycle all pending pictures, but keep the first one if it's still being
+  // painted.
+  RecyclePictures(paint_pending_);
+  pending_pictures_.push_back(picture);
+  need_repaint_ = true;
+
+  DoPaint();
+  DoGetPicture();
+}
+
+void PepperVideoRenderer3D::RecyclePictures(bool keep_first) {

[Wez, 2014/12/24 17:11:15]

It looks like this only keeps the first if |keep_first| is true, which isn't
what the comment on the picture queue member says, in the header - that comment
implies that we always keep the most recent picture ready so that we can
re-paint it if need be? 

[Sergey Ulanov, 2015/01/06 01:16:32]

Removed this method.

+  std::vector<PP_VideoPicture>::iterator it = pending_pictures_.begin();
+  if (keep_first)
+    ++it;

[Wez, 2014/12/24 17:11:15]

This is keeping the first, i.e. the _next_ picture, rather than the
most-recently-queued one - is that what you intended?

[Sergey Ulanov, 2015/01/06 01:16:31]

Yes. The first picture is the one being rendered, and we want to keep it until
rendering is finished.

+
+  while (it != pending_pictures_.end()) {
+    video_decoder_.RecyclePicture(*it);
+    it = pending_pictures_.erase(it);
+  }
+}
+
+void PepperVideoRenderer3D::DoPaint() {
+  if (paint_pending_ || !need_repaint_ || pending_pictures_.empty())

[Wez, 2014/12/24 17:11:15]

This logic means that if |need_repaint_| is false then we'll early-exit without
doing anything, even if |pending_pictures_| contains more content to paint - is
that what you intend?

It seems to me that it is, because you always keep the frontmost frame in the
queue when you paint, but that approach seems to complicate matters; consider
keeping just two PP_VideoPicture members in this class, one to hold the
currently-being-painted picture, and one to hold the next one to paint, if any -
I think that will make some of this logic clearer, and you can then do away with
|needs_repaint_|.

[Sergey Ulanov, 2015/01/06 01:16:32]

After the first frame is received pending_pictures_ is never empty. We always
keep one 
frame in case it needs to be repainted when resizing.
Removed |pending_pictures_| queue, but I think we still need |need_repaint_| for
the case when view size changes while paint is pending and there is no another
frame in the queue.

[Wez, 2015/01/06 22:17:10]

Yes, although you could make it an explicit was_resized_ flag, or a
force_repaint_ flag, so that PaintIfNeeded(0 repaints if there is a new frame OR
if force_repaint_ is set - then there's no need for a new picture to set
needs_repaint_.

[Sergey Ulanov, 2015/01/07 19:37:30]

Replaced need_repaint_ with force_repaint_

+    return;
+
+  need_repaint_ = false;
+  last_paint_started_time_ = base::TimeTicks::Now();
+
+  const PP_VideoPicture& picture = pending_pictures_.front();
+  PP_Resource graphics_3d = graphics_.pp_resource();
+
+  EnsureProgramForTexture(picture.texture_target);
+
+  gles2_if_->UseProgram(graphics_3d, shader_program_);
+  if (picture.texture_target == GL_TEXTURE_RECTANGLE_ARB) {
+    gles2_if_->Uniform2f(graphics_3d, shader_texcoord_scale_location_,
+                         static_cast<GLfloat>(picture.texture_size.width),
+                         static_cast<GLfloat>(picture.texture_size.height));
+  } else {
+    gles2_if_->Uniform2f(
+        graphics_3d, shader_texcoord_scale_location_, 1.0, 1.0);
+  }
+
+  // Set viewport position & dimensions.
+  gles2_if_->Viewport(graphics_3d, 0, 0, view_width_, view_height_);
+
+  // Select the texture unit GL_TEXTURE0.
+  gles2_if_->ActiveTexture(graphics_3d, GL_TEXTURE0);
+
+  // Select the texture.
+  gles2_if_->BindTexture(graphics_3d, picture.texture_target,
+                         picture.texture_id);
+
+  // Select linear filter in case the texture needs to be scaled.
+  gles2_if_->TexParameteri(graphics_3d, picture.texture_target,
+                           GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+
+  // Render texture by drawing a triangle strip with 4 vertices.
+  gles2_if_->DrawArrays(graphics_3d, GL_TRIANGLE_STRIP, 0, 4);
+
+  CheckGLError();
+
+  // Request PPAPI display the queue texture.

[Wez, 2014/12/24 17:11:15]

typo: queued

[Sergey Ulanov, 2015/01/06 01:16:33]

Done.

+  int32_t result = graphics_.SwapBuffers(
+      callback_factory_.NewCallback(&PepperVideoRenderer3D::OnPaintDone));
+  CHECK_EQ(result, PP_OK_COMPLETIONPENDING);
+  paint_pending_ = true;
+}
+
+void PepperVideoRenderer3D::OnPaintDone(int32_t result) {
+  CHECK_EQ(result, PP_OK) << "Graphics3D::SwapBuffers() failed";
+
+  paint_pending_ = false;
+  stats_.video_paint_ms()->Record(
+      (base::TimeTicks::Now() - last_paint_started_time_).InMilliseconds());

[Wez, 2014/12/24 17:11:14]

nit: See above; consider doing the subtraction into a suitably named local
variable, for clarity.

[Sergey Ulanov, 2015/01/06 01:16:32]

Done.

+
+  if (pending_pictures_.size() > 1) {
+    video_decoder_.RecyclePicture(pending_pictures_.front());
+    pending_pictures_.erase(pending_pictures_.begin());
+    need_repaint_ = true;
+  }
+
+  DoPaint();
+}
+
+void PepperVideoRenderer3D::EnsureProgramForTexture(uint32_t texture_target) {
+  static const char kVertexShader[] =
+      "varying vec2 v_texCoord;            \n"
+      "attribute vec4 a_position;          \n"
+      "attribute vec2 a_texCoord;          \n"
+      "uniform vec2 v_scale;               \n"
+      "void main()                         \n"
+      "{                                   \n"
+      "    v_texCoord = v_scale * a_texCoord; \n"
+      "    gl_Position = a_position;       \n"
+      "}";
+
+  static const char kFragmentShader2D[] =
+      "precision mediump float;            \n"
+      "varying vec2 v_texCoord;            \n"
+      "uniform sampler2D s_texture;        \n"
+      "void main()                         \n"
+      "{"
+      "    gl_FragColor = texture2D(s_texture, v_texCoord); \n"
+      "}";
+
+  static const char kFragmentShaderRectangle[] =
+      "#extension GL_ARB_texture_rectangle : require\n"
+      "precision mediump float;            \n"
+      "varying vec2 v_texCoord;            \n"
+      "uniform sampler2DRect s_texture;    \n"
+      "void main()                         \n"
+      "{"
+      "    gl_FragColor = texture2DRect(s_texture, v_texCoord).rgba; \n"
+      "}";
+
+  static const char kFragmentShaderExternal[] =
+      "#extension GL_OES_EGL_image_external : require\n"
+      "precision mediump float;            \n"
+      "varying vec2 v_texCoord;            \n"
+      "uniform samplerExternalOES s_texture; \n"
+      "void main()                         \n"
+      "{"
+      "    gl_FragColor = texture2D(s_texture, v_texCoord); \n"
+      "}";
+
+  // Initialize shader program only if texture type has changed.
+  if (current_shader_program_texture_target_ != texture_target) {
+    current_shader_program_texture_target_ = texture_target;
+
+    if (texture_target == GL_TEXTURE_2D) {
+      CreateProgram(kVertexShader, kFragmentShader2D);
+    } else if (texture_target == GL_TEXTURE_RECTANGLE_ARB) {
+      CreateProgram(kVertexShader, kFragmentShaderRectangle);
+    } else if (texture_target == GL_TEXTURE_EXTERNAL_OES) {
+      CreateProgram(kVertexShader, kFragmentShaderExternal);
+    } else {
+      CHECK(false);

[Wez, 2014/12/24 17:11:15]

Suggest NOTREACHED() or LOG(FATAL)

[Sergey Ulanov, 2015/01/06 01:16:33]

Done.

+    }
+  }
+}
+
+void PepperVideoRenderer3D::CreateProgram(const char* vertex_shader,
+                                          const char* fragment_shader) {
+  PP_Resource graphics_3d = graphics_.pp_resource();
+  if (shader_program_)
+    gles2_if_->DeleteProgram(graphics_3d, shader_program_);
+
+  // Create shader program.
+  shader_program_ = gles2_if_->CreateProgram(graphics_3d);
+  CreateShaderProgram(GL_VERTEX_SHADER, vertex_shader);
+  CreateShaderProgram(GL_FRAGMENT_SHADER, fragment_shader);
+  gles2_if_->LinkProgram(graphics_3d, shader_program_);
+  gles2_if_->UseProgram(graphics_3d, shader_program_);
+  gles2_if_->Uniform1i(
+      graphics_3d,
+      gles2_if_->GetUniformLocation(graphics_3d, shader_program_, "s_texture"),
+      0);
+  CheckGLError();
+
+  shader_texcoord_scale_location_ = gles2_if_->GetUniformLocation(
+      graphics_3d, shader_program_, "v_scale");
+
+  GLint pos_location = gles2_if_->GetAttribLocation(
+      graphics_3d, shader_program_, "a_position");
+  GLint tc_location = gles2_if_->GetAttribLocation(
+      graphics_3d, shader_program_, "a_texCoord");
+  CheckGLError();
+
+  // Construct the vertex array for DrawArrays(), using the buffer created in
+  // Initialize().
+  gles2_if_->EnableVertexAttribArray(graphics_3d, pos_location);
+  gles2_if_->VertexAttribPointer(graphics_3d, pos_location, 2, GL_FLOAT,
+                                 GL_FALSE, 0, 0);
+  gles2_if_->EnableVertexAttribArray(graphics_3d, tc_location);
+  gles2_if_->VertexAttribPointer(
+      graphics_3d, tc_location, 2, GL_FLOAT, GL_FALSE, 0,
+      static_cast<float*>(0) + 8);  // Skip position coordinates.
+
+  gles2_if_->UseProgram(graphics_3d, 0);
+
+  CheckGLError();
+}
+
+void PepperVideoRenderer3D::CreateShaderProgram(int type, const char* source) {
+  int size = strlen(source);
+  GLuint shader = gles2_if_->CreateShader(graphics_.pp_resource(), type);
+  gles2_if_->ShaderSource(graphics_.pp_resource(), shader, 1, &source, &size);
+  gles2_if_->CompileShader(graphics_.pp_resource(), shader);
+  gles2_if_->AttachShader(graphics_.pp_resource(), shader_program_, shader);
+  gles2_if_->DeleteShader(graphics_.pp_resource(), shader);
+}

[Wez, 2014/12/24 17:11:15]

nit: Blank line

[Sergey Ulanov, 2015/01/06 01:16:32]

Done.

+void PepperVideoRenderer3D::CheckGLError() {
+  GLenum error = gles2_if_->GetError(graphics_.pp_resource());
+  CHECK_EQ(error, static_cast<GLenum>(GL_NO_ERROR)) << "GL error: " << error;
+}
+
+}  // namespace remoting