Move screen capturers to remoting/capturer.

remoting/base/util.cc

 // Copyright (c) 2012 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/base/util.h"
 
 #include <math.h>
 
 #include "base/logging.h"
 #include "base/stringprintf.h"
@@ skipping 196 matching lines @@
                   const SkISize& out_size) {
   int left = (rect.left() * out_size.width()) / in_size.width();
   int top = (rect.top() * out_size.height()) / in_size.height();
   int right = (rect.right() * out_size.width() + in_size.width() - 1) /
       in_size.width();
   int bottom = (rect.bottom() * out_size.height() + in_size.height() - 1) /
       in_size.height();
   return SkIRect::MakeLTRB(left, top, right, bottom);
 }
 
-void CopyRect(const uint8* src_plane,
-              int src_plane_stride,
-              uint8* dest_plane,
-              int dest_plane_stride,
-              int bytes_per_pixel,
-              const SkIRect& rect) {
-  // Get the address of the starting point.
-  const int src_y_offset = src_plane_stride * rect.top();
-  const int dest_y_offset = dest_plane_stride * rect.top();
-  const int x_offset = bytes_per_pixel * rect.left();
-  src_plane += src_y_offset + x_offset;
-  dest_plane += dest_y_offset + x_offset;
-
-  // Copy pixels in the rectangle line by line.
-  const int bytes_per_line = bytes_per_pixel * rect.width();
-  const int height = rect.height();
-  for (int i = 0 ; i < height; ++i) {
-    memcpy(dest_plane, src_plane, bytes_per_line);
-    src_plane += src_plane_stride;
-    dest_plane += dest_plane_stride;
-  }
-}
-
 void CopyRGB32Rect(const uint8* source_buffer,
                    int source_stride,
                    const SkIRect& source_buffer_rect,
                    uint8* dest_buffer,
                    int dest_stride,
                    const SkIRect& dest_buffer_rect,
                    const SkIRect& dest_rect) {
   DCHECK(dest_buffer_rect.contains(dest_rect));
   DCHECK(source_buffer_rect.contains(dest_rect));
 
   // Get the address of the starting point.
-  int source_offset = CalculateRGBOffset(dest_rect.x() - source_buffer_rect.x(),
-                                         dest_rect.y() - source_buffer_rect.y(),
-                                         source_stride);
-  int dest_offset = CalculateRGBOffset(dest_rect.x() - dest_buffer_rect.x(),
-                                       dest_rect.y() - dest_buffer_rect.y(),
-                                       source_stride);
+  source_buffer += CalculateRGBOffset(dest_rect.x() - source_buffer_rect.x(),
+                                      dest_rect.y() - source_buffer_rect.y(),
+                                      source_stride);
+  dest_buffer += CalculateRGBOffset(dest_rect.x() - dest_buffer_rect.x(),
+                                    dest_rect.y() - dest_buffer_rect.y(),
+                                    source_stride);
 
-  // Copy bits.
-  CopyRect(source_buffer + source_offset,
-           source_stride,
-           dest_buffer + dest_offset,
-           dest_stride,
-           kBytesPerPixelRGB32,
-           SkIRect::MakeWH(dest_rect.width(), dest_rect.height()));
+  // Copy pixels in the rectangle line by line.
+  const int bytes_per_line = kBytesPerPixelRGB32 * dest_rect.width();
+  for (int i = 0 ; i < dest_rect.height(); ++i) {
+    memcpy(dest_buffer, source_buffer, bytes_per_line);
+    source_buffer += source_stride;
+    dest_buffer += dest_stride;
+  }
 }
 
 std::string ReplaceLfByCrLf(const std::string& in) {
   std::string out;
   out.resize(2 * in.size());
   char* out_p_begin = &out[0];
   char* out_p = out_p_begin;
   const char* in_p_begin = &in[0];
   const char* in_p_end = &in[in.size()];
   for (const char* in_p = in_p_begin; in_p < in_p_end; ++in_p) {
@@ skipping 53 matching lines @@
       }
 
       ++ptr;
     }
   }
 
   return true;
 }
 
 }  // namespace remoting