Unit test for Encoder / Decoder for remoting

Unit test utils for Encoder and Decoder.

The tests will cover the state and messages sent out of the Encoder and
Decoder are in correct order.

It also make sure Decoded output matches input to the Encoder.

Review URL: http://codereview.chromium.org/3011010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53566 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 3 deletions

diff --git a/remoting/base/encoder_verbatim.cc b/remoting/base/encoder_verbatim.cc
index f6cc2ca..509daf9 100644
--- a/remoting/base/encoder_verbatim.cc
+++ b/remoting/base/encoder_verbatim.cc
@@ -71,14 +71,18 @@ bool EncoderVerbatim::EncodeRect(
       &((*packet->mutable_rect_data()->mutable_data())[0]));
 
   for (int i = 0; i < DataPlanes::kPlaneCount; ++i) {
-    const uint8* in = capture_data->data_planes().data[i];
     // Skip over planes that don't have data.
-    if (!in) continue;
+    if (!capture_data->data_planes().data[i])
+      continue;
+
+    const uint8* in = capture_data->data_planes().data[i] +
+                      y * capture_data->data_planes().strides[i] +
+                      x * bytes_per_pixel;
 
     // TODO(hclam): Handle YUV since the height would be different.
     for (int j = 0; j < height; ++j) {
       DCHECK_LE(row_size, capture_data->data_planes().strides[i]);
-      memcpy(out, in, row_size);
+      memcpy(out, in, width * bytes_per_pixel);
       in += capture_data->data_planes().strides[i];
       out += row_size;
     }