Refactor scaling.

webrtc/common_video/include/video_frame_buffer.h

Index: webrtc/common_video/include/video_frame_buffer.h
diff --git a/webrtc/common_video/include/video_frame_buffer.h b/webrtc/common_video/include/video_frame_buffer.h
index 984bd50d674e78d7e7aedfc252fcfef8810b6963..482d0b676919bd12241abdf7ce61246934f4f7b9 100644
--- a/webrtc/common_video/include/video_frame_buffer.h
+++ b/webrtc/common_video/include/video_frame_buffer.h
@@ -109,6 +109,21 @@ class I420Buffer : public VideoFrameBuffer {
   static rtc::scoped_refptr<I420Buffer> Copy(
       const rtc::scoped_refptr<VideoFrameBuffer>& buffer);
 
+  // Scale the cropped area of |src| to the size of |this| buffer, and
+  // write the result into |this|.
+  void CropAndScale(const rtc::scoped_refptr<VideoFrameBuffer>& src,

[pbos-webrtc, 2016/06/03 14:53:23]

I think ScaleFrom is a better name here and below, since it more clearly conveys
what goes where.

[nisse-webrtc, 2016/06/09 08:10:05]

Done.

+                    int offset_x,
+                    int offset_y,
+                    int crop_width,
+                    int crop_height);
+
+  // The common case of a center crop, when needed to adjust the
+  // aspect ratio without distorting the image.
+  void CropAndScale(const rtc::scoped_refptr<VideoFrameBuffer>& src);
+
+  // Scale all of |src| to the size of |this| buffer, with no cropping.
+  void Scale(const rtc::scoped_refptr<VideoFrameBuffer>& src);
+
  protected:
   ~I420Buffer() override;
 
@@ -186,13 +201,6 @@ class WrappedI420Buffer : public webrtc::VideoFrameBuffer {
   rtc::Callback0<void> no_longer_used_cb_;
 };
 
-// Helper function to crop |buffer| without making a deep copy. May only be used
-// for non-native frames.
-rtc::scoped_refptr<VideoFrameBuffer> ShallowCenterCrop(
-    const rtc::scoped_refptr<VideoFrameBuffer>& buffer,
-    int cropped_width,
-    int cropped_height);
-
 }  // namespace webrtc
 
 #endif  // WEBRTC_COMMON_VIDEO_INCLUDE_VIDEO_FRAME_BUFFER_H_