Simplify VideoEncoder interface.

remoting/codec/video_decoder_verbatim.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_decoder_verbatim.h"
 
 #include "base/logging.h"
 #include "remoting/base/util.h"
 
 namespace remoting {
 
 namespace {
 // Both input and output data are assumed to be RGBA32.
 const int kBytesPerPixel = 4;
 }  // namespace
 
+VideoDecoderVerbatim::VideoDecoderVerbatim()
+    : screen_size_(SkISize::Make(0, 0)) {}
 
-VideoDecoderVerbatim::VideoDecoderVerbatim()
-    : state_(kUninitialized),
-      clip_(SkIRect::MakeEmpty()),
-      row_pos_(0),
-      row_y_(0),
-      screen_size_(SkISize::Make(0, 0)) {
-}
-
-VideoDecoderVerbatim::~VideoDecoderVerbatim() {
-}
+VideoDecoderVerbatim::~VideoDecoderVerbatim() {}
 
 bool VideoDecoderVerbatim::IsReadyForData() {
-  switch (state_) {
-    case kUninitialized:
-    case kError:
-      return false;
-    case kReady:
-    case kProcessing:
-    case kPartitionDone:
-    case kDone:
-      return true;
-  }
-  NOTREACHED();
-  return false;
+  return true;
 }
 
 void VideoDecoderVerbatim::Initialize(const SkISize& screen_size) {
   updated_region_.setEmpty();
   screen_buffer_.reset();
 
   screen_size_ = screen_size;
   // Allocate the screen buffer, if necessary.
   if (!screen_size_.isEmpty()) {
-    screen_buffer_.reset(new uint8[
-        screen_size_.width() * screen_size_.height() * kBytesPerPixel]);
+    screen_buffer_.reset(
+        new uint8
+            [screen_size_.width() * screen_size_.height() * kBytesPerPixel]);
   }
-
-  state_ = kReady;
 }
 
 VideoDecoder::DecodeResult VideoDecoderVerbatim::DecodePacket(
     const VideoPacket* packet) {
-  UpdateStateForPacket(packet);
-
-  if (state_ == kError) {
-    return DECODE_ERROR;
+  SkRegion region;
+  for (int i = 0; i < packet->dirty_rects_size(); ++i) {
+    Rect remoting_rect = packet->dirty_rects(i);
+    SkIRect rect =
+        SkIRect::MakeXYWH(remoting_rect.x(), remoting_rect.y(),
+                          remoting_rect.width(), remoting_rect.height());
+    region.op(rect, SkRegion::kUnion_Op);
   }
 
-  const uint8* in = reinterpret_cast<const uint8*>(packet->data().data());
-  const int in_size = packet->data().size();
-  const int row_size = clip_.width() * kBytesPerPixel;
+  updated_region_.op(region, SkRegion::kUnion_Op);
 
-  int out_stride = screen_size_.width() * kBytesPerPixel;
-  uint8* out = screen_buffer_.get() + out_stride * (clip_.top() + row_y_) +
-      kBytesPerPixel * clip_.left();
-
-  // Consume all the data in the message.
-  int used = 0;
-  while (used < in_size) {
-    if (row_y_ >= clip_.height()) {
-      state_ = kError;
-      LOG(WARNING) << "Too much data is received for the given rectangle.";
-      return DECODE_ERROR;
-    }
-
-    int bytes_to_copy = std::min(in_size - used, row_size - row_pos_);
-    memcpy(out + row_pos_, in + used, bytes_to_copy);
-
-    used += bytes_to_copy;
-    row_pos_ += bytes_to_copy;
-
-    // If this row is completely filled then move onto the next row.
-    if (row_pos_ == row_size) {
-      ++row_y_;
-      row_pos_ = 0;
-      out += out_stride;
+  const char* in = packet->data().data();
+  int stride = kBytesPerPixel * screen_size_.width();

[Wez, 2013/09/12 14:20:15]

nit: buffer_row_bytes or buffer_stride?

[Sergey Ulanov, 2013/09/12 19:18:45]

They are the same for the frames generated by this decoder.

+  for (SkRegion::Iterator iter(region); !iter.done(); iter.next()) {
+    const SkIRect& rect = iter.rect();

[Wez, 2013/09/12 14:20:15]

Need to check that |rect| is contained within |screen_size_| here.

[Sergey Ulanov, 2013/09/12 19:18:45]

Done.

+    int row_size = kBytesPerPixel * rect.width();

[Wez, 2013/09/12 14:20:15]

nit: row_bytes or source_stride or packet[_data]_stride?

[Sergey Ulanov, 2013/09/12 19:18:45]

size of a single raw in the rect being decoded.

+    uint8_t* out = screen_buffer_.get() + rect.top() * stride +
+                   rect.left() * kBytesPerPixel;
+    for (int y = rect.y(); y < rect.y() + rect.height(); ++y) {
+      memcpy(out, in, row_size);
+      in += row_size;
+      if (in > packet->data().data() + packet->data().size()) {
+        LOG(ERROR) << "Invalid packet received";
+        return DECODE_ERROR;
+      }
+      out += stride;
     }
   }
 
-  if (state_ == kPartitionDone || state_ == kDone) {
-    if (row_y_ < clip_.height()) {
-      state_ = kError;
-      LOG(WARNING) << "Received LAST_PACKET, but didn't get enough data.";
-      return DECODE_ERROR;
-    }
-
-    updated_region_.op(clip_, SkRegion::kUnion_Op);
-  }
-
-  if (state_ == kDone) {
-    return DECODE_DONE;
-  } else {
-    return DECODE_IN_PROGRESS;
-  }
-}
-
-void VideoDecoderVerbatim::UpdateStateForPacket(const VideoPacket* packet) {
-  if (state_ == kError) {
-    return;
-  }
-
-  if (packet->flags() & VideoPacket::FIRST_PACKET) {
-    if (state_ != kReady && state_ != kDone && state_ != kPartitionDone) {
-      state_ = kError;
-      LOG(WARNING) << "Received unexpected FIRST_PACKET.";
-      return;
-    }
-
-    // Reset the buffer location status variables on the first packet.
-    clip_.setXYWH(packet->format().x(), packet->format().y(),
-                  packet->format().width(), packet->format().height());
-    if (!SkIRect::MakeSize(screen_size_).contains(clip_)) {
-      state_ = kError;
-      LOG(WARNING) << "Invalid clipping area received.";
-      return;
-    }
-
-    state_ = kProcessing;
-    row_pos_ = 0;
-    row_y_ = 0;
-  }
-
-  if (state_ != kProcessing) {
-    state_ = kError;
-    LOG(WARNING) << "Received unexpected packet.";
-    return;
-  }
-
-  if (packet->flags() & VideoPacket::LAST_PACKET) {
-    if (state_ != kProcessing) {
-      state_ = kError;
-      LOG(WARNING) << "Received unexpected LAST_PACKET.";
-      return;
-    }
-    state_ = kPartitionDone;
-  }
-
-  if (packet->flags() & VideoPacket::LAST_PARTITION) {
-    if (state_ != kPartitionDone) {
-      state_ = kError;
-      LOG(WARNING) << "Received unexpected LAST_PARTITION.";
-      return;
-    }
-    state_ = kDone;
-  }
-
-  return;
+  return DECODE_DONE;
 }
 
 VideoPacketFormat::Encoding VideoDecoderVerbatim::Encoding() {
   return VideoPacketFormat::ENCODING_VERBATIM;
 }
 
 void VideoDecoderVerbatim::Invalidate(const SkISize& view_size,
                                       const SkRegion& region) {
   updated_region_.op(region, SkRegion::kUnion_Op);
 }
@@ skipping 26 matching lines @@
   }
 
   updated_region_.setEmpty();
 }
 
 const SkRegion* VideoDecoderVerbatim::GetImageShape() {
   return NULL;
 }
 
 }  // namespace remoting