Simplify VideoEncoder interface.

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/time.h"
 #include "media/base/yuv_convert.h"
@@ skipping 126 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(const webrtc::DesktopFrame* frame,
+void VideoEncoderVp8::PrepareImage(const webrtc::DesktopFrame& frame,
                                    SkRegion* updated_region) {
-  if (frame->updated_region().is_empty()) {
+  if (frame.updated_region().is_empty()) {
     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;
-  for (webrtc::DesktopRegion::Iterator r(frame->updated_region());
+  for (webrtc::DesktopRegion::Iterator r(frame.updated_region());
        !r.IsAtEnd(); r.Advance()) {
     const webrtc::DesktopRect& rect = r.rect();
     aligned_rects.push_back(AlignRect(
       SkIRect::MakeLTRB(rect.left(), rect.top(), rect.right(), rect.bottom())));
   }
   DCHECK(!aligned_rects.empty());
   updated_region->setRects(&aligned_rects[0], aligned_rects.size());
 
   // Clip back to the screen dimensions, in case they're not macroblock aligned.
   // The conversion routines don't require even width & height, so this is safe
   // even if the source dimensions are not even.
   updated_region->op(SkIRect::MakeWH(image_->w, image_->h),
                      SkRegion::kIntersect_Op);
 
   // Convert the updated region to YUV ready for encoding.
-  const uint8* rgb_data = frame->data();
-  const int rgb_stride = frame->stride();
+  const uint8* rgb_data = frame.data();
+  const int rgb_stride = frame.stride();
   const int y_stride = image_->stride[0];
   DCHECK_EQ(image_->stride[1], image_->stride[2]);
   const int uv_stride = image_->stride[1];
   uint8* y_data = image_->planes[0];
   uint8* u_data = image_->planes[1];
   uint8* v_data = image_->planes[2];
   for (SkRegion::Iterator r(*updated_region); !r.done(); r.next()) {
     const SkIRect& rect = r.rect();
     ConvertRGB32ToYUVWithRect(
         rgb_data, y_data, u_data, v_data,
@@ skipping 18 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(
-    const webrtc::DesktopFrame* frame,
-    const DataAvailableCallback& data_available_callback) {
-  DCHECK_LE(32, frame->size().width());
-  DCHECK_LE(32, frame->size().height());
+scoped_ptr<VideoPacket> VideoEncoderVp8::Encode(
+    const webrtc::DesktopFrame& frame) {
+  DCHECK_LE(32, frame.size().width());
+  DCHECK_LE(32, frame.size().height());
 
   base::Time encode_start_time = base::Time::Now();
 
   if (!initialized_ ||
-      !frame->size().equals(webrtc::DesktopSize(image_->w, image_->h))) {
-    bool ret = Init(frame->size());
+      !frame.size().equals(webrtc::DesktopSize(image_->w, image_->h))) {
+    bool ret = Init(frame.size());
     // TODO(hclam): Handle error better.
     CHECK(ret) << "Initialization of encoder failed";
     initialized_ = ret;
   }
 
   // Convert the updated capture data ready for encode.
   SkRegion updated_region;
   PrepareImage(frame, &updated_region);
 
   // Update active map based on updated region.
@@ skipping 42 matching lines @@
         break;
       default:
         break;
     }
   }
 
   // Construct the VideoPacket message.
   packet->mutable_format()->set_encoding(VideoPacketFormat::ENCODING_VP8);
   packet->set_flags(VideoPacket::FIRST_PACKET | VideoPacket::LAST_PACKET |
                      VideoPacket::LAST_PARTITION);
-  packet->mutable_format()->set_screen_width(frame->size().width());
-  packet->mutable_format()->set_screen_height(frame->size().height());
-  packet->set_capture_time_ms(frame->capture_time_ms());
+  packet->mutable_format()->set_screen_width(frame.size().width());
+  packet->mutable_format()->set_screen_height(frame.size().height());
+  packet->set_capture_time_ms(frame.capture_time_ms());
   packet->set_encode_time_ms(
       (base::Time::Now() - encode_start_time).InMillisecondsRoundedUp());
-  if (!frame->dpi().is_zero()) {
-    packet->mutable_format()->set_x_dpi(frame->dpi().x());
-    packet->mutable_format()->set_y_dpi(frame->dpi().y());
+  if (!frame.dpi().is_zero()) {
+    packet->mutable_format()->set_x_dpi(frame.dpi().x());
+    packet->mutable_format()->set_y_dpi(frame.dpi().y());
   }
   for (SkRegion::Iterator r(updated_region); !r.done(); r.next()) {
     Rect* rect = packet->add_dirty_rects();
     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());
+  return packet.Pass();
 }
 
 }  // namespace remoting