Merge 117748 - Linear sub-rectangle scaler for use in Chromoting.

remoting/base/decoder_vp8.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/base/decoder_vp8.h"
 
 #include <math.h>
 
 #include "base/logging.h"
 #include "media/base/media.h"
@@ skipping 212 matching lines @@
   output_rects->reserve(input_rects.size());
 
   for (size_t i = 0; i < input_rects.size(); ++i) {
     // Determine the scaled area affected by this rectangle changing.
     SkIRect output_rect = ScaleRect(input_rects[i],
                                     horizontal_scale_ratio_,
                                     vertical_scale_ratio_);
     if (!output_rect.intersect(clip_rect))
       continue;
 
-    // The scaler will not read outside the input dimensions.
-    ScaleYUVToRGB32WithRect(last_image_->planes[0],
-                            last_image_->planes[1],
-                            last_image_->planes[2],
-                            output_rgb_buf,
-                            input_rects[i],
-                            output_rect,
-                            last_image_->stride[0],
-                            last_image_->stride[1],
-                            output_stride);
+    // The scaler will not to read outside the input dimensions.
+    media::ScaleYUVToRGB32WithRect(last_image_->planes[0],
+                                   last_image_->planes[1],
+                                   last_image_->planes[2],
+                                   output_rgb_buf,
+                                   image_size.width(),
+                                   image_size.height(),
+                                   output_size_.width(),
+                                   output_size_.height(),
+                                   output_rect.x(),
+                                   output_rect.y(),
+                                   output_rect.right(),
+                                   output_rect.bottom(),
+                                   last_image_->stride[0],
+                                   last_image_->stride[1],
+                                   output_stride);
     output_rects->push_back(output_rect);
   }
 }
 
 }  // namespace remoting