Move screen capturers from remoting/capturer to media/video/capturer/screen

remoting/codec/video_encoder_vp8.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/codec/video_encoder_vp8.h"
 
 #include "base/logging.h"
 #include "base/sys_info.h"
 #include "base/time.h"
 #include "media/base/yuv_convert.h"
+#include "media/video/capture/screen/screen_capture_data.h"
 #include "remoting/base/util.h"
-#include "remoting/capturer/capture_data.h"
 #include "remoting/proto/video.pb.h"
 
 extern "C" {
 #define VPX_CODEC_DISABLE_COMPAT 1
 #include "third_party/libvpx/source/libvpx/vpx/vpx_encoder.h"
 #include "third_party/libvpx/source/libvpx/vpx/vp8cx.h"
 }
 
 namespace {
 
@@ skipping 116 matching lines @@
   if (vpx_codec_control(codec_.get(), VP8E_SET_CPUUSED, 16))
     return false;
 
   // Use the lowest level of noise sensitivity so as to spend less time
   // on motion estimation and inter-prediction mode.
   if (vpx_codec_control(codec_.get(), VP8E_SET_NOISE_SENSITIVITY, 0))
     return false;
   return true;
 }
 
-void VideoEncoderVp8::PrepareImage(scoped_refptr<CaptureData> capture_data,
-                                   SkRegion* updated_region) {
+void VideoEncoderVp8::PrepareImage(
+    scoped_refptr<media::ScreenCaptureData> capture_data,
+    SkRegion* updated_region) {
   const SkRegion& region = capture_data->dirty_region();
   if (region.isEmpty()) {
     updated_region->setEmpty();
     return;
   }
 
   // Align the region to macroblocks, to avoid encoding artefacts.
   // This also ensures that all rectangles have even-aligned top-left, which
   // is required for ConvertRGBToYUVWithRect() to work.
   std::vector<SkIRect> aligned_rects;
@@ skipping 44 matching lines @@
     uint8* map = active_map_.get() + top * active_map_width_;
     for (int y = top; y <= bottom; ++y) {
       for (int x = left; x <= right; ++x)
         map[x] = 1;
       map += active_map_width_;
     }
   }
 }
 
 void VideoEncoderVp8::Encode(
-    scoped_refptr<CaptureData> capture_data,
+    scoped_refptr<media::ScreenCaptureData> capture_data,
     bool key_frame,
     const DataAvailableCallback& data_available_callback) {
   DCHECK_LE(32, capture_data->size().width());
   DCHECK_LE(32, capture_data->size().height());
 
   base::Time encode_start_time = base::Time::Now();
 
   if (!initialized_ ||
       (capture_data->size() != SkISize::Make(image_->w, image_->h))) {
     bool ret = Init(capture_data->size());
@@ skipping 75 matching lines @@
     rect->set_x(r.rect().x());
     rect->set_y(r.rect().y());
     rect->set_width(r.rect().width());
     rect->set_height(r.rect().height());
   }
 
   data_available_callback.Run(packet.Pass());
 }
 
 }  // namespace remoting