Move common VideoPacket initialization into VideoEncoderHelper.

remoting/codec/video_encoder_helper.cc

Index: remoting/codec/video_encoder_helper.cc
diff --git a/remoting/codec/video_encoder_helper.cc b/remoting/codec/video_encoder_helper.cc
new file mode 100644
index 0000000000000000000000000000000000000000..5310d01007a76a9a9ddff7e94b87925cb9ca68e3
--- /dev/null
+++ b/remoting/codec/video_encoder_helper.cc
@@ -0,0 +1,70 @@
+// 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/codec/video_encoder_helper.h"
+
+#include "remoting/proto/video.pb.h"
+#include "third_party/webrtc/modules/desktop_capture/desktop_frame.h"
+#include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h"
+#include "third_party/webrtc/modules/desktop_capture/desktop_region.h"
+
+namespace remoting {
+
+VideoEncoderHelper::VideoEncoderHelper() {}
+
+scoped_ptr<VideoPacket> VideoEncoderHelper::CreateVideoPacket(
+    const webrtc::DesktopFrame& frame) {
+  return CreateVideoPacketWithUpdatedRegion(frame, frame.updated_region());
+}
+
+scoped_ptr<VideoPacket>
+VideoEncoderHelper::CreateVideoPacketWithUpdatedRegion(
+    const webrtc::DesktopFrame& frame,
+    const webrtc::DesktopRegion& updated_region) {
+  scoped_ptr<VideoPacket> packet(new VideoPacket());
+
+  // Set |screen_width| and |screen_height| iff they have changed.
+  if (!frame.size().equals(screen_size_)) {
+    screen_size_ = frame.size();
+
+    VideoPacketFormat* format = packet->mutable_format();
+    format->set_screen_width(screen_size_.width());
+    format->set_screen_height(screen_size_.height());
+  }
+
+  // Record the list of changed rectangles.
+  for (webrtc::DesktopRegion::Iterator iter(updated_region);
+       !iter.IsAtEnd(); iter.Advance()) {
+    const webrtc::DesktopRect& rect = iter.rect();
+    Rect* dirty_rect = packet->add_dirty_rects();
+    dirty_rect->set_x(rect.left());
+    dirty_rect->set_y(rect.top());
+    dirty_rect->set_width(rect.width());
+    dirty_rect->set_height(rect.height());
+  }
+
+  // Record the shape of the frame, if specified.
+  if (frame.shape()) {
+    packet->set_use_desktop_shape(true);
+    for (webrtc::DesktopRegion::Iterator r(*frame.shape());
+         !r.IsAtEnd(); r.Advance()) {
+      Rect* rect = packet->add_desktop_shape_rects();
+      rect->set_x(r.rect().left());
+      rect->set_y(r.rect().top());
+      rect->set_width(r.rect().width());
+      rect->set_height(r.rect().height());
+    }
+  }
+
+  // Store the capture time and frame DPI.
+  packet->set_capture_time_ms(frame.capture_time_ms());
+  if (!frame.dpi().is_zero()) {
+    packet->mutable_format()->set_x_dpi(frame.dpi().x());
+    packet->mutable_format()->set_y_dpi(frame.dpi().y());
+  }
+
+  return packet.Pass();
+}
+
+}  // namespace remoting