| Index: webrtc/modules/video_coding/utility/quality_scaler.h
 | 
| diff --git a/webrtc/modules/video_coding/utility/quality_scaler.h b/webrtc/modules/video_coding/utility/quality_scaler.h
 | 
| index fe70393c21cdf32d8c11abc062f88acf3a372815..36be1bfac417222d3d4f0ba4f51bba4844ba92d7 100644
 | 
| --- a/webrtc/modules/video_coding/utility/quality_scaler.h
 | 
| +++ b/webrtc/modules/video_coding/utility/quality_scaler.h
 | 
| @@ -11,8 +11,8 @@
 | 
|  #ifndef WEBRTC_MODULES_VIDEO_CODING_UTILITY_QUALITY_SCALER_H_
 | 
|  #define WEBRTC_MODULES_VIDEO_CODING_UTILITY_QUALITY_SCALER_H_
 | 
|  
 | 
| -#include "webrtc/common_video/libyuv/include/scaler.h"
 | 
|  #include "webrtc/modules/video_coding/utility/moving_average.h"
 | 
| +#include "webrtc/common_video/include/i420_buffer_pool.h"
 | 
|  
 | 
|  namespace webrtc {
 | 
|  class QualityScaler {
 | 
| @@ -32,9 +32,10 @@ class QualityScaler {
 | 
|    void ReportFramerate(int framerate);
 | 
|    void ReportQP(int qp);
 | 
|    void ReportDroppedFrame();
 | 
| -  void OnEncodeFrame(const VideoFrame& frame);
 | 
| +  void OnEncodeFrame(int width, int height);
 | 
|    Resolution GetScaledResolution() const;
 | 
| -  const VideoFrame& GetScaledFrame(const VideoFrame& frame);
 | 
| +  rtc::scoped_refptr<VideoFrameBuffer> GetScaledFrame(
 | 
| +      const rtc::scoped_refptr<VideoFrameBuffer>& frame);
 | 
|    int downscale_shift() const { return downscale_shift_; }
 | 
|  
 | 
|    // QP is obtained from VP8-bitstream for HW, so the QP corresponds to the
 | 
| @@ -52,8 +53,7 @@ class QualityScaler {
 | 
|    void ClearSamples();
 | 
|    void UpdateSampleCounts();
 | 
|  
 | 
| -  Scaler scaler_;
 | 
| -  VideoFrame scaled_frame_;
 | 
| +  I420BufferPool pool_;
 | 
|  
 | 
|    size_t num_samples_downscale_;
 | 
|    size_t num_samples_upscale_;
 | 
| 
 |