Added the desktop shape fields to VideoPacket.

remoting/codec/video_decoder_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_decoder_vp8.h"
 
 #include <math.h>
 
+#include <algorithm>
+
 #include "base/logging.h"
 #include "media/base/media.h"
 #include "media/base/yuv_convert.h"
 #include "remoting/base/util.h"
 
 extern "C" {
 #define VPX_CODEC_DISABLE_COMPAT 1
 #include "third_party/libvpx/source/libvpx/vpx/vpx_decoder.h"
 #include "third_party/libvpx/source/libvpx/vpx/vp8dx.h"
 }
 
 namespace remoting {
 
+enum { kBytesPerPixelRGB32 = 4 };
+
+const uint32 kTransparent = 0;
+
 VideoDecoderVp8::VideoDecoderVp8()
     : state_(kUninitialized),
       codec_(NULL),
       last_image_(NULL),
       screen_size_(SkISize::Make(0, 0)) {
 }
 
 VideoDecoderVp8::~VideoDecoderVp8() {
   if (codec_) {
     vpx_codec_err_t ret = vpx_codec_destroy(codec_);
     CHECK(ret == VPX_CODEC_OK) << "Failed to destroy codec";
   }
   delete codec_;
 }
 
 void VideoDecoderVp8::Initialize(const SkISize& screen_size) {
   DCHECK(!screen_size.isEmpty());
 
   screen_size_ = screen_size;
   state_ = kReady;
+
+  transparent_region_.setRect(SkIRect::MakeSize(screen_size_));
 }
 
 VideoDecoder::DecodeResult VideoDecoderVp8::DecodePacket(
     const VideoPacket* packet) {
   DCHECK_EQ(kReady, state_);
 
   // Initialize the codec as needed.
   if (!codec_) {
     codec_ = new vpx_codec_ctx_t();
 
@@ skipping 39 matching lines @@
   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);
   }
 
   updated_region_.op(region, SkRegion::kUnion_Op);
+
+  // Update the desktop shape region.
+  SkRegion desktop_shape_region;
+  if (packet->has_use_desktop_shape()) {
+    for (int i = 0; i < packet->desktop_shape_rects_size(); ++i) {
+      Rect remoting_rect = packet->desktop_shape_rects(i);
+      SkIRect rect = SkIRect::MakeXYWH(remoting_rect.x(),
+                                       remoting_rect.y(),
+                                       remoting_rect.width(),
+                                       remoting_rect.height());
+      desktop_shape_region.op(rect, SkRegion::kUnion_Op);
+    }
+  } else {
+    // Fallback for the case when the host didn't include the desktop shape
+    // region.
+    desktop_shape_region = SkRegion(SkIRect::MakeSize(screen_size_));
+  }
+
+  UpdateDesktopShapeRegion(&desktop_shape_region);
+
   return DECODE_DONE;
 }
 
 bool VideoDecoderVp8::IsReadyForData() {
   return state_ == kReady;
 }
 
 VideoPacketFormat::Encoding VideoDecoderVp8::Encoding() {
   return VideoPacketFormat::ENCODING_VP8;
 }
 
 void VideoDecoderVp8::Invalidate(const SkISize& view_size,
                                  const SkRegion& region) {
   DCHECK_EQ(kReady, state_);
   DCHECK(!view_size.isEmpty());
 
   for (SkRegion::Iterator i(region); !i.done(); i.next()) {
     SkIRect rect = i.rect();
     rect = ScaleRect(rect, view_size, screen_size_);
     updated_region_.op(rect, SkRegion::kUnion_Op);
   }
+
+  // Updated areas outside of the new desktop shape region should be made
+  // transparent, not repainted.
+  SkRegion diff_region = updated_region_;
+  diff_region.op(desktop_shape_region_, SkRegion::kDifference_Op);
+  updated_region_.op(diff_region, SkRegion::kDifference_Op);
+  transparent_region_.op(diff_region, SkRegion::kUnion_Op);
 }
 
 void VideoDecoderVp8::RenderFrame(const SkISize& view_size,
                                   const SkIRect& clip_area,
                                   uint8* image_buffer,
                                   int image_stride,
                                   SkRegion* output_region) {
   DCHECK_EQ(kReady, state_);
   DCHECK(!view_size.isEmpty());
 
@@ skipping 69 matching lines @@
                                   image_stride,
                                   view_size,
                                   clip_area,
                                   rect);
 
     output_region->op(rect, SkRegion::kUnion_Op);
   }
 
   updated_region_.op(ScaleRect(clip_area, view_size, screen_size_),
                      SkRegion::kDifference_Op);
+
+  for (SkRegion::Iterator i(transparent_region_); !i.done(); i.next()) {
+    // Determine the scaled area affected by this rectangle changing.
+    SkIRect rect = i.rect();
+    if (!rect.intersect(source_clip))
+      continue;
+    rect = ScaleRect(rect, screen_size_, view_size);
+    if (!rect.intersect(clip_area))
+      continue;
+
+    // Fill the rectange with transparent pixels.
+    FillRect(image_buffer, image_stride, rect, kTransparent);
+    output_region->op(rect, SkRegion::kUnion_Op);
+  }
+
+  SkIRect scaled_clip_area = ScaleRect(clip_area, view_size, screen_size_);
+  updated_region_.op(scaled_clip_area, SkRegion::kDifference_Op);
+  transparent_region_.op(scaled_clip_area, SkRegion::kDifference_Op);
+}
+
+const SkRegion* VideoDecoderVp8::GetImageShape() {
+  return &desktop_shape_region_;
+}
+
+void VideoDecoderVp8::FillRect(uint8* buffer,
+                               int stride,
+                               const SkIRect& rect,
+                               uint32 color) {
+  uint32* ptr = reinterpret_cast<uint32*>(buffer + (rect.top() * stride) +
+      (rect.left() * kBytesPerPixelRGB32));
+  int width = rect.width();
+  for (int height = rect.height(); height > 0; --height) {
+    std::fill(ptr, ptr + width, color);
+    ptr += stride / kBytesPerPixelRGB32;
+  }
+}
+
+void VideoDecoderVp8::UpdateDesktopShapeRegion(
+    SkRegion* new_desktop_shape_region) {
+  // Areas that previously were within the desktop shape region and now are
+  // outside of it should be made transparent.
+  transparent_region_.op(desktop_shape_region_, SkRegion::kUnion_Op);

[Jamie, 2013/06/20 21:15:57]

It took me a while to understand what was going on here. I think it might be
clearer expressed as (pseudocode):

  newly_transparent = old_desktop_shape - new_desktop_shape;
  transparent = transparent + newly_transparent;

WDYT? It's closely analogous to the operations below for computing the new
repaint region.

[alexeypa (please no reviews), 2013/06/20 22:05:11]

Done.

+  transparent_region_.op(*new_desktop_shape_region, SkRegion::kDifference_Op);
+
+  // Areas that previously were outside of the desktop shape region and now are
+  // within the region should be repainted.
+  SkRegion region = *new_desktop_shape_region;

[Jamie, 2013/06/20 21:15:57]

Can you use a more descriptive name for this? Maybe repaint_region?

[alexeypa (please no reviews), 2013/06/20 22:05:11]

Done.

+  region.op(desktop_shape_region_, SkRegion::kDifference_Op);
+  updated_region_.op(region, SkRegion::kUnion_Op);
+
+  // Set the new desktop shape region.
+  desktop_shape_region_.swap(*new_desktop_shape_region);
+
+  // Updated areas outside of the new desktop shape region should be made
+  // transparent, not repainted.
+  region = updated_region_;
+  region.op(desktop_shape_region_, SkRegion::kDifference_Op);
+  updated_region_.op(region, SkRegion::kDifference_Op);
+  transparent_region_.op(region, SkRegion::kUnion_Op);
 }
 
 }  // namespace remoting