[Remoting Android] Cursor & Cursor Feedback for OpenGL Renderer

remoting/client/gl_render_layer.cc

 // Copyright 2016 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/gl_render_layer.h"
 
 #include "base/logging.h"
 #include "remoting/client/gl_canvas.h"
 #include "remoting/client/gl_helpers.h"
-#include "third_party/webrtc/modules/desktop_capture/desktop_frame.h"
 
 namespace {

[Sergey Ulanov, 2016/07/21 19:28:48]

nit: if you put this inside the remoting namespace below then you wouldn't need
remoting:: to reference GlRendererLayer.

[Yuwei, 2016/07/21 19:53:04]

Then they are out of the anonymous namespace? I'm not quite understand in
general why we need to use anonymous namespace though...

[Sergey Ulanov, 2016/07/21 20:14:15]

namespace remoting {

namespace {

void foo() {
 // Can access remoting namespace directly here.
}

}  // namespace 

}  // namespace remoting

[Sergey Ulanov, 2016/07/21 20:17:14]

See https://google.github.io/styleguide/cppguide.html#Namespaces .
It allows to avoid conflicts when you have a static functions in different files
in global namespace. It's also to make it clear that these functions/constants
are not used outside of this file.

[Yuwei, 2016/07/21 21:44:42]

Done.

 
 // Assign texture coordinates to buffers for use in shader program.
 const float kVertices[] = {
     // Points order: upper-left, bottom-left, upper-right, bottom-right.
 
     // Positions to draw the texture on the normalized canvas coordinate.
     0, 0, 0, 1, 1, 0, 1, 1,
 
     // Region of the texture to be used (normally the whole texture).
     0, 0, 0, 1, 1, 0, 1, 1};
 
 const int kDefaultUpdateBufferCapacity =
-    2048 * 2048 * webrtc::DesktopFrame::kBytesPerPixel;
+    2048 * 2048 * remoting::GlRenderLayer::kBytesPerPixelRGB32;
 
 }
 
 namespace remoting {
 
 GlRenderLayer::GlRenderLayer(int texture_id, GlCanvas* canvas)
     : texture_id_(texture_id), canvas_(canvas) {
   texture_handle_ = CreateTexture();
   buffer_handle_ = CreateBuffer(kVertices, sizeof(kVertices));
 }
 
 GlRenderLayer::~GlRenderLayer() {
   DCHECK(thread_checker_.CalledOnValidThread());
   glDeleteBuffers(1, &buffer_handle_);
   glDeleteTextures(1, &texture_handle_);
 }
 
 void GlRenderLayer::SetTexture(const uint8_t* texture, int width, int height) {
   DCHECK(thread_checker_.CalledOnValidThread());
   CHECK(width > 0 && height > 0);
   texture_set_ = true;
   glActiveTexture(GL_TEXTURE0 + texture_id_);
   glBindTexture(GL_TEXTURE_2D, texture_handle_);
 
   glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA,
                GL_UNSIGNED_BYTE, texture);
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 
   glBindTexture(GL_TEXTURE_2D, 0);
 }
 
 void PackDirtyRegion(uint8_t* dest,

[Sergey Ulanov, 2016/07/21 19:28:48]

Move this to the anonymous namespace.

[Yuwei, 2016/07/21 21:44:42]

Done.

                      const uint8_t* source,
                      int width,
                      int height,
                      int stride) {
   for (int i = 0; i < height; i++) {
-    memcpy(dest, source, width * webrtc::DesktopFrame::kBytesPerPixel);
+    memcpy(dest, source, width * GlRenderLayer::kBytesPerPixelRGB32);
     source += stride;
-    dest += webrtc::DesktopFrame::kBytesPerPixel * width;
+    dest += GlRenderLayer::kBytesPerPixelRGB32 * width;
   }
 }
 
 void GlRenderLayer::UpdateTexture(const uint8_t* subtexture,
                                   int offset_x,
                                   int offset_y,
                                   int width,
                                   int height,
                                   int stride) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(texture_set_);
   DCHECK(width > 0 && height > 0);
   glActiveTexture(GL_TEXTURE0 + texture_id_);
   glBindTexture(GL_TEXTURE_2D, texture_handle_);
 
-  bool stride_multiple_of_bytes_per_pixel =
-      stride % webrtc::DesktopFrame::kBytesPerPixel == 0;
+  bool stride_multiple_of_bytes_per_pixel = stride % kBytesPerPixelRGB32 == 0;
   bool loosely_packed =
       !stride_multiple_of_bytes_per_pixel ||
-      (stride > 0 && stride != webrtc::DesktopFrame::kBytesPerPixel * width);
+      (stride > 0 && stride != kBytesPerPixelRGB32 * width);
 
   const void* buffer_to_update = subtexture;
 
   if (loosely_packed) {
     if (stride_multiple_of_bytes_per_pixel && canvas_->GetGlVersion() >= 3) {
-      glPixelStorei(GL_UNPACK_ROW_LENGTH,
-                    stride / webrtc::DesktopFrame::kBytesPerPixel);
+      glPixelStorei(GL_UNPACK_ROW_LENGTH, stride / kBytesPerPixelRGB32);
     } else {
       // Doesn't support GL_UNPACK_ROW_LENGTH or stride not multiple of
       // kBytesPerPixel. Manually pack the data.
-      int required_size = width * height * webrtc::DesktopFrame::kBytesPerPixel;
+      int required_size = width * height * kBytesPerPixelRGB32;
       if (update_buffer_size_ < required_size) {
         if (required_size < kDefaultUpdateBufferCapacity) {
           update_buffer_size_ = kDefaultUpdateBufferCapacity;
         } else {
           update_buffer_size_ = required_size;
         }
         update_buffer_.reset(new uint8_t[update_buffer_size_]);
       }
       PackDirtyRegion(update_buffer_.get(), subtexture, width, height, stride);
       buffer_to_update = update_buffer_.get();
@@ skipping 19 matching lines @@
 
 void GlRenderLayer::SetTextureVisibleArea(
     const std::array<float, 8>& positions) {
   DCHECK(thread_checker_.CalledOnValidThread());
   glBindBuffer(GL_ARRAY_BUFFER, buffer_handle_);
   glBufferSubData(GL_ARRAY_BUFFER, sizeof(kVertices) / 2, sizeof(kVertices) / 2,
                   positions.data());
   glBindBuffer(GL_ARRAY_BUFFER, 0);
 }
 
-void GlRenderLayer::Draw() {
+void GlRenderLayer::Draw(float alpha_multiplier) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(texture_set_);
-  canvas_->DrawTexture(texture_id_, texture_handle_, buffer_handle_);
+  canvas_->DrawTexture(texture_id_, texture_handle_, buffer_handle_,
+                       alpha_multiplier);
 }
 
 }  // namespace remoting