Revised sub-rectangle scaling for use in Chromoting.

remoting/client/rectangle_update_decoder.cc

 // Copyright (c) 2011 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/client/rectangle_update_decoder.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "remoting/base/decoder.h"
@@ skipping 120 matching lines @@
 
 void RectangleUpdateDecoder::SetScaleRatios(double horizontal_ratio,
                                             double vertical_ratio) {
   if (message_loop_ != MessageLoop::current()) {
     message_loop_->PostTask(
         FROM_HERE, base::Bind(&RectangleUpdateDecoder::SetScaleRatios,
                               this, horizontal_ratio, vertical_ratio));
     return;
   }
 
+  // TODO(wez): Refresh the frame only if the ratio has changed.
+  if (frame_) {
+    SkIRect frame_rect = SkIRect::MakeWH(frame_->width(), frame_->height());
+    refresh_rects_.push_back(frame_rect);
+  }
+
   // TODO(hclam): If the scale ratio has changed we should reallocate a
   // VideoFrame of different size. However if the scale ratio is always
   // smaller than 1.0 we can use the same video frame.
   decoder_->SetScaleRatios(horizontal_ratio, vertical_ratio);
+
+  // TODO(wez): Defer refresh, so that resize, which will affect both scale
+  // factor and clip rect, doesn't lead to unnecessary refreshes.
+  DoRefresh();
 }
 
 void RectangleUpdateDecoder::UpdateClipRect(const SkIRect& new_clip_rect) {
   if (message_loop_ != MessageLoop::current()) {
     message_loop_->PostTask(
         FROM_HERE, base::Bind(&RectangleUpdateDecoder::UpdateClipRect,
                               this, new_clip_rect));
     return;
   }
 
   if (new_clip_rect == clip_rect_ || !decoder_.get())
     return;
 
+  // TODO(wez): Only refresh newly-exposed portions of the frame.
+  if (frame_) {
+    SkIRect frame_rect = SkIRect::MakeWH(frame_->width(), frame_->height());
+    refresh_rects_.push_back(frame_rect);
+  }
+
+#if 0
+  // TODO(wez): Fix this code to account for scaling.
+
   // Find out the rectangles to show because of clip rect is updated.
   if (new_clip_rect.fTop < clip_rect_.fTop) {
     refresh_rects_.push_back(
         SkIRect::MakeXYWH(new_clip_rect.fLeft,
                           new_clip_rect.fTop,
                           new_clip_rect.width(),
                           clip_rect_.fTop - new_clip_rect.fTop));
   }
 
   if (new_clip_rect.fLeft < clip_rect_.fLeft) {
@@ skipping 12 matching lines @@
                           new_clip_rect.height()));
   }
 
   if (new_clip_rect.fBottom > clip_rect_.fBottom) {
     refresh_rects_.push_back(
         SkIRect::MakeXYWH(new_clip_rect.fLeft,
                           clip_rect_.fBottom,
                           new_clip_rect.width(),
                           new_clip_rect.fBottom - clip_rect_.fBottom));
   }
+#endif
 
   clip_rect_ = new_clip_rect;
   decoder_->SetClipRect(new_clip_rect);
+
+  // TODO(wez): Defer refresh so that multiple events can be batched.
   DoRefresh();
 }
 
 void RectangleUpdateDecoder::RefreshFullFrame() {
   if (message_loop_ != MessageLoop::current()) {
     message_loop_->PostTask(
         FROM_HERE, base::Bind(&RectangleUpdateDecoder::RefreshFullFrame, this));
     return;
   }
 
@@ skipping 41 matching lines @@
     return;
   }
 
   delete rects;
 
   frame_is_consuming_ = false;
   DoRefresh();
 }
 
 }  // namespace remoting